From 8586ecb2c333e453ce5e50e3e91971d124dec578 Mon Sep 17 00:00:00 2001
From: guigues <guigues>
Date: Tue, 25 Nov 2008 11:31:03 +0000
Subject: [PATCH] New widget pipeline processing : should be almost ok

---
 packages/wx/src/bbwxCommandButton.cxx        | 13 +++++++----
 packages/wxvtk/bbs/appli/exampleViewer2D.bbs | 24 +++-----------------
 packages/wxvtk/src/bbwxvtkViewer2D.cxx       | 12 ++++++----
 3 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/packages/wx/src/bbwxCommandButton.cxx b/packages/wx/src/bbwxCommandButton.cxx
index ca8ac02..b56228f 100644
--- a/packages/wx/src/bbwxCommandButton.cxx
+++ b/packages/wx/src/bbwxCommandButton.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxCommandButton.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:51 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2008/11/25 11:31:03 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -178,13 +178,18 @@ namespace bbwx
     lstColour.push_back(0.75);
     lstColour.push_back(0.75);
     bbSetInputColour(lstColour);
+    bbSetOutputWidget(0);
   }
   
   
   void CommandButton::Process() 
   { 
-    UpdateColour();
-    UpdateLabel();
+    CommandButtonWidget* w = (CommandButtonWidget*)bbGetOutputWidget();
+    if (w) 
+      {
+	UpdateColour();
+	UpdateLabel();
+      }
   }
   
   void CommandButton::UpdateColour()
diff --git a/packages/wxvtk/bbs/appli/exampleViewer2D.bbs b/packages/wxvtk/bbs/appli/exampleViewer2D.bbs
index 3b7235f..94a54c5 100644
--- a/packages/wxvtk/bbs/appli/exampleViewer2D.bbs
+++ b/packages/wxvtk/bbs/appli/exampleViewer2D.bbs
@@ -4,31 +4,13 @@ category "example"
 
 include vtk/boxes/bbLoadHola
 load wxvtk
-load wx
 
 new LoadHola image
 new Viewer2D viewer
 connect image.Out viewer.In
 
-load std
-
+# To get the string to int adaptor and set the slice
+load std 
 set viewer.Slice 20
 
-#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 LayoutSplit layout
-  set layout.Proportion 80
-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
-
-
-exec layout
+exec viewer
diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index ebf62d1..1e1616b 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/24 15:45:53 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2008/11/25 11:31:08 $
+  Version:   $Revision: 1.22 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -215,6 +215,7 @@ namespace bbwxvtk
 	        z = ext[5]; // Why not?
            }
 
+	    std::cout << "V2D Render "<<std::endl;
             wxvtkrenderwindowinteractor->Update();
             wxvtkrenderwindowinteractor->Render();
             imageViewer->GetRenderer()->ResetCameraClippingRange();
@@ -275,7 +276,7 @@ namespace bbwxvtk
   {
     bbSetInputIn(NULL);
     bbSetInputSlice(0);
-	  bbSetOutputWidget(0);
+    bbSetOutputWidget(0);
     bbSetInputOrientation(0);
   }
 
@@ -299,7 +300,9 @@ namespace bbwxvtk
   // when window is shown
   void  Viewer2D::OnShowWidget()
   {
-
+    std::cout << "V2D::OnShow"<<std::endl;
+    ((Viewer2DWidget*)bbGetOutputWidget())->Update();
+    ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
 #if defined(_WIN32)
 //    ((Viewer2DWidget*)bbGetOutputWidget())->Refresh();
     ((Viewer2DWidget*)bbGetOutputWidget())->Update();
@@ -310,6 +313,7 @@ namespace bbwxvtk
     ((Viewer2DWidget*)bbGetOutputWidget())->Update();
     ((Viewer2DWidget*)bbGetOutputWidget())->UpdateView();
     */
+    std::cout << "V2D::OnShow OK"<<std::endl;
   }
   
 
-- 
2.45.1