X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fdemo%2Fbbs%2Fappli%2FdemoViewing1.bbs;h=d6b4afa79076328535b9fcfcaf9c68609fa039b4;hb=2441c154e1940e42455187049718d0a15d7fb81f;hp=a6d272a2f3ae9c4fb7329d91188c86fa1f9b97c9;hpb=e91d1dd51fae81bbe9d30bb64530dc63500879d1;p=bbtk.git

diff --git a/packages/demo/bbs/appli/demoViewing1.bbs b/packages/demo/bbs/appli/demoViewing1.bbs
index a6d272a..d6b4afa 100644
--- a/packages/demo/bbs/appli/demoViewing1.bbs
+++ b/packages/demo/bbs/appli/demoViewing1.bbs
@@ -12,64 +12,31 @@ 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 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
+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'
+# ---------------------
 
-# Here loads hola.mhd
-# -------------------
 include vtk/boxes/bbLoadHola
 new LoadHola reader
 
-# uncomment next lines to have a file selector
-# --------------------------------------------
-/*
-new FileSelector openFileDialog
-new ImageReader reader
-    connect openFileDialog.Out reader.In
-*/
-
-# uncomment next lines to use Gimmick
-# -----------------------------------
-/*
-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
-*/
-
-# uncomment the following lines to read a 3D images stack
-# (only if file name order is meaningfull)
-# -------------------------------------------------------
-/*
-// To choose the directory
-new DirectorySelector ds
-// To get the image names into a vector
-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
-// list of files as imput
-#print "Files found in $ds.Out$\n
-connect fd.Out  reader.FileNames
-*/
-
+# Have a look at exampleViewing1.1.bbs
+# If you want to know how to read different images.
 
 // We need that to set Sliders sizes
 
@@ -77,8 +44,6 @@ connect fd.Out  reader.FileNames
 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
@@ -93,6 +58,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
@@ -109,7 +75,6 @@ new Div div2
   connect   gveZ.Out div2.In1
   set div2.In2 2
 
-
 // For X axis
 new SimpleSlicer viewerUL
   connect reader.Out viewerUL.In
@@ -152,17 +117,27 @@ 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
-
-