From: guigues <guigues>
Date: Thu, 13 Nov 2008 14:46:41 +0000 (+0000)
Subject: Another ugly bug fixed in pipeline executing (bad transfer to parent in some cases... 
X-Git-Tag: v0.9.1~94
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=236a8e2fee9937c050e2d16c7222e1caa993f01c;p=bbtk.git

Another ugly bug fixed in pipeline executing (bad transfer to parent in some cases for WxBlackBoxes)
---

diff --git a/kernel/appli/bbi/bbi.cxx b/kernel/appli/bbi/bbi.cxx
index 86952f5..c4ef2fd 100644
--- a/kernel/appli/bbi/bbi.cxx
+++ b/kernel/appli/bbi/bbi.cxx
@@ -151,7 +151,7 @@ bool wxBBIApp::OnCmdLineParsed(wxCmdLineParser& parser)
 // main frame
 bool wxBBIApp::OnInit( )
 {
-      std::cout << "OnInit"<<std::endl;
+  //      std::cout << "OnInit"<<std::endl;
   wxApp::OnInit();
 #ifdef __WXGTK__
   //See http://www.wxwindows.org/faqgtk.htm#locale
@@ -212,7 +212,7 @@ bool wxBBIApp::OnInit( )
       //      std::cout << "!I->Close"<<std::endl;
     }
 	
-	std::cout << "EO OnInit"<<std::endl;
+  //	std::cout << "EO OnInit"<<std::endl;
 
   return true;
 
diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index a947d00..1b11dcf 100644
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:12 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -92,7 +92,18 @@ namespace bbtk
 			"=> AtomicBlackBox::bbBackwardUpdate("
 			<<(caller?caller->GetFullName():"0")<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
-    
+
+    // If already executing : return
+    if (bbGetExecuting()) 
+      {
+	bbtkDebugMessage("process",3,
+			 " -> already executing : bailing out"<<std::endl);
+	return bbGetStatus();
+      }
+    bbSetExecuting(true);
+    bool wasExecuting = bbGlobalGetSomeBoxExecuting();
+    bbGlobalSetSomeBoxExecuting(true);
+
     bbtkDebugMessage("process",5,"Initial Status  = "<<bbGetStatus()
                     <<std::endl);
     bbtkDebugMessage("process",5,"BoxProcessMode  = "
@@ -103,15 +114,14 @@ namespace bbtk
         ( bbBoxProcessModeIsAlways() ) )
       {
 
-	bbSetStatus(UPDATING);
-	
-	bool wasExecuting = bbGlobalGetSomeBoxExecuting();
-        bbGlobalSetSomeBoxExecuting(true);
+	//	bbSetStatus(UPDATING);
 
         // Updates its inputs
         IOStatus s = bbUpdateInputs();
     
-        bbtkDebugMessage("process",6,"Inputs post-update status = "<<s<<std::endl);
+        bbtkDebugMessage("process",6,"=> AtomicBlackBox::bbBackwardUpdate("
+			<<(caller?caller->GetFullName():"0")<<") ["
+			<<bbGetFullName()<<"] : Inputs post-update status = "<<s<<std::endl);
         // If all inputs are in UPTODATE post-update status 
         // and mProcessMode is not "Always"
         // then the box is now UPTODATE
@@ -134,7 +144,6 @@ namespace bbtk
         // Displays the window (WxBlackbox)
         bbShowWindow(caller);
 
-        bbGlobalSetSomeBoxExecuting(wasExecuting);
 
       }
     else 
@@ -142,12 +151,16 @@ namespace bbtk
         bbtkDebugMessage("process",5,"Up-to-date : nothing to do"<<std::endl);
       }
 
-    bbtkDebugMessage("process",5,"Final Status    = "
-            <<bbGetStatus()<<std::endl);
+    bbtkDebugMessage("process",5,"=> AtomicBlackBox::bbBackwardUpdate("
+		     <<(caller?caller->GetFullName():"0")<<") ["
+		     <<bbGetFullName()<<"] : Final Status    = "
+		     <<bbGetStatus()<<std::endl);
     bbtkDebugMessage("process",3,
             "<= AtomicBlackBox::bbBackwardUpdate() ["
             <<bbGetFullName()<<"]"<<std::endl);
 
+    bbSetExecuting(false);
+    bbGlobalSetSomeBoxExecuting(wasExecuting);
 
     return bbGetStatus();
 
diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index d68ce23..8c026f2 100644
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:12 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -120,7 +120,7 @@
     bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()	\
 		     <<"]"<<std::endl);					\
     CALLBACK();								\
-    bbtkDebugMessage("process",2,"<** Processing ["<<bbGetFullName()	\
+    bbtkDebugMessage("process",1,"<** Processing ["<<bbGetFullName()	\
 		     <<"]"<<std::endl);					\
   }
 //============================================================================
diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 6d134c9..3b39556 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/11/13 10:37:27 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.28 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -103,6 +103,7 @@ namespace bbtk
   BlackBox::BlackBox(const std::string &name) 
     : 
     bbmStatus(MODIFIED), 
+    bbmExecuting(false),
     bbmName(name),
     bbmBoxProcessMode("Pipeline"),
     bbmParent()
@@ -123,6 +124,7 @@ namespace bbtk
   BlackBox::BlackBox(BlackBox& from, const std::string &name) 
     :
       bbmStatus(from.bbmStatus), 
+      bbmExecuting(false),
       bbmName(name), 
       bbmBoxProcessMode(from.bbmBoxProcessMode),
       bbmParent()
@@ -155,9 +157,16 @@ namespace bbtk
   void BlackBox::bbExecute(bool force)
   {
     bbtkDebugMessageInc("process",2,
-			"=> BlackBox::bbExecute() ["
+			"=> BlackBox::bbExecute("<<(int)force<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
  
+    // If already executing : return
+    if (bbGetExecuting()) 
+      {
+	bbtkDebugMessage("process",2,
+			 " -> already executing : bailing out"<<std::endl);
+	return;
+      }
 
     // If execution frozen : return
     if (bbGlobalGetFreezeExecution()) 
diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index 17ed4c1..467e40c 100644
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:12 $
-  Version:   $Revision: 1.13 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.14 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -373,9 +373,14 @@ bool reaction = true);
     /// which means execute in response to an input change 
     virtual bool bbCanReact() const;
     
+    /// Returns true iff the box is executing
+    bool bbGetExecuting() const { return bbmExecuting; }
+
   protected:  
     static void bbGlobalAddToExecutionList( BlackBox::Pointer b );
     static void bbGlobalProcessExecutionList();
+    /// Sets the bbmExecuting bool returned by bbGetExecuting
+    void bbSetExecuting(bool b) { bbmExecuting = b; }
 
     //==================================================================
   protected:
@@ -415,6 +420,8 @@ bool reaction = true);
     // PRIVATE PART 
     /// The status of the box
     IOStatus bbmStatus;
+    /// Is the box executing ?
+    bool bbmExecuting;
     /// The name of the black-box
     std::string bbmName;
     /// The name of the package to which it belongs
diff --git a/kernel/src/bbtkConnection.h b/kernel/src/bbtkConnection.h
index 7540041..2b1fe73 100644
--- a/kernel/src/bbtkConnection.h
+++ b/kernel/src/bbtkConnection.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:13 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.9 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -62,8 +62,8 @@ namespace bbtk
   const int MODIFIED = 0;
   /// 
   const int UPTODATE = 1;
-  /// 
-  const int UPDATING = 2;
+  /// OBSOLETE 
+  ///  const int UPDATING = 2;
 
 
   class BBTK_EXPORT Connection : public Object
diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index de9ce1d..763fcb5 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:14 $
-  Version:   $Revision: 1.27 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.28 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -419,7 +419,7 @@ namespace bbtk
   void WxBlackBox::bbExecute(bool force)
   {
     bbtkDebugMessageInc("process",2,
-			"=> WxBlackBox::bbExecute() ["
+			"=> WxBlackBox::bbExecute("<<(int)force<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
     // If the output 'Widget' is connected then 
@@ -459,8 +459,7 @@ namespace bbtk
 		     "=> WxBlackBox::bbBackwardUpdate("
 		     <<(caller?caller->GetFullName():"0")<<") ["
 		     <<bbGetFullName()<<"]"<<std::endl);
-    // If the caller's box to is not the box to connected to the 
-    // output 'Widget'
+
     if ( ! (( bbGetStatus() == MODIFIED ) ||
 	    ( bbBoxProcessModeIsAlways() )) )
       {
@@ -472,6 +471,9 @@ namespace bbtk
 	return bbGetStatus();
       }
  
+    // If the caller's box to is not the box to connected to the 
+    // output 'Widget'
+
     BlackBox::OutputConnectorMapType::const_iterator i 
       = bbGetOutputConnectorMap().find("Widget") ;
     if ( i->second->GetConnectionVector().size() != 0 )
@@ -500,7 +502,7 @@ namespace bbtk
 	    ((caller!=0) && 
 	     (caller->GetBlackBoxTo() != to))&&
 	    (!bbGetUpdateTransferedToParent())&&
-	    (to->bbGetStatus()!=UPDATING))
+	    (!to->bbGetExecuting()))
 	  {
 	    bbtkDebugMessage("process",3,
 			     "   ... Transfering update order to parent"
@@ -664,7 +666,7 @@ namespace bbtk
       }
   
 
-    bbtkDebugMessage("wx",1,"<= WxBlackBox::bbShowWindow() ["
+    bbtkDebugMessage("wx",2,"<= WxBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
   }
@@ -681,7 +683,7 @@ namespace bbtk
 
     if (bbGetWindow()!=0) bbGetWindow()->bbHide();
 
-    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbHideWindow() ["
+    bbtkDebugMessageDec("wx",2,"<= WxBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
@@ -695,7 +697,7 @@ namespace bbtk
 
     if (bbGetWindow()!=0) bbGetWindow()->bbClose();
 
-    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbCloseWindow() ["
+    bbtkDebugMessageDec("wx",2,"<= WxBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index f11ddeb..bfa37e7 100644
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:15 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2008/11/13 14:46:43 $
+  Version:   $Revision: 1.19 $
 ========================================================================*/
 
 
@@ -224,10 +224,25 @@ namespace bbtk
   public:								\
   inline void bbUserCreateWidget()					\
   {									\
-    bbtkDebugMessageInc("process",1,"**> Creating widget for ["		\
+    bbtkDebugMessageInc("wx",1,"**> Creating widget for ["		\
 			<<bbGetFullName()<<"]"<<std::endl);		\
     CALLBACK();								\
-    bbtkDebugMessageInc("process",2,"<** Creating widget for ["		\
+    bbtkDebugMessageInc("wx",1,"<** Creating widget for ["		\
+			<<bbGetFullName()<<"]"<<std::endl);		\
+  }
+  
+  //======================================================================
+
+  //======================================================================
+  /// Defines the bbUserOnShow method
+#define BBTK_ON_SHOW_WIDGET(CALLBACK)					\
+  public:								\
+  inline void bbUserOnShow()					\
+  {									\
+    bbtkDebugMessageInc("wx",1,"**> Showing ["		\
+			<<bbGetFullName()<<"]"<<std::endl);		\
+    CALLBACK();								\
+    bbtkDebugMessageInc("wx",1,"<** Showing ["		\
 			<<bbGetFullName()<<"]"<<std::endl);		\
   }
   
diff --git a/packages/wx/src/bbwxLayoutLine.cxx b/packages/wx/src/bbwxLayoutLine.cxx
index 3d15b3f..55be896 100644
--- a/packages/wx/src/bbwxLayoutLine.cxx
+++ b/packages/wx/src/bbwxLayoutLine.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutLine.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/11/13 14:46:46 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -106,7 +106,7 @@ namespace bbwx
   
   // This callback is necessary to get actual processing of the view 
   // when window is shown
-  void  LayoutLine::bbUserOnShow()
+  void  LayoutLine::OnShowWidget()
   {
 	  bbUserOnShowWidget("Widget1");
 	  bbUserOnShowWidget("Widget2");
diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h
index 6884c85..50ee0c0 100644
--- a/packages/wx/src/bbwxLayoutLine.h
+++ b/packages/wx/src/bbwxLayoutLine.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutLine.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/11/13 14:46:46 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -77,10 +77,11 @@ namespace bbwx
     BBTK_DECLARE_INPUT(Orientation,std::string);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
-    
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+ 
     void Process();
     void CreateWidget();
-    void bbUserOnShow();
+    void OnShowWidget();
     
   protected:
 	virtual void bbUserConstructor();
diff --git a/packages/wx/src/bbwxLayoutSplit.cxx b/packages/wx/src/bbwxLayoutSplit.cxx
index 1c1e265..939355f 100644
--- a/packages/wx/src/bbwxLayoutSplit.cxx
+++ b/packages/wx/src/bbwxLayoutSplit.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutSplit.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/21 08:37:09 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/11/13 14:46:46 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -88,10 +88,20 @@ namespace bbwx
 
   // This callback is necessary to get actual processing of the view 
   // when window is shown
-  void  LayoutSplit::bbUserOnShow()
+  void  LayoutSplit::OnShowWidget()
   {
+    if (bbGetOutputWidget()==0)
+      {
+	return;
+	//bbtkError("LayoutSplit::OnShowWidget() : Output Widget == 0 !");
+      }
     wxSplitterWindow* win = (wxSplitterWindow*)bbGetOutputWidget();
     int w,h;
+    if (win==0)
+      {
+	return;
+	//	bbtkError("LayoutSplit::OnShowWidget() : win == 0 !");
+      }
     win->GetClientSize(&w,&h);
     int pos = 100;
     if (bbtk::Utilities::loosematch(bbGetInputOrientation(),
diff --git a/packages/wx/src/bbwxLayoutSplit.h b/packages/wx/src/bbwxLayoutSplit.h
index 4f0ff98..0db41d3 100644
--- a/packages/wx/src/bbwxLayoutSplit.h
+++ b/packages/wx/src/bbwxLayoutSplit.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutSplit.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/11/13 14:46:46 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -68,10 +68,11 @@ namespace bbwx
     BBTK_DECLARE_INPUT(Proportion,int);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
     
     void Process();
     void CreateWidget();
-    void bbUserOnShow();
+    void OnShowWidget();
 
   protected:
     virtual void bbUserConstructor();
diff --git a/packages/wx/src/bbwxLayoutTab.cxx b/packages/wx/src/bbwxLayoutTab.cxx
index bef9dc7..71db4f9 100644
--- a/packages/wx/src/bbwxLayoutTab.cxx
+++ b/packages/wx/src/bbwxLayoutTab.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2008/11/13 14:46:46 $
+  Version:   $Revision: 1.6 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -108,7 +108,7 @@ namespace bbwx
 
   // This callback is necessary to get actual processing of the view 
   // when window is shown
-  void  LayoutTab::bbUserOnShow()
+  void  LayoutTab::OnShowWidget()
   {
 	  bbGetOutputWidget()->Show();
 	  bbUserOnShowWidget("Widget1");
diff --git a/packages/wx/src/bbwxLayoutTab.h b/packages/wx/src/bbwxLayoutTab.h
index f9d9855..1f76929 100644
--- a/packages/wx/src/bbwxLayoutTab.h
+++ b/packages/wx/src/bbwxLayoutTab.h
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.h,v $
   Language:  C++
-  Date:      $Date: 2008/10/17 08:18:32 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/11/13 14:46:46 $
+  Version:   $Revision: 1.7 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -77,10 +77,11 @@ namespace bbwx
     BBTK_DECLARE_INPUT(Orientation,std::string);
     BBTK_PROCESS(Process);
     BBTK_CREATE_WIDGET(CreateWidget);
-    
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+ 
     void Process();
     void CreateWidget();
-    void bbUserOnShow();
+    void OnShowWidget();
 
   protected:
 	virtual void bbUserConstructor();
diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx
index 465b831..a19eeac 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/10/24 12:15:27 $
-  Version:   $Revision: 1.18 $
+  Date:      $Date: 2008/11/13 14:46:48 $
+  Version:   $Revision: 1.19 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -292,7 +292,7 @@ namespace bbwxvtk
 
   // This callback is necessary to get actual processing of the view 
   // when window is shown
-  void  Viewer2D::bbUserOnShow()
+  void  Viewer2D::OnShowWidget()
   {
 
 #if defined(_WIN32)
diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index 476c838..b0a9d82 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.h,v $
   Language:  C++
-  Date:      $Date: 2008/09/10 12:01:48 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/11/13 14:46:48 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -83,10 +83,12 @@ namespace bbwxvtk
     BBTK_DECLARE_OUTPUT(Out,int);
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_PROCESS(Process);
-    void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+    
+    void Process();
     void CreateWidget();
-    void bbUserOnShow();
+    void OnShowWidget();
     void bbUserConstructor();
   };
    
diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.cxx b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
index 48abcec..3f61f57 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.cxx
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/06/26 18:45:58 $
-  Version:   $Revision: 1.8 $
+  Date:      $Date: 2008/11/13 14:46:48 $
+  Version:   $Revision: 1.9 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -221,7 +221,7 @@ void Viewer3DWidget::Refresh(bool eraseBackground , const wxRect* rect )
 
   // This callback is necessary to get actual processing of the view 
   // when window is shown
-  void  Viewer3D::bbUserOnShow()
+  void  Viewer3D::OnShowWidget()
   {
     ((Viewer3DWidget*)bbGetOutputWidget())->Update();
   }
diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h
index ade8eb0..a493efb 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.h,v $
   Language:  C++
-  Date:      $Date: 2008/09/10 12:01:48 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/11/13 14:46:48 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -91,10 +91,12 @@ namespace bbwxvtk
     BBTK_DECLARE_OUTPUT(Renderer,vtkRenderer*);
     BBTK_DECLARE_OUTPUT(Interactor,wxVTKRenderWindowInteractor*);
     BBTK_PROCESS(Process);
-    void Process();
     BBTK_CREATE_WIDGET(CreateWidget);
+    BBTK_ON_SHOW_WIDGET(OnShowWidget);
+  
+    void Process();
     void CreateWidget();
-    void bbUserOnShow();
+    void OnShowWidget();
 
   protected:
     virtual void bbUserConstructor();