X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=1050f0441871d305191f6b8d25bec281fa3237a1;hb=e6b2de923e0e69c303c7d18fb8a5c1970541bb3a;hp=be78a7ec853e3ef2197eee8218b4d9a80d4e7ae8;hpb=5934ccb7ca0fabdbe6c1907b2aea3696e19a0251;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index be78a7e..1050f04 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/22 14:30:25 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2008/07/25 07:44:12 $
+  Version:   $Revision: 1.26 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -55,8 +55,6 @@ namespace bbtk
 		     mBox.lock()->bbGetFullName()<<")"<<std::endl);
     mBox.lock()->bbSetWindow(this);
     Wx::IncNbWindowsAlive();
-    bbtkDebugMessage("wx",5," -> Number of windows alive = "
-		     <<Wx::GetNbWindowsAlive()<<std::endl);
   }
   //=========================================================================
 
@@ -71,11 +69,6 @@ namespace bbtk
       {
 	mBox.lock()->bbSetWindow(0);
       }
-    else 
-      {
-      }
-    bbtkDebugMessage("wx",5," -> Number of windows alive = "
-		     <<Wx::GetNbWindowsAlive()<<std::endl);
   }
   //========================================================================= 
 
@@ -87,8 +80,6 @@ namespace bbtk
     bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbShow()"<<std::endl);
     Wx::IncNbWindowsShown();
     mShown = true;
-    bbtkDebugMessage("wx",5," -> Number of windows shown = "
-		     <<Wx::GetNbWindowsShown()<<std::endl);
   }
   //=========================================================================
 
@@ -99,11 +90,14 @@ namespace bbtk
     bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbHide()"<<std::endl);
     Wx::DecNbWindowsShown();
     mShown = false;
-    bbtkDebugMessage("wx",5," -> Number of windows shown = "
-		     <<Wx::GetNbWindowsShown()<<std::endl);
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxWindow::bbClose()
+  {
+  }
+  //=========================================================================
 
 
   //=========================================================================
@@ -116,7 +110,6 @@ namespace bbtk
 				     wxString title,
 				     wxSize size)
     :
-    WxBlackBoxWindow(box),
     wxDialog( parent, 
 		-1, 
 		title,
@@ -128,7 +121,8 @@ namespace bbtk
 		wxMAXIMIZE_BOX | 
 		wxMINIMIZE_BOX | 
 		wxCAPTION  
-		)
+	      ),
+    WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
@@ -147,10 +141,12 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxDialog::bbShow()
   { 
+    if (bbIsShown()) return;
     bbtkDebugMessage("wx",5,"WxBlackBoxDialog::bbShow() ["
 		     <<bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
     WxBlackBoxWindow::bbShow();
     SetReturnCode( wxDialog::ShowModal() ); 
+    bbClose();
   }
   //=========================================================================
 
@@ -163,6 +159,14 @@ namespace bbtk
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxDialog::bbClose()
+  {
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbClose()"<<std::endl);
+    wxDialog::Destroy();
+  }
+  //=========================================================================
+
   //=========================================================================
   WxBlackBoxDialog::~WxBlackBoxDialog()
   {
@@ -182,8 +186,7 @@ namespace bbtk
 				   wxWindow *parent,
 				   wxString title,
 				   wxSize size)
-    : WxBlackBoxWindow(box),
-      wxFrame( parent, 
+    :  wxFrame( parent, 
 	       -1, 
 	       title,
 	       wxDefaultPosition,
@@ -194,7 +197,8 @@ namespace bbtk
 	       wxMAXIMIZE_BOX | 
 	       wxMINIMIZE_BOX | 
 	       wxCAPTION  
-	       )
+		),
+       WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
@@ -221,16 +225,23 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxFrame::bbShow() 
   { 
+    if (bbIsShown()) return;
     bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow("
 		     <<bbGetBlackBox()->bbGetFullName()<<")"<<std::endl);
     WxBlackBoxWindow::bbShow();
-    wxFrame::Show();
+  wxFrame::Show();
     // This Update is ** MANDATORY ** 
     // to synchronize wxvtkRenderWindowInteractor objects
     // (force wx objects creation **NOW**)
-    wxFrame::Update();
+
+
+#if defined(_WIN32)
+      wxFrame::Refresh();
+#endif
+
+      wxFrame::Update();
+      wxFrame::SetFocus();
     if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();
-    //    wxFrame::SetFocus();
   }
   //=========================================================================
 
@@ -244,6 +255,13 @@ namespace bbtk
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxFrame::bbClose()
+  {
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbClose()"<<std::endl);
+    wxFrame::Close();
+  }
+  //=========================================================================
 
 
 
@@ -379,6 +397,7 @@ namespace bbtk
     bbSetOutputWidget(0);
 
     bbSetWidgetEventHandler(0);
+    bbSetUpdateTransferedToParent(false);
   }
   //=========================================================================
 
@@ -386,7 +405,7 @@ namespace bbtk
   /// Main processing method of the box.
   void WxBlackBox::bbExecute(bool force)
   {
-    bbtkDebugMessageInc("Process",1,
+    bbtkDebugMessageInc("process",2,
 			"=> WxBlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
@@ -397,7 +416,7 @@ namespace bbtk
 
     if ( i->second->GetConnectionVector().size() != 0 ) 
       {
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("process",3,
 			 "-> Output 'Widget' connected : transfering execution to parent"
 			 <<std::endl);
 	
@@ -412,7 +431,7 @@ namespace bbtk
       }
     //
 
-    bbtkDebugMessageDec("Process",1,
+    bbtkDebugMessageDec("process",2,
 			"<= WxBlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
@@ -423,52 +442,95 @@ namespace bbtk
   /// Main processing method of the box.
   IOStatus WxBlackBox::bbBackwardUpdate( Connection::Pointer caller )
   {
-    bbtkDebugMessageInc("Process",1,
-			"=> WxBlackBox::bbBackwardUpdate("
-			<<(caller?caller->GetFullName():"0")<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
+    bbtkDebugMessage("process",3,
+		     "=> 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() )) )
+      {
+	bbtkDebugMessage("process",3,"Up-to-date : nothing to do"<<std::endl);
+	bbtkDebugMessage("process",3,
+			 "<= WxBlackBox::bbBackwardUpdate("
+			 <<(caller?caller->GetFullName():"0")<<") ["
+			 <<bbGetFullName()<<"]"<<std::endl);
+	return bbGetStatus();
+      }
+ 
+    BlackBox::OutputConnectorMapType::const_iterator i 
+      = bbGetOutputConnectorMap().find("Widget") ;
+    if ( i->second->GetConnectionVector().size() != 0 )
+      
+      {
+	BlackBox::Pointer to = 
+	  i->second->GetConnectionVector()[0]->GetBlackBoxTo();
+		
+	if (caller) 
+	  {
+	    bbtkDebugMessage("process",3,
+			     "-> Output 'Widget' connected to '"
+			     <<to->bbGetFullName()<<"' - caller->to = '"
+			     <<caller->GetBlackBoxTo()->bbGetFullName()
+			     <<"'"
+			     <<std::endl);
+	  }
+	else
+	  {
+	    bbtkDebugMessage("process",3,
+			     "-> Output 'Widget' connected to '"
+			     <<to->bbGetFullName()<<"'"
+			     <<std::endl);
+	  }
+	if ((caller==0) ||
+	    ((caller!=0) && 
+	     (caller->GetBlackBoxTo() != to))&&
+	    (!bbGetUpdateTransferedToParent())&&
+	    (to->bbGetStatus()!=UPDATING))
+	  {
+	    bbtkDebugMessage("process",3,
+			     "   ... Transfering update order to parent"
+			     <<std::endl);
+	    
+	    bbSetUpdateTransferedToParent(true);
+	    i->second->GetConnectionVector().front() //.lock()
+	      ->GetBlackBoxTo()->bbExecute(false);
+	  }
+	else
+	  {
+	    bbSetUpdateTransferedToParent(false);
+	    bbtkDebugMessage("process",3,
+			     "   ... No need to transfer to parent"
+			     <<std::endl);
+	  }
+      }
+    /*    
+
     // If the caller is not the connection to the output widget
     // and the output 'Widget' is connected then 
     // we must execute the parent box 
     // but only one time 
-    // (this is the role of the flag UpdateTransferedToParent=
+    // (this is the role of the flag UpdateTransferedToParent)
     if ( (caller==0) ||
 	 ((caller!=0)&&(caller->GetBlackBoxFromOutput()!="Widget"))
 	 )
       {
-	BlackBox::OutputConnectorMapType::const_iterator i 
-	  = bbGetOutputConnectorMap().find("Widget") ;
-	if ( i->second->GetConnectionVector().size() != 0 )
-	     
-	  {
-	    bbtkDebugMessage("Process",2,
-			     "-> Output 'Widget' connected : transfering update order to parent"
-			     <<std::endl);
-	    if ( bbGetUpdateTransferedToParent() )	    
-	      {
-		bbSetUpdateTransferedToParent(false);
-		bbtkDebugMessage("Process",2,
-				 "   ... already transfered : abort"
-				 <<std::endl);
-	      }
-	    else 
-	      {
-		bbSetUpdateTransferedToParent(true);
-		i->second->GetConnectionVector().front() //.lock()
-		  ->GetBlackBoxTo()->bbExecute(false);
-	      }
-	  }
       }
+    */
     // call 'standard' BlackBox execution method
     if (!bbGetUpdateTransferedToParent()) 
       { 
-	AtomicBlackBox::bbBackwardUpdate(caller);
+	  AtomicBlackBox::bbBackwardUpdate(caller);
       }
     
-    bbtkDebugMessageDec("Process",1,
+    bbtkDebugMessageDec("process",3,
 			"<= WxBlackBox::bbBackwardUpdate() ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
+   return bbGetStatus();
+     
+
   }
 
   //=========================================================================
@@ -477,6 +539,7 @@ namespace bbtk
     if (bbGetOutputWidget()==0) this->bbUserCreateWidget();
     this->bbUserProcess(); 
     bbShowWindow();
+    //    this->bbUserOnShow();
   }
   //=========================================================================
   
@@ -486,7 +549,7 @@ namespace bbtk
   /// (called after bbProcess during bbExecute)
   void WxBlackBox::bbShowWindow()
   {
-    bbtkDebugMessageInc("Process",1,"=> WxBlackBox::bbShowWindow() ["
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
  
     // If Event Handler for the widget does not exist or is obsolete : create it 
@@ -494,7 +557,7 @@ namespace bbtk
       {
 	if (bbGetWidgetEventHandler()==0)
 	  {
-	    bbtkDebugMessage("Process",3,
+	    bbtkDebugMessage("wx",3,
 			     "-> No widget event handler : creating one"
 			     <<std::endl);
 	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
@@ -503,7 +566,7 @@ namespace bbtk
 	else if ( ! bbGetWidgetEventHandler()->IsHandlerOf 
 		  ( bbGetOutputWidget() ) )
 	  {
-	    bbtkDebugMessage("Process",3,
+	    bbtkDebugMessage("wx",3,
 			     "-> Obsolete widget event handler : re-creating one"
 			     <<std::endl);
 	    delete bbGetWidgetEventHandler();
@@ -520,10 +583,9 @@ namespace bbtk
 	 ->GetConnectionVector().size() != 0 ) 
       {
 	
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Output 'Widget' connected : nothing to do"
 			 <<std::endl);
-	bbtkDebugDecTab("Process",1);
 	return;
       }
 
@@ -532,7 +594,7 @@ namespace bbtk
     // If the window already exists : no need creating it
     if (bbGetWindow()!=0)
       {
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Window already exists"
 			 <<std::endl);
 	show = bbGetWindow();
@@ -540,7 +602,7 @@ namespace bbtk
     // Else if the widget exists : create window 
     else if (bbGetOutputWidget()!=0) 
       {
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Widget exists : creating the window"
 			 <<std::endl);
 
@@ -548,7 +610,7 @@ namespace bbtk
 	// Input WinDialog set to true : creating a Dialog
 	if (bbGetInputWinDialog()) 
 	  {
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("wx",2,
 			     "   Input WinDialog set to true : creating a Dialog"
 			     <<std::endl);
 	    show = (Window*) new WxBlackBoxDialog( GetThisPointer<WxBlackBox>(),
@@ -559,7 +621,7 @@ namespace bbtk
 	// Input WinDialog set to false : creating a Frame
 	else 
 	  {
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("process",2,
 			     "   Input WinDialog set to false : creating a Frame"
 			     <<std::endl);
 	    show = (Window*) new WxBlackBoxFrame( GetThisPointer<WxBlackBox>(),
@@ -585,13 +647,13 @@ namespace bbtk
       }
     else 
       {
-	bbtkDebugMessage("Process",2,"-> Already shown : nothing to do"<<std::endl);
+	bbtkDebugMessage("wx",2,"-> Already shown : nothing to do"<<std::endl);
       }
   
 
-    bbtkDebugMessage("Process",1,"<= WxBlackBox::bbShowWindow() ["
+    bbtkDebugMessage("wx",1,"<= WxBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
-    bbtkDebugDecTab("Process",1);
+
   }
   //==================================================================
 
@@ -601,17 +663,30 @@ namespace bbtk
   //==================================================================
    void WxBlackBox::bbHideWindow()
   {
-    bbtkDebugMessageInc("Process",1,"=> WxBlackBox::bbHideWindow() ["
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
     if (bbGetWindow()!=0) bbGetWindow()->bbHide();
 
-    bbtkDebugMessageDec("Process",1,"<= WxBlackBox::bbHideWindow() ["
+    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
 
 
+  //==================================================================
+   void WxBlackBox::bbCloseWindow()
+  {
+    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbCloseWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+
+    if (bbGetWindow()!=0) bbGetWindow()->bbClose();
+
+    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbCloseWindow() ["
+			<<bbGetFullName()<<"]"<<std::endl);
+  }
+  //==================================================================
+
   //==================================================================
   WxBlackBox::Window* WxBlackBox::bbGetContainingWindow()
   {