Modify the Grid module to use ScaleFactors.

diff --git a/src/Grid.hs b/src/Grid.hs
index 7996319e7a34fc03217c66771582dcd59493275d..6a9a8e5edd9ee62907a1486e29c25b334bedc041 100644 (file)
--- a/src/Grid.hs
+++ b/src/Grid.hs
@@ -10,6 +10,7 @@ import Test.QuickCheck (Arbitrary(..), Gen, Positive(..))
 import Cube (Cube(Cube), find_containing_tetrahedra)
 import FunctionValues
 import Point (Point)
+import ScaleFactor
 import Tetrahedron (polynomial)
 import Values (Values3D, dims, empty3d, zoom_shape)
 
@@ -114,26 +115,25 @@ find_containing_cube g p =
 
 
 {-# INLINE zoom_lookup #-}
-zoom_lookup :: Grid -> Int -> a -> (R.DIM3 -> Double)
+zoom_lookup :: Grid -> ScaleFactor -> a -> (R.DIM3 -> Double)
 zoom_lookup g scale_factor _ = zoom_result g scale_factor
 
 
 {-# INLINE zoom_result #-}
-zoom_result :: Grid -> Int -> R.DIM3 -> Double
-zoom_result g scale_factor (R.Z R.:. i R.:. j R.:. k) =
+zoom_result :: Grid -> ScaleFactor -> R.DIM3 -> Double
+zoom_result g (sfx, sfy, sfz) (R.Z R.:. i R.:. j R.:. k) =
   f p
   where
-    sf = fromIntegral scale_factor
-    i' = fromIntegral i / sf
-    j' = fromIntegral j / sf
-    k' = fromIntegral k / sf
+    i' = (fromIntegral i) / (fromIntegral sfx)
+    j' = (fromIntegral j) / (fromIntegral sfy)
+    k' = (fromIntegral k) / (fromIntegral sfz)
     p  = (i', j', k') :: Point
     c = find_containing_cube g p
     t = head (find_containing_tetrahedra c p)
     f = polynomial t
 
 
-zoom :: Grid -> Int -> Values3D
+zoom :: Grid -> ScaleFactor -> Values3D
 zoom g scale_factor
     | xsize == 0 || ysize == 0 || zsize == 0 = empty3d
     | otherwise =