X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fdemo%2Fbbs%2Fappli%2FdemoViewing1.bbs;h=8e066e4668a84b388c7f5cb3f6eab3b3000a8918;hb=01fb8df604fbbe40e30ffd608ad40bca4433f32b;hp=7112a6f435378ce93ed464b4efecd3e46ad8f708;hpb=2c72a4807a6dd861fc034cd8cc6f3580679ef926;p=bbtk.git

diff --git a/packages/demo/bbs/appli/demoViewing1.bbs b/packages/demo/bbs/appli/demoViewing1.bbs
index 7112a6f..8e066e4 100644
--- a/packages/demo/bbs/appli/demoViewing1.bbs
+++ b/packages/demo/bbs/appli/demoViewing1.bbs
@@ -5,22 +5,29 @@ category "demo"
 // To show how easy it is to add smthing
 // =====================================
 
-load wxvtk
-include wx
 load vtk
+include wxvtk
 load std
-load itkvtk
 load itk
+include vtk
+include wx
+load itkvtk
+load gdcmvtk
+
 include wxvtk/boxes/bbSimpleSlicer
 
 new LayoutX4 main
-new LayoutLine upright
-new LayoutLine upleft
-new LayoutLine down
 
-connect upright.Widget main.Widget1
-connect upleft.Widget  main.Widget2
-connect down.Widget    main.Widget3
+new LayoutLine  upright
+new LayoutLine  upleft
+new LayoutLine  downleft
+new LayoutSplit downright
+   set downright.Proportion 85
+
+connect upright.Widget   main.Widget1
+connect upleft.Widget    main.Widget2
+connect downleft.Widget  main.Widget3
+connect downright.Widget main.Widget4
 
 # Here loads hola.mhd
 # -------------------
@@ -29,36 +36,88 @@ new LoadHola reader
 
 # uncomment next lines to have a file selector
 # --------------------------------------------
-#new FileSelector openFileDialog
-#new ImageReader reader
-#    connect openFileDialog.Out reader.In
+/*
+new FileSelector openFileDialog
+new ImageReader reader
+  connect openFileDialog.Out reader.In
+*/
+
+# uncomment next lines to use a vtkgdcmReader
+# -------------------------------------
+/*
+new FileSelector openFileDialog
+new GetInfoGdcmReader reader
+  connect openFileDialog.Out reader.In
+*/
 
 # uncomment next lines to use Gimmick
 # -----------------------------------
-#load creaImageIO
-#new Gimmick reader
+/*
+load creaImageIO
+new Gimmick reader
+*/
 
 # uncomment next lines to Read a MHD file (and nothing else !)
 # ------------------------------------------------------------
-#new FileSelector openFileDialog
-#new MetaImageReader reader
-#   connect openFileDialog.Out reader.In 
+/*
+new FileSelector openFileDialog
+ set openFileDialog.Wildcard  "(*.mhd)|*.mhd"
+new MetaImageReader reader
+   connect openFileDialog.Out reader.In
+*/
 
 # uncomment the following lines to read a 3D images stack
+# (only if file name order is meaningfull)
 # -------------------------------------------------------
+/*
 // To choose the directory
-#new DirectorySelector ds
+new DirectorySelector ds
 // To get the image names into a vector
-#new FilesFromDirectory fd
+new FilesFromDirectory fd
 // To read all the files, as a bbitk::ImagePointer
-#new ImageSeriesReader reader
+new ImageSeriesReader reader
+// user choosen directory as input
+connect ds.Out fd.In
+set fd.Recursive false
+// list of files as input
+#print "Files found in $ds.Out$\n
+connect fd.Out reader.FileNames
+*/
+
+# uncomment the following lines to read a 3D images stack
+# (if the directory contains a 'XCoherent" Serie)
+# -------------------------------------------------------
+/*
+// To choose the directory
+new DirectorySelector ds
+// To get the image names into a vector
+new FilesFromDirectory fd
+// user choosen directory as input
+connect ds.Out fd.In 
+// order the files, computes an accurate ZSpacing
+new GetXCoherentInfoGdcmReader reader
+connect fd.Out reader.In
+*/
+
+# uncomment the following lines to read a 3D images stack
+# (with DICOMDirReader)
+# -------------------------------------------------------
+/*
+include itk/boxes/bbDICOMDirReader
+// To choose the directory
+new DirectorySelector ds
+new DICOMDirReader reader
+   connect ds.Out reader.In
+*/
+
+// We need that to set Sliders sizes
 
-#print "Image properties : $reader.Out"
-  
 #Get image dimensions, ...
 new ImageProperties mc
    connect reader.Out mc.In
 
+#print "Image properties : $reader.Out"
+
 #Get number of column (X)
 new GetVectorIntElement gveX
    connect mc.Size gveX.In
@@ -73,6 +132,7 @@ new GetVectorIntElement gveY
 new GetVectorIntElement gveZ
    connect mc.Size gveZ.In
    set gveZ.I 2
+//print "Dim Z $gveZ.Out"
 
 #Compute the number of the 'middle' slice on X axis
 new Div div0
@@ -89,7 +149,6 @@ new Div div2
   connect   gveZ.Out div2.In1
   set div2.In2 2
 
-
 // For X axis
 new SimpleSlicer viewerUL
   connect reader.Out viewerUL.In
@@ -103,7 +162,6 @@ new SimpleSlicer viewerUL
   set viewerUL.SliderOrientation H
   set viewerUL.SliderTitle "Planes YZ"
 
-
 // For Y axis
 new SimpleSlicer viewerUR
   connect reader.Out viewerUR.In
@@ -120,7 +178,7 @@ new SimpleSlicer viewerUR
 // For Z axis
 new SimpleSlicer viewerTD
   connect reader.Out viewerTD.In
-  connect viewerTD.Widget down.Widget1
+  connect viewerTD.Widget downleft.Widget1
   #initial slice is the middle one
   connect div2.Out viewerTD.Slice
   #Slider size is the number of planes
@@ -133,17 +191,28 @@ new SimpleSlicer viewerTD
 //For 3D Viewer
 
 new ImagePlanes planes
-   connect reader.Out planes.In
-   
+  connect reader.Out planes.In
+
 new Viewer3D viewer
-   connect planes.PlaneX viewer.Obs1
-   connect planes.PlaneY viewer.Obs2
-   connect planes.PlaneZ viewer.Obs3
+  connect planes.PlaneX viewer.Obs1
+  connect planes.PlaneY viewer.Obs2
+  connect planes.PlaneZ viewer.Obs3
+
+new CheckBox   chkbox
+  set chkbox.Title "Interpolate Pixels (in '2D' images)"
+  set chkbox.In 1
+  connect chkbox.BoxChange   viewerUL.BoxExecute
+  connect chkbox.BoxChange   viewerUR.BoxExecute
+  connect chkbox.BoxChange   viewerTD.BoxExecute
+
+  connect viewer.Widget downright.Widget1
+  connect chkbox.Widget downright.Widget2
+
+  connect chkbox.Out viewerUL.Interpolate
+  connect chkbox.Out viewerUR.Interpolate
+  connect chkbox.Out viewerTD.Interpolate
 
-   connect viewer.Widget main.Widget4
-       
 set main.WinTitle "demoViewing1"
 exec main
 exec viewerTD
 
-