X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=packages%2Fdemo%2Fbbs%2Fappli%2FdemoViewing1.bbs;h=594564e8871ec715d94443c25e0a778ced25b022;hb=HEAD;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..594564e 100644
--- a/packages/demo/bbs/appli/demoViewing1.bbs
+++ b/packages/demo/bbs/appli/demoViewing1.bbs
@@ -1,3 +1,28 @@
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+ 
 description "3 slicers and a 3D view"
 author "jpr@creatis.insa-lyon.fr"
 category "demo"
@@ -5,56 +30,41 @@ 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'
+# ---------------------
 
-# 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
-# -------------------------------------------------------
-// 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
-
-#print "Image properties : $reader.Out"
-  
+# Have a look at exampleViewing1.1.bbs
+# If you want to know how to read different images.
+
+// We need that to set Sliders sizes
+
 #Get image dimensions, ...
 new ImageProperties mc
    connect reader.Out mc.In
@@ -73,6 +83,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 +100,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 +113,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 +129,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 +142,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
-
-