X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fbbs%2Fappli%2FwxvtkTour.bbs;h=c9d1d5995c108c75159ef53e755d756b61e1f6e4;hb=baba8ec4d60d8609b87b7506704611d78449d455;hp=6d47cb4ba01b6625e61a58bf728e2a4eb84ce289;hpb=82d8084b03542781707ca1a7e4d4a9682567337a;p=bbtk.git

diff --git a/packages/wxvtk/bbs/appli/wxvtkTour.bbs b/packages/wxvtk/bbs/appli/wxvtkTour.bbs
index 6d47cb4..c9d1d59 100644
--- a/packages/wxvtk/bbs/appli/wxvtkTour.bbs
+++ b/packages/wxvtk/bbs/appli/wxvtkTour.bbs
@@ -18,9 +18,9 @@ print "====================================="
 help Viewer2D
 message echo 2
 
-new LoadHola image
+new LoadHola reader
 new Viewer2D viewer
-connect image.Out viewer.In
+connect reader.Out viewer.In
 set viewer.Slice 20
 set viewer.WinDialog true
 exec viewer
@@ -34,9 +34,9 @@ print "====================================="
 help SimpleSlicer
 message echo 2
 
-new LoadHola image
+new LoadHola reader
 new SimpleSlicer viewer
-connect image.Out viewer.In
+connect reader.Out viewer.In
 set viewer.WinDialog true
 exec viewer
 
@@ -49,10 +49,10 @@ print "====================================="
 help DoubleSlicer
 message echo 2
 
-new LoadHola image
+new LoadHola reader
 new DoubleSlicer viewer 
-connect image.Out viewer.In1
-connect image.Out viewer.In2
+connect reader.Out viewer.In1
+connect reader.Out viewer.In2
 set viewer.WinDialog true
 exec viewer
 
@@ -66,10 +66,10 @@ help ImagePlanes
 message echo 2
 
 
-new LoadHola image
+new LoadHola reader
 new ImagePlanes planes
 new Viewer3D viewer
-connect image.Out planes.In
+connect reader.Out planes.In
 connect planes.PlaneX viewer.Obs1
 connect planes.PlaneY viewer.Obs2
 connect planes.PlaneZ viewer.Obs3
@@ -85,9 +85,9 @@ print "====================================="
 help SimpleIsoSurfaceViewer
 message echo 2
 
-new LoadHola image
+new LoadHola reader
 new SimpleIsoSurfaceViewer viewer
-connect image.Out viewer.In
+connect reader.Out viewer.In
 set viewer.WinDialog true
 exec viewer
 
@@ -97,18 +97,18 @@ print " "
 print "====================================="
 print "Viewing both 3 slices and an iso-surface of an image in 3D"
 print "====================================="
-help IsoSurfaceWithControls
+help IsoSurfaceWidget
 message echo 2
 
-new LoadHola image
+new LoadHola reader
 new Viewer3D viewer
 new ImagePlanes planes
-connect image.Out planes.In
+connect reader.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
+new IsoSurfaceWidget isosurface
+connect reader.Out isosurface.In
 connect isosurface.Out viewer.In1
 connect isosurface.BoxChange viewer.BoxExecute
 
@@ -123,25 +123,29 @@ message echo 0
 clear
 print " "
 print "====================================="
-print "A simple MIP"
+print "Volume rendering"
 print "====================================="
-help MIPWithControls
+help VolumeRenderer
 message echo 2
 
-new LoadHola image
+new LoadHola reader
+new PiecewiseFunction color
+new PiecewiseFunction opacity
+new VolumeRenderer renderer
 new Viewer3D viewer
-new MIPWithControls MIP
 
-connect image.Out MIP.In
-connect MIP.Out viewer.In1
-connect MIP.BoxChange viewer.BoxExecute
+connect reader.Out renderer.In
+connect color.Out renderer.ColorFunction
+connect opacity.Out renderer.OpacityFunction
+connect renderer.Out viewer.In1
 
-new LayoutSplit main
-connect viewer.Widget main.Widget1
-connect MIP.Widget main.Widget2 
-set main.Proportion 70
-set main.WinDialog true
-exec main
+set color.X "0 500 1000"
+set color.Y "0 0.01 1"
+set opacity.X "0 500 1000"
+set opacity.Y "0 0.01 0.1"
+
+set viewer.WinDialog true
+exec viewer
 
 message echo 0
 message Help 1