From 2655f6362d2e97439542ef6474f488e06310fc2b Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 14 Oct 2008 09:54:58 +0000
Subject: [PATCH] *** empty log message ***

---
 .../appli/exampleIsoSurfaceWithControls.bbs   | 45 +++++++++++--------
 packages/wxvtk/bbs/appli/exampleViewer2D.bbs  | 24 ++++++----
 2 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/packages/wxvtk/bbs/appli/exampleIsoSurfaceWithControls.bbs b/packages/wxvtk/bbs/appli/exampleIsoSurfaceWithControls.bbs
index b5c8596..e604657 100644
--- a/packages/wxvtk/bbs/appli/exampleIsoSurfaceWithControls.bbs
+++ b/packages/wxvtk/bbs/appli/exampleIsoSurfaceWithControls.bbs
@@ -2,6 +2,11 @@ description "Example of IsoSurfaceWithControls."
 author "laurent.guigues at creatis.insa-lyon.fr"
 category "example"
 
+include wxvtk/boxes/bbIsoSurfaceWithControls
+description "Example of IsoSurfaceWithControls."
+author "laurent.guigues at creatis.insa-lyon.fr"
+category "example"
+
 include wxvtk/boxes/bbIsoSurfaceWithControls
 include vtk/boxes/bbLoadHola
  
@@ -10,36 +15,40 @@ new IsoSurfaceWithControls surface2
 
 load wxvtk
 new Viewer3D viewer
-new LoadHola image
+new LoadHola image1
+new LoadHola image2
+
+connect image1.Out surface1.In
+connect image2.Out surface2.In
+
+set surface1.Isovalue 100
+set surface1.Opacity 100
+set surface1.Colour "0.5 0 0"
+set surface1.Title "Iso-surface 1"
+
+set surface2.Isovalue 200
+set surface2.Opacity 20
+set surface2.Title "Iso-surface 2"
+
 
-connect image.Out surface1.In
-connect image.Out surface2.In
 connect surface1.Out viewer.In1
 connect surface2.Out viewer.In2
 new MultipleInputs refresh
 connect surface1.BoxChange refresh.In1
 connect surface2.BoxChange refresh.In2
-connect refresh.Out viewer.BoxExecute
 
-new LayoutSplit main
+new LayoutLine main
 new LayoutLine controls
 connect viewer.Widget main.Widget1
 connect controls.Widget main.Widget2 
 connect surface1.Widget controls.Widget1 
 connect surface2.Widget controls.Widget2
 
+set main.WinWidth 800
+set main.WinHeight  800
 
-set surface1.Isovalue 100
-set surface1.Opacity 100
-set surface1.Colour "0.5 0 0"
-set surface1.Title "Iso-surface 1"
-
-set surface2.Isovalue 200
-set surface2.Opacity 20
-set surface2.Title "Iso-surface 2"
-
-set main.WinWidth 1200
-set main.WinHide  1000
-
-#message All 9
 exec main
+
+# BUG in pipeline update : have to plug forced execution of viewer 
+# after creation of all windows
+connect refresh.Out viewer.BoxExecute
diff --git a/packages/wxvtk/bbs/appli/exampleViewer2D.bbs b/packages/wxvtk/bbs/appli/exampleViewer2D.bbs
index 6f99b01..11e446c 100644
--- a/packages/wxvtk/bbs/appli/exampleViewer2D.bbs
+++ b/packages/wxvtk/bbs/appli/exampleViewer2D.bbs
@@ -11,17 +11,23 @@ new Viewer2D viewer
 connect image.Out viewer.In
 
 load std
-set viewer.WinTitle "ExampleViewer2D"
+
 set viewer.Slice 20
-set viewer.WinWidth 400
-set viewer.WinHeight 400
 
-exec viewer
+#Quick and dirty fix for a known bug 
+# viewer2D does not display image when first executed : 
+# have to re-execute it after it has been created for example using a button
+new CommandButton refresh
+   set refresh.Label "Click here to Refresh"
+
+new LayoutLine layout
+connect viewer.Widget layout.Widget1
+connect refresh.Widget layout.Widget2
+connect refresh.BoxChange viewer.BoxExecute
 
+set layout.WinTitle "ExampleViewer2D"
+set layout.WinWidth 400
+set layout.WinHeight 400
 
-#Quick and dirty fix for a known bug :
-new CommandButton refresh
-   set refresh.Label "Known bug : Black image, click here to Refresh"
-   set refresh.In "exec viewer"
 
-exec refresh
+exec layout
-- 
2.45.1