X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=de9ce1d4e7d124aef64cfc615f8b426baa3cf33e;hb=4234999264604da013c2574feef3816c75b3034e;hp=e4a8410357eedb865837908d5effa2763157f6df;hpb=2b8d8f686974ab38c9ffcf0f88dd533b01b68e84;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index e4a8410..de9ce1d 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/23 14:49:28 $
-  Version:   $Revision: 1.15 $
-                                                                                
-  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
-  l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/17 08:18:14 $
+  Version:   $Revision: 1.27 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  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.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 #ifdef _USE_WXWIDGETS_
 
 
@@ -55,8 +68,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 +82,6 @@ namespace bbtk
       {
 	mBox.lock()->bbSetWindow(0);
       }
-    else 
-      {
-      }
-    bbtkDebugMessage("wx",5," -> Number of windows alive = "
-		     <<Wx::GetNbWindowsAlive()<<std::endl);
   }
   //========================================================================= 
 
@@ -87,8 +93,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 +103,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 +123,6 @@ namespace bbtk
 				     wxString title,
 				     wxSize size)
     :
-    WxBlackBoxWindow(box),
     wxDialog( parent, 
 		-1, 
 		title,
@@ -128,7 +134,8 @@ namespace bbtk
 		wxMAXIMIZE_BOX | 
 		wxMINIMIZE_BOX | 
 		wxCAPTION  
-		)
+	      ),
+    WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
@@ -147,10 +154,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 +172,14 @@ namespace bbtk
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxDialog::bbClose()
+  {
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbClose()"<<std::endl);
+    wxDialog::Destroy();
+  }
+  //=========================================================================
+
   //=========================================================================
   WxBlackBoxDialog::~WxBlackBoxDialog()
   {
@@ -182,8 +199,7 @@ namespace bbtk
 				   wxWindow *parent,
 				   wxString title,
 				   wxSize size)
-    : WxBlackBoxWindow(box),
-      wxFrame( parent, 
+    :  wxFrame( parent, 
 	       -1, 
 	       title,
 	       wxDefaultPosition,
@@ -194,7 +210,8 @@ namespace bbtk
 	       wxMAXIMIZE_BOX | 
 	       wxMINIMIZE_BOX | 
 	       wxCAPTION  
-	       )
+		),
+       WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
@@ -221,16 +238,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 +268,13 @@ namespace bbtk
   }
   //=========================================================================
 
+  //=========================================================================
+  void WxBlackBoxFrame::bbClose()
+  {
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbClose()"<<std::endl);
+    wxFrame::Close();
+  }
+  //=========================================================================
 
 
 
@@ -387,7 +418,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);
 
@@ -398,7 +429,7 @@ namespace bbtk
 
     if ( i->second->GetConnectionVector().size() != 0 ) 
       {
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("process",3,
 			 "-> Output 'Widget' connected : transfering execution to parent"
 			 <<std::endl);
 	
@@ -413,7 +444,7 @@ namespace bbtk
       }
     //
 
-    bbtkDebugMessageDec("Process",1,
+    bbtkDebugMessageDec("process",2,
 			"<= WxBlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
@@ -424,7 +455,7 @@ namespace bbtk
   /// Main processing method of the box.
   IOStatus WxBlackBox::bbBackwardUpdate( Connection::Pointer caller )
   {
-    bbtkDebugMessage("Process",1,
+    bbtkDebugMessage("process",3,
 		     "=> WxBlackBox::bbBackwardUpdate("
 		     <<(caller?caller->GetFullName():"0")<<") ["
 		     <<bbGetFullName()<<"]"<<std::endl);
@@ -433,8 +464,8 @@ namespace bbtk
     if ( ! (( bbGetStatus() == MODIFIED ) ||
 	    ( bbBoxProcessModeIsAlways() )) )
       {
-	bbtkDebugMessage("Process",2,"Up-to-date : nothing to do"<<std::endl);
-	bbtkDebugMessage("Process",1,
+	bbtkDebugMessage("process",3,"Up-to-date : nothing to do"<<std::endl);
+	bbtkDebugMessage("process",3,
 			 "<= WxBlackBox::bbBackwardUpdate("
 			 <<(caller?caller->GetFullName():"0")<<") ["
 			 <<bbGetFullName()<<"]"<<std::endl);
@@ -451,7 +482,7 @@ namespace bbtk
 		
 	if (caller) 
 	  {
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("process",3,
 			     "-> Output 'Widget' connected to '"
 			     <<to->bbGetFullName()<<"' - caller->to = '"
 			     <<caller->GetBlackBoxTo()->bbGetFullName()
@@ -460,7 +491,7 @@ namespace bbtk
 	  }
 	else
 	  {
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("process",3,
 			     "-> Output 'Widget' connected to '"
 			     <<to->bbGetFullName()<<"'"
 			     <<std::endl);
@@ -468,9 +499,10 @@ namespace bbtk
 	if ((caller==0) ||
 	    ((caller!=0) && 
 	     (caller->GetBlackBoxTo() != to))&&
-	    (!bbGetUpdateTransferedToParent()))
+	    (!bbGetUpdateTransferedToParent())&&
+	    (to->bbGetStatus()!=UPDATING))
 	  {
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("process",3,
 			     "   ... Transfering update order to parent"
 			     <<std::endl);
 	    
@@ -481,7 +513,7 @@ namespace bbtk
 	else
 	  {
 	    bbSetUpdateTransferedToParent(false);
-	    bbtkDebugMessage("Process",2,
+	    bbtkDebugMessage("process",3,
 			     "   ... No need to transfer to parent"
 			     <<std::endl);
 	  }
@@ -502,13 +534,16 @@ namespace bbtk
     // 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();
+     
+
   }
 
   //=========================================================================
@@ -517,6 +552,7 @@ namespace bbtk
     if (bbGetOutputWidget()==0) this->bbUserCreateWidget();
     this->bbUserProcess(); 
     bbShowWindow();
+    //    this->bbUserOnShow();
   }
   //=========================================================================
   
@@ -526,7 +562,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 
@@ -534,7 +570,7 @@ namespace bbtk
       {
 	if (bbGetWidgetEventHandler()==0)
 	  {
-	    bbtkDebugMessage("Process",3,
+	    bbtkDebugMessage("wx",3,
 			     "-> No widget event handler : creating one"
 			     <<std::endl);
 	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
@@ -543,7 +579,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();
@@ -560,10 +596,9 @@ namespace bbtk
 	 ->GetConnectionVector().size() != 0 ) 
       {
 	
-	bbtkDebugMessage("Process",2,
+	bbtkDebugMessage("wx",2,
 			 "-> Output 'Widget' connected : nothing to do"
 			 <<std::endl);
-	bbtkDebugDecTab("Process",1);
 	return;
       }
 
@@ -572,7 +607,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();
@@ -580,7 +615,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);
 
@@ -588,7 +623,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>(),
@@ -599,7 +634,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>(),
@@ -625,13 +660,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);
+
   }
   //==================================================================
 
@@ -641,17 +676,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()
   {