Modify the Values module to use ScaleFactors instead of Ints.

diff --git a/src/Values.hs b/src/Values.hs
index 3833135c720b7c0abe2e9c8c54e7334b1124383e..dc45a3f16dd7560e5b5b2d863e212ef6654c30b8 100644 (file)
--- a/src/Values.hs
+++ b/src/Values.hs
@@ -23,6 +23,9 @@ import System.FilePath ()
 import Test.QuickCheck (Arbitrary(..), Gen)
 
 
+import ScaleFactor
+
+
 type Values1D = Array DIM1 Double
 type Values2D = Array DIM2 Double
 type Values3D = Array DIM3 Double
@@ -82,11 +85,11 @@ idx v3d i j k =
       shape = (Z :. i :. j :. k)
 
 
-zoom_shape :: Int -> DIM3 -> DIM3
-zoom_shape scale_factor sh =
+zoom_shape :: ScaleFactor -> DIM3 -> DIM3
+zoom_shape (sfx, sfy, sfz) sh =
     let (Z :. x :. y :. z) = sh
-        x' = x * scale_factor
-        y' = y * scale_factor
-        z' = z * scale_factor
+        x' = x * sfx
+        y' = y * sfy
+        z' = z * sfz
     in
       (Z :. x' :. y' :. z')