X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=src%2FMain.hs;h=0afe2f7cc4a27e19f32823b2474f601a00d265f5;hb=c8ec035a77f871e4deaa976ed6f3a65a32c07048;hp=f21856f41e0879189c10ebe84aeb550ee4688bb5;hpb=cb685a7b51ed0cce8898179cca4f6a5f26e59f41;p=spline3.git

diff --git a/src/Main.hs b/src/Main.hs
index f21856f..0afe2f7 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,35 +1,46 @@
 module Main
 where
 
-import qualified Data.Array.Repa as R (map, reshape)
-import qualified Data.Array.Repa.IO.BMP as R (writeComponentsToBMP)
+import qualified Data.Array.Repa as R
 import System.Environment (getArgs)
 
-import Grid (make_grid, zoom)
+import Grid (zoom)
 import MRI
-import Values (drop_z, zoom_shape)
 
-zoom_factor :: (Int, Int, Int)
-zoom_factor = (1,2,2)
+
+in_file :: FilePath
+in_file = "./data/mri.bin"
 
 
 main :: IO ()
-main = do
---  args <- getArgs
---  let color = head args
-  let in_file = "./data/mri.bin"
+main = main3d
+
+main3d :: IO ()
+main3d = do
+  (s:_) <- getArgs
+  let scale = read s :: Int
+  let zoom_factor = (scale, scale, scale)
+  let out_file = "output.bin"
+  arr <- read_word16s in_file
+  let arr' = swap_bytes arr
+  let arrMRI = R.reshape mri_shape arr'
+  let dbl_data = R.force $ R.map fromIntegral arrMRI
+  let output = zoom dbl_data zoom_factor
+  let word16_output = round_array output
+  write_word16s out_file word16_output
+
+
+main2d :: IO ()
+main2d = do
+  (s:_) <- getArgs
+  let scale = read s :: Int
+  let zoom_factor = (1, scale, scale)
   let out_file = "output.bmp"
   arr <- read_word16s in_file
-  let arrBrack = bracket_array arr
-  let arrInv   = flip_x $ flip_y arrBrack
+  let arr' = swap_bytes arr
+  let arrInv   = flip_x $ flip_y arr'
   let arrSlice = z_slice 50 arrInv
   let arrSlice' = R.reshape mri_slice3d arrSlice
   let dbl_data = R.map fromIntegral arrSlice'
-  let g = make_grid 1 dbl_data
-  let output = zoom g zoom_factor
-  let mri_slice2d = drop_z $ zoom_shape zoom_factor mri_slice3d
-  let colors = values_to_colors $ R.reshape mri_slice2d output
-  let routput = R.map (\(red, _,     _)    -> red)   colors
-  let goutput = R.map (\(_,   green, _)    -> green) colors
-  let boutput = R.map (\(_,   _,     blue) -> blue)  colors
-  R.writeComponentsToBMP out_file routput goutput boutput
+  let output = zoom dbl_data zoom_factor
+  write_values_slice_to_bitmap (z_slice 0 output) out_file