*** empty log message ***

diff --git a/packages/demo/bbs/appli/demoViewingHairXRayImages.bbs b/packages/demo/bbs/appli/demoFiltering1.bbs
similarity index 92%
rename from packages/demo/bbs/appli/demoViewingHairXRayImages.bbs
rename to packages/demo/bbs/appli/demoFiltering1.bbs
index 9b9e3cd413392bdb435e705e1fbfd0a39d6dc7dc..4ed008470f3fdedc5cbc9beb161fb7e0e36ac749 100644 (file)
--- a/packages/demo/bbs/appli/demoViewingHairXRayImages.bbs
+++ b/packages/demo/bbs/appli/demoFiltering1.bbs
@@ -1,5 +1,5 @@
-description "Interactive Segmenting of hair X-Ray images"
-author "info-dev at creatis.insa-lyon.fr"
+description "Basic segmentation and filtering of an image"
+author "jpr@creatis.insa-lyon.fr"
 category "demo"
 
 // 3 Slices, 2 volumes
@@ -11,10 +11,13 @@ include itk
 include itkvtk
 include wxvtk
 
-new FileSelector openFileDialog
-
-new ImageReader reader
-  connect openFileDialog.Out reader.In
+# 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
 
 #Get image dimensions, ...
 new ImageProperties mc
@@ -116,10 +119,10 @@ new LayoutLine upLayout
 
 
 new ColourSelectorButton colourLower
-   set colourLower.In "0.5 0 0.5"
+   set colourLower.In "1 1 0"
    
 new ColourSelectorButton colourUpper  
-   set colourUpper.In "0.5 0.5 0.0"
+   set colourUpper.In "1 0 0"
    
 #---------------------------------------------------------------------
 
@@ -177,6 +180,7 @@ new LayoutLine toolLayout
 
 #---------------------------------------------------------------------
 new LayoutSplit splitUp
+  set splitUp.Proportion 50
   connect toolLayout.Widget     splitUp.Widget1
   connect upLayout.Widget       splitUp.Widget2
 
@@ -187,7 +191,7 @@ new LayoutSplit splitUp
   
 
 new LayoutSplit mainSplit
-  set mainSplit.Proportion 30
+  set mainSplit.Proportion 66
   connect splitUp.Widget       mainSplit.Widget1
   connect downLayout.Widget    mainSplit.Widget2
 
@@ -195,4 +199,7 @@ new LayoutSplit mainSplit
 
 exec isoextractorthreshold
 exec isoextractorsmooth
+
+
+set mainSplit.WinTitle "demoFiltering1"
 exec mainSplit

diff --git a/packages/demo/bbs/appli/demoOrthoSlicerFor3DFile.bbs b/packages/demo/bbs/appli/demoOrthoSlicerFor3DFile.bbs
deleted file mode 100644 (file)
index f4afc92..0000000
--- a/packages/demo/bbs/appli/demoOrthoSlicerFor3DFile.bbs
+++ /dev/null
@@ -1,109 +0,0 @@
-description "Simple OrthoSlicer : Little Demo of the box <a href=#Viewer2D>Viewer2D</a>."
-author "info-dev@creatis.insa-lyon.fr"
-category "demo"
-
-#Should probabely moved to 'Applications'
-
-// Simple OrthoSlicer for 3D Files (i.e.: not an image stack)
-
-load wxvtk
-include wx
-load vtk
-load std
-load itkvtk
-load itk
-include wxvtk/boxes/bbSimpleSlicer
-
-new LayoutTDown 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 FileSelector openFileDialog
-    
-new ImageReader reader
-    connect openFileDialog.Out reader.In
-    
-#Get image dimensions, ...
-new ImageProperties mc
-   connect reader.Out mc.In
-
-#Get number of column (X)
-new GetVectorIntElement gveX
-   connect mc.Size gveX.In
-   set gveX.I 0
-   
-#Get number of rows (Y)
-new GetVectorIntElement gveY
-   connect mc.Size gveY.In
-   set gveY.I 1
-        
-#Get number of planes  (Z)
-new GetVectorIntElement gveZ
-   connect mc.Size gveZ.In
-   set gveZ.I 2
-
-#Compute the number of the 'middle' slice on X axis
-new Div div0
-  connect   gveX.Out div0.In1
-  set div0.In2 2    
-
-#Compute the number of the 'middle' slice on Y axis
-new Div div1
-  connect   gveY.Out div1.In1
-  set div1.In2 2  
-
-#Compute the number of the 'middle' slice on Z axis
-new Div div2
-  connect   gveZ.Out div2.In1
-  set div2.In2 2 
-  
-  
-// For X axis
-new SimpleSlicer viewerUL
-  connect reader.Out viewerUL.In
-  connect viewerUL.Widget upleft.Widget1
-  #initial slice is the middle one
-  connect div0.Out viewerUL.Slice
-  #Slider size is the number of planes
-  connect  gveX.Out viewerUL.SliderSize
-  set viewerUL.SliderReactiveOnTrack 1
-  set viewerUL.Orientation 0
-  set viewerUL.SliderOrientation H
-  set viewerUL.SliderTitle "Planes YZ"  
-
-
-// For Y axis
-new SimpleSlicer viewerUR
-  connect reader.Out viewerUR.In
-  connect viewerUR.Widget upright.Widget1
-  #initial slice is the middle one
-  connect div1.Out viewerUR.Slice
-  #Slider size is the number of planes
-  connect  gveY.Out viewerUR.SliderSize
-  set viewerUR.SliderReactiveOnTrack 1
-  set viewerUR.SliderOrientation H
-  set viewerUR.Orientation 1
-  set viewerUR.SliderTitle "Planes XZ" 
-  
-// For Z axis
-new SimpleSlicer viewerTD
-  connect reader.Out viewerTD.In
-  connect viewerTD.Widget down.Widget1
-  #initial slice is the middle one
-  connect div2.Out viewerTD.Slice
-  #Slider size is the number of planes
-  connect  gveZ.Out viewerTD.SliderSize
-  set viewerTD.SliderReactiveOnTrack 1
-  set viewerTD.SliderOrientation H
-  set viewerTD.Orientation 2
-  set viewerTD.SliderTitle "Planes XY"
-    
-exec main
-exec viewerTD
-
-

diff --git a/packages/demo/bbs/appli/demoSimpleSlicer.bbs b/packages/demo/bbs/appli/demoSimpleSlicer.bbs
deleted file mode 100755 (executable)
index e314783..0000000
--- a/packages/demo/bbs/appli/demoSimpleSlicer.bbs
+++ /dev/null
@@ -1,45 +0,0 @@
-
-description "Demo of the box <a href=#SimpleSlicer>SimpleSlicer</a>."
-author "info-dev@creatis.insa-lyon.fr"
-category "demo"
-
-load vtk
-load itk
-load itkvtk
-load wx
-
-include wxvtk/boxes/bbSimpleSlicer
-
-new FileSelector openFileDialog 
-  set openFileDialog.Message "Select input image"
-
-new ImageReader reader
-  connect openFileDialog.Out reader.In
-
-#Get image dimensions, ...
-new ImageProperties mc
-   connect reader.Out mc.In
-   
-#Get number of planes
-new GetVectorIntElement gve
-   connect mc.Size gve.In
-   set gve.I 2
-
-#Compute the number of the 'middle' slice
-new Div div
-  connect   gve.Out div.In1
-  set div.In2 2
-
-new SimpleSlicer viewer
-connect   reader.Out viewer.In
-
-set viewer.WinTitle "demoSimpleSlicer"
-set viewer.WinWidth 350
-set viewer.WinHeight 400
-
-#initial slice is the middle one
-connect div.Out viewer.Slice
-#Slider size is the number of planes
-connect  gve.Out viewer.SliderSize
-
-exec viewer

diff --git a/packages/demo/bbs/appli/demoSimpleViewer3DFor3DFiles.bbs b/packages/demo/bbs/appli/demoSimpleViewer3DFor3DFiles.bbs
deleted file mode 100644 (file)
index b444117..0000000
--- a/packages/demo/bbs/appli/demoSimpleViewer3DFor3DFiles.bbs
+++ /dev/null
@@ -1,34 +0,0 @@
-description "demo of the box vtk::ImagePlanes."
-author "info-dev@creatis.insa-lyon.fr"
-category "demo"
-
-// Just a 3 Planes viewer for '3D files' (i.e. : not an image stack)
-
-// should be moved to categ 'appli'
-
-load vtk
-load wxvtk
-load wx
-load itk
-load itkvtk
-
-new FileSelector openFileDialog 
-  set openFileDialog.Message "Select input image"
-
-new ImageReader reader
-  connect openFileDialog.Out reader.In
-   
-new ImagePlanes planes
-new Viewer3D viewer
-connect reader.Out planes.In
-connect planes.PlaneX viewer.Obs1
-connect planes.PlaneY viewer.Obs2
-connect planes.PlaneZ viewer.Obs3
-
-load std
-set viewer.WinTitle "Demo of Simple Viewer3D"
-set viewer.WinWidth 350
-set viewer.WinHeight 400
-
-exec viewer
-

diff --git a/packages/demo/bbs/appli/demo3Viewers2D1Viewer3D.bbs b/packages/demo/bbs/appli/demoViewing1.bbs
similarity index 88%
rename from packages/demo/bbs/appli/demo3Viewers2D1Viewer3D.bbs
rename to packages/demo/bbs/appli/demoViewing1.bbs
index a656319df43a9022398fb00837e95bc85b7412a6..4370f423a2d871b54b78749b460d6510b57d4219 100644 (file)
--- a/packages/demo/bbs/appli/demo3Viewers2D1Viewer3D.bbs
+++ b/packages/demo/bbs/appli/demoViewing1.bbs
@@ -1,9 +1,7 @@
-description "Little Demo of the box <a href=#Viewer2D>Viewer2D</a>."
-author "info-dev@creatis.insa-lyon.fr"
+description "3 slicers and a 3D view"
+author "jpr@creatis.insa-lyon.fr"
 category "demo"
 
-#Should probabely moved to 'Applications'
-
 // To show how easy it is to add smthing
 
 load wxvtk
@@ -23,11 +21,15 @@ connect upright.Widget main.Widget1
 connect upleft.Widget main.Widget2
 connect down.Widget main.Widget3
 
-new FileSelector openFileDialog
-    
-new ImageReader reader
-    connect openFileDialog.Out reader.In
-    
+# 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
+ 
+   
 #Get image dimensions, ...
 new ImageProperties mc
    connect reader.Out mc.In
@@ -115,6 +117,7 @@ new Viewer3D viewer
 
    connect viewer.Widget main.Widget4
        
+set main.WinTitle "demoViewing1"
 exec main
 exec viewerTD