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

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