*** empty log message ***

diff --git a/packages/wx/bbs/appli/wxTour.bbs b/packages/wx/bbs/appli/wxTour.bbs
index 3f27202c769249c24a5436af109a764e774bd3a1..03f12152f44add2d7e6d31f7c4c87d0ecfa32434 100644 (file)
--- a/packages/wx/bbs/appli/wxTour.bbs
+++ b/packages/wx/bbs/appli/wxTour.bbs
@@ -7,6 +7,9 @@ include wx
 print " "
 print "============================"
 print "A Slider whose output is plugged into an OutputText"
 print " "
 print "============================"
 print "A Slider whose output is plugged into an OutputText"

+print "============================"
+print " "
+#==================================================================

 message echo 2
 
 # Create the Slider
 message echo 2
 
 # Create the Slider


@@ -17,15 +20,15 @@ set slider.ReactiveOnTrack 1
 new OutputText text
 # Add the Layout
 new LayoutLine main
 new OutputText text
 # Add the Layout
 new LayoutLine main

-# Make it a Dialog 
+# Make it a Dialog

 set main.WinDialog true
 
 set main.WinDialog true
 

-# Setting up the Layout :
+# Setting up the Layout

 connect slider.Widget    main.Widget1
 connect text.Widget      main.Widget2
 
 connect slider.Widget    main.Widget1
 connect text.Widget      main.Widget2
 

-# The output of the slider is plugged into the input of the text
-# To do this, we must have an int to string adaptor, hence load std
+#The output of the slider is plugged into the input of the text
+#To do this, we must have an int to string adaptor, hence load std

 load std
 connect slider.Out       text.In
 
 load std
 connect slider.Out       text.In
 


@@ -41,11 +44,18 @@ clear
 print " "
 print "============================"
 print "Splitting a window into two adjustable parts"
 print " "
 print "============================"
 print "Splitting a window into two adjustable parts"

+print "============================"
+print " "

 #==================================================================
 message echo 2
 
 new LayoutSplit main
 #==================================================================
 message echo 2
 
 new LayoutSplit main

-
+new Slider slider1
+new Slider slider2
+connect slider1.Widget main.Widget1
+connect slider2.Widget main.Widget2
+set main.Proportion 75
+set main.Orientation Horizontal

 set main.WinDialog true
 exec main
 
 set main.WinDialog true
 exec main
 

diff --git a/packages/wxvtk/bbs/appli/wxvtkTour.bbs b/packages/wxvtk/bbs/appli/wxvtkTour.bbs
index a33286db6f06d5443039285b8f3c3b7cb02d59e4..4eb71d08d971674895c7e3dda93193236d889ee3 100644 (file)
--- a/packages/wxvtk/bbs/appli/wxvtkTour.bbs
+++ b/packages/wxvtk/bbs/appli/wxvtkTour.bbs
@@ -56,6 +56,92 @@ connect image.Out viewer.In2
 set viewer.WinDialog true
 exec viewer
 
 set viewer.WinDialog true
 exec viewer
 

+message echo 0
+clear
+print " "
+print "====================================="
+print "Slicing an image in 3D"
+print "====================================="
+help ImagePlanes
+message echo 2
+
+
+new LoadHola image
+new ImagePlanes planes
+new Viewer3D viewer
+connect image.Out planes.In
+connect planes.PlaneX viewer.Obs1
+connect planes.PlaneY viewer.Obs2
+connect planes.PlaneZ viewer.Obs3
+set viewer.WinDialog true
+exec viewer
+
+message echo 0
+clear
+print " "
+print "====================================="
+print "Viewing an iso-surface of an image in 3D"
+print "====================================="
+help SimpleIsoSurfaceViewer
+message echo 2
+
+new LoadHola image
+new SimpleIsoSurfaceViewer viewer
+connect image.Out viewer.In
+set viewer.WinDialog true
+exec viewer
+
+message echo 0
+clear
+print " "
+print "====================================="
+print "Viewing both 3 slices and an iso-surface of an image in 3D"
+print "====================================="
+help IsoSurfaceWithControls
+message echo 2
+
+new LoadHola image
+new Viewer3D viewer
+new ImagePlanes planes
+connect image.Out planes.In
+connect planes.PlaneX viewer.Obs1
+connect planes.PlaneY viewer.Obs2
+connect planes.PlaneZ viewer.Obs3
+new IsoSurfaceWithControls isosurface
+connect image.Out isosurface.In
+connect isosurface.Out viewer.In1
+connect isosurface.BoxChange viewer.BoxExecute
+
+new LayoutSplit main
+connect viewer.Widget main.Widget1
+connect isosurface.Widget main.Widget2
+set main.Proportion 70
+set main.WinDialog true
+exec main
+
+message echo 0
+clear
+print " "
+print "====================================="
+print "A simple MIP"
+print "====================================="
+help MIPWithControls
+message echo 2
+
+new LoadHola image
+new Viewer3D viewer
+new MIPWithControls MIP
+
+connect image.Out MIP.In
+connect MIP.Out viewer.In1
+connect MIP.BoxChange viewer.BoxExecute
+
+new LayoutSplit main
+connect viewer.Widget main.Widget1
+connect MIP.Widget main.Widget2 
+set main.Proportion 70
+set main.WinDialog true
+exec main

 
 message echo 0
 clear
 
 message echo 0
 clear

diff --git a/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs b/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs
index fa6968fb02af4c8963bb0e18bc76eeafe43a3613..b0246912a87e0e3be4819bd60a590d11af133ff9 100644 (file)
--- a/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs
+++ b/packages/wxvtk/bbs/boxes/bbSimpleIsoSurfaceViewer.bbs
@@ -37,6 +37,7 @@ define SimpleIsoSurfaceViewer wxvtk
 
  input In surface.In "Input image"
  output Widget main.Widget "Widget"
 
  input In surface.In "Input image"
  output Widget main.Widget "Widget"

+ input WinDialog main.WinDialog "Dialog mode"

  input WinTitle main.WinTitle "Title of the window"
  input WinWidth main.WinWidth "Width of the window"
  input WinHeight main.WinHeight "Height of the window"
  input WinTitle main.WinTitle "Title of the window"
  input WinWidth main.WinWidth "Width of the window"
  input WinHeight main.WinHeight "Height of the window"