X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fwxvtk%2Fbbs%2Fappli%2FwxvtkTour.bbs;h=f9693fe619c3244f0dbb4c928bbf7a4d974123e9;hb=7417646122091ab998bef1f8570663288338c8f4;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..f9693fe 100644
--- a/packages/wxvtk/bbs/appli/wxvtkTour.bbs
+++ b/packages/wxvtk/bbs/appli/wxvtkTour.bbs
@@ -1,3 +1,29 @@
+ # ---------------------------------------------------------------------
+ #
+ # 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 "A tour of wxvtk boxes"
 author "laurent.guigues@creatis.insa-lyon.fr"
 category "demo"
@@ -18,9 +44,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 +60,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 +75,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 +92,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 +111,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 +123,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 +149,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