X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fdemo%2Fbbs%2Fappli%2FdemoViewing3.bbs;h=1edb63bc554a54abcf6f07f164b7489a0070b3e3;hb=313f228ef0ea749e2b83220eacc19b114961d20c;hp=b3555c84c0a06d60e47118b60545978ceb7e4a20;hpb=857183149728b0fa85d2ba80c3e345c3c7025efd;p=bbtk.git

diff --git a/packages/demo/bbs/appli/demoViewing3.bbs b/packages/demo/bbs/appli/demoViewing3.bbs
index b3555c8..1edb63b 100644
--- a/packages/demo/bbs/appli/demoViewing3.bbs
+++ b/packages/demo/bbs/appli/demoViewing3.bbs
@@ -12,16 +12,17 @@ load itk
 include vtk
 include wx
 load itkvtk
-
+load gdcmvtk
 
 new LayoutX4 main
-new LayoutLine upright
-new LayoutLine upleft
-new LayoutLine downleft
 
-connect upright.Widget  main.Widget1
-connect upleft.Widget   main.Widget2
-connect downleft.Widget main.Widget3
+new LayoutLine  upright
+new LayoutLine  upleft
+new LayoutLine  downleft
+
+connect upright.Widget   main.Widget1
+connect upleft.Widget    main.Widget2
+connect downleft.Widget  main.Widget3
 
 # Here loads hola.mhd
 # -------------------
@@ -30,20 +31,35 @@ 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)
@@ -55,10 +71,38 @@ new DirectorySelector ds
 new FilesFromDirectory fd
 // To read all the files, as a bbitk::ImagePointer
 new ImageSeriesReader reader
+// user choosen directory as input
 connect ds.Out fd.In
 set fd.Recursive false
-print "Files found in $ds.Out$\n
-connect fd.Out  reader.FileNames
+// 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
 */
 
 
@@ -66,19 +110,19 @@ connect fd.Out  reader.FileNames
 //set reader.YSpacing 23.4
 //set reader.ZSpacing 35
 
-//print "Image properties : $reader.Out"
+#print "Image properties : $reader.Out"
 
 //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
 
-   connect viewer.Widget main.Widget4
+  connect viewer.Widget main.Widget4
 
 // For X axis
 // ----------
@@ -101,7 +145,7 @@ new Viewer2D viewerUR
   connect viewerUR.Widget upright.Widget1
  # contains only one  slice
   set viewerUR.Slice 0
- connect planes.BoxChange viewerUR.BoxExecute 
+ connect planes.BoxChange viewerUR.BoxExecute
 
  print "===============planes.ImageY $planes.ImageY"
 
@@ -115,8 +159,7 @@ new Viewer2D viewerDL
   set viewerDL.Slice 0
   connect planes.BoxChange viewerDL.BoxExecute 
 
- print "===============planes.ImageZ $planes.ImageZ" 
-       
+ print "===============planes.ImageZ $planes.ImageZ"
+
 set main.WinTitle "demoViewing3"
 exec main
-