X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkWxBlackBox.cxx;h=beec07cbc532a81877784ef857c0ae47442a7ec7;hb=a7158b8ae6724e3b7cdf3c3a3aad1157365fbcb0;hp=e436c1ca9988c46cc762cc557a8d46076bfd24ca;hpb=0278e44db6547b325fe00f4ffc5a9cabac5a8534;p=bbtk.git

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index e436c1c..beec07c 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/06/26 18:45:58 $
-  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
-  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/12/08 14:02:15 $
+  Version:   $Revision: 1.34 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* 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_
 
 
@@ -26,6 +39,8 @@
  */
  
 #include "bbtkWxBlackBox.h"
+#include "bbtkBlackBoxOutputConnector.h"
+
 //#include "bbtkWxContainerBlackBox.h"
 #include <wx/dialog.h>
 
@@ -110,7 +125,6 @@ namespace bbtk
 				     wxString title,
 				     wxSize size)
     :
-    WxBlackBoxWindow(box),
     wxDialog( parent, 
 		-1, 
 		title,
@@ -122,15 +136,18 @@ namespace bbtk
 		wxMAXIMIZE_BOX | 
 		wxMINIMIZE_BOX | 
 		wxCAPTION  
-		)
+	      ),
+    WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxDialog::WxBlackBoxDialog("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
 		     <<title<<",size)"<<std::endl);
     // Insert the widget into the window
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+	  // LG 22/11/08 : new widget pipeline
+	  bbGetBlackBox()->bbCreateWidgetAndEventHandler(this);
     wxWindow* widget = bbGetBlackBox()->bbGetOutputWidget();
-    widget->Reparent(this);
+// old :    widget->Reparent(this);
     sizer->Add( widget, 1, wxALL|wxEXPAND, 2);
     //SetAutoLayout(true);
     SetSizer(sizer);
@@ -141,11 +158,12 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxDialog::bbShow()
   { 
+    if (bbIsShown()) return;
     bbtkDebugMessage("wx",5,"WxBlackBoxDialog::bbShow() ["
 		     <<bbGetBlackBox()->bbGetFullName()<<"]"<<std::endl);
     WxBlackBoxWindow::bbShow();
     SetReturnCode( wxDialog::ShowModal() ); 
-    bbHide();
+    bbClose();
   }
   //=========================================================================
 
@@ -161,7 +179,8 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxDialog::bbClose()
   {
-    wxDialog::Close();
+    bbtkDebugMessage("wx",9,"WxBlackBoxDialog::bbClose()"<<std::endl);
+    wxDialog::Destroy();
   }
   //=========================================================================
 
@@ -184,8 +203,7 @@ namespace bbtk
 				   wxWindow *parent,
 				   wxString title,
 				   wxSize size)
-    : WxBlackBoxWindow(box),
-      wxFrame( parent, 
+    :  wxFrame( parent, 
 	       -1, 
 	       title,
 	       wxDefaultPosition,
@@ -196,16 +214,19 @@ namespace bbtk
 	       wxMAXIMIZE_BOX | 
 	       wxMINIMIZE_BOX | 
 	       wxCAPTION  
-	       )
+		),
+       WxBlackBoxWindow(box)
   {
     bbtkDebugMessage("wx",9,"WxBlackBoxFrame::WxBlackBoxFrame("<<
 		     bbGetBlackBox()->bbGetFullName()<<","<<parent<<","
 		     <<title<<",size)"<<std::endl);
     // Insert the widget into the window
     wxBoxSizer *sizer = new wxBoxSizer(wxVERTICAL);
+	  // LG 22/11/08 : new widget pipeline
+	  bbGetBlackBox()->bbCreateWidgetAndEventHandler(this);
     wxWindow* widget = bbGetBlackBox()->bbGetOutputWidget();
     wxFrame* frame = (wxFrame*)this;
-    widget->Reparent(frame);
+// old :    widget->Reparent(frame);
     sizer->Add( widget, 1, wxALL|wxGROW, 2);
     //  frame->SetAutoLayout(true);
     frame->SetSizer(sizer);
@@ -223,6 +244,7 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxFrame::bbShow() 
   { 
+    if (bbIsShown()) return;
     bbtkDebugMessage("wx",5,"WxBlackBoxFrame::bbShow("
 		     <<bbGetBlackBox()->bbGetFullName()<<")"<<std::endl);
     WxBlackBoxWindow::bbShow();
@@ -255,6 +277,7 @@ namespace bbtk
   //=========================================================================
   void WxBlackBoxFrame::bbClose()
   {
+    bbtkDebugMessage("wx",9,"WxBlackBoxFrame::bbClose()"<<std::endl);
     wxFrame::Close();
   }
   //=========================================================================
@@ -306,7 +329,8 @@ namespace bbtk
     bbtkDebugMessage("wx",9,"WxBlackBoxWidgetEventHandler::OnWindowDestroy() ["
 		     <<mBox.lock()->bbGetFullName()<<"]"<<std::endl);
     mBox.lock()->bbSetOutputWidget(0);
-    mBox.lock()->bbSetModifiedStatus();
+    // LGSIGNAL
+    //    mBox.lock()->bbSetModifiedStatus();
   }
   //=========================================================================
 
@@ -336,7 +360,7 @@ namespace bbtk
   //=========================================================================
 
   //=========================================================================
-  void WxBlackBox::bbUserCopyConstructor()
+  void WxBlackBox::bbUserCopyConstructor(bbtk::BlackBox::Pointer)
   {
     bbtkDebugMessage("Kernel",9,"WxBlackBox::bbUserCopyConstructor()"
 		     <<std::endl);
@@ -393,7 +417,7 @@ namespace bbtk
     bbSetOutputWidget(0);
 
     bbSetWidgetEventHandler(0);
-    bbSetUpdateTransferedToParent(false);
+    //    bbSetUpdateTransferedToParent(false);
   }
   //=========================================================================
 
@@ -401,31 +425,28 @@ namespace bbtk
   /// Main processing method of the box.
   void WxBlackBox::bbExecute(bool force)
   {
+    
     bbtkDebugMessageInc("process",2,
-			"=> WxBlackBox::bbExecute() ["
+			"=> WxBlackBox::bbExecute("<<(int)force<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
-
+    
+    
     // If the output 'Widget' is connected then 
     // we must execute the parent box
+	  /*
     BlackBox::OutputConnectorMapType::const_iterator i 
       = bbGetOutputConnectorMap().find("Widget");
-
+    
     if ( i->second->GetConnectionVector().size() != 0 ) 
       {
-	bbtkDebugMessage("process",3,
-			 "-> Output 'Widget' connected : transfering execution to parent"
-			 <<std::endl);
-	
-	i->second->GetConnectionVector().front() //.lock()
-	  ->GetBlackBoxTo()->bbExecute(force);
-
-      }
-    // else call 'standard' BlackBox execution method
-    else 
-      {
-	BlackBox::bbExecute(force);
+	bbtkWarning("Execution called on '"<<bbGetFullName()
+		    <<"' although its Output 'Widget' is connected: "
+		    <<"if the widget is not created yet then it will not be! "
+		    <<"Execute the top level Layout widget to create and "
+		    <<"display the widget.");
       }
-    //
+*/
+    AtomicBlackBox::bbExecute(force);
 
     bbtkDebugMessageDec("process",2,
 			"<= WxBlackBox::bbExecute() ["
@@ -435,109 +456,135 @@ namespace bbtk
 
 
   //=========================================================================
-  /// Main processing method of the box.
-  IOStatus WxBlackBox::bbBackwardUpdate( Connection::Pointer caller )
-  {
-    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 )
-      
+  void WxBlackBox::bbProcess()
+  { 
+/*
+	  if (bbGetOutputWidget()==0) this->bbUserCreateWidget();
+	  this->bbUserProcess(); 
+	  bbShowWindow();
+	  //    this->bbUserOnShow();
+	  */
+    // LG 22/11/08 : new widget pipeline
+    // If output widget not connected : 
+    if ( (*bbGetOutputConnectorMap().find("Widget")).second
+	 ->GetConnectionVector().size() == 0 ) 
       {
-	BlackBox::Pointer to = 
-	  i->second->GetConnectionVector()[0]->GetBlackBoxTo();
-		
-	if (caller) 
+	Window* show = 0;
+	// If the window already exists : no need creating it
+	if (bbGetWindow()!=0)
 	  {
-	    bbtkDebugMessage("process",3,
-			     "-> Output 'Widget' connected to '"
-			     <<to->bbGetFullName()<<"' - caller->to = '"
-			     <<caller->GetBlackBoxTo()->bbGetFullName()
-			     <<"'"
+	    bbtkDebugMessage("wx",2,
+			     "-> Window already exists"
 			     <<std::endl);
+	    show = bbGetWindow();
 	  }
-	else
+	// Else create window 
+	else 
 	  {
-	    bbtkDebugMessage("process",3,
-			     "-> Output 'Widget' connected to '"
-			     <<to->bbGetFullName()<<"'"
+	    bbtkDebugMessage("wx",2,
+			     "-> Creating the window"
 			     <<std::endl);
+	    
+	    
+	    // Input WinDialog set to true : creating a Dialog
+	    if (bbGetInputWinDialog()) 
+	      {
+		bbtkDebugMessage("wx",2,
+				 "   Input WinDialog set to true : creating a Dialog"
+				 <<std::endl);
+		show = (Window*) new WxBlackBoxDialog( GetThisPointer<WxBlackBox>(),
+						       // bbGetWxParent(), 
+						       // LG 24/11/08 : New widget pipeline
+						       Wx::GetTopWindow(),
+						       std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS LRMN"),
+						       wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
+	      }
+	    // Input WinDialog set to false : creating a Frame
+	    else 
+	      {
+		bbtkDebugMessage("process",2,
+				 "   Input WinDialog set to false : creating a Frame"
+				 <<std::endl);
+		show = (Window*) new WxBlackBoxFrame( GetThisPointer<WxBlackBox>(),
+						      // bbGetWxParent(), 
+						      // LG 24/11/08 : New widget pipeline
+						      Wx::GetTopWindow(),
+						      std2wx( bbGetInputWinTitle()  + " - bbtk (c) CREATIS LRMN"),
+						      wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
+	      }
+	    
 	  }
-	if ((caller==0) ||
-	    ((caller!=0) && 
-	     (caller->GetBlackBoxTo() != to))&&
-	    (!bbGetUpdateTransferedToParent()))
+	
+	// Show the window
+	show->bbShow(); 
+	
+	
+      }		  
+    this->bbUserProcess(); 
+    
+  }
+  //=========================================================================
+ 
+	
+	
+  // LG 24/11/08 : New widget pipeline
+  void WxBlackBox::bbCreateWidgetAndEventHandler(wxWindow* parent)
+  {
+    if (bbGetOutputWidget()==0)
+      {
+	this->bbUserCreateWidget(parent);
+      }		
+    // If Event Handler for the widget does not exist or is obsolete : create it 
+    if (bbGetOutputWidget()!=0)
+      {
+	if (bbGetWidgetEventHandler()==0)
 	  {
-	    bbtkDebugMessage("process",3,
-			     "   ... Transfering update order to parent"
+	    bbtkDebugMessage("wx",3,
+			     "-> No widget event handler : creating one"
 			     <<std::endl);
-	    
-	    bbSetUpdateTransferedToParent(true);
-	    i->second->GetConnectionVector().front() //.lock()
-	      ->GetBlackBoxTo()->bbExecute(false);
+	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
+					     bbGetOutputWidget());
 	  }
-	else
+	else if ( ! bbGetWidgetEventHandler()->IsHandlerOf 
+		  ( bbGetOutputWidget() ) )
 	  {
-	    bbSetUpdateTransferedToParent(false);
-	    bbtkDebugMessage("process",3,
-			     "   ... No need to transfer to parent"
+	    bbtkDebugMessage("wx",3,
+			     "-> Obsolete widget event handler : re-creating one"
 			     <<std::endl);
+	    delete bbGetWidgetEventHandler();
+	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
+					     bbGetOutputWidget());
 	  }
-      }
-    /*    
-
-    // 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)
-    if ( (caller==0) ||
-	 ((caller!=0)&&(caller->GetBlackBoxFromOutput()!="Widget"))
-	 )
-      {
-      }
-    */
-    // call 'standard' BlackBox execution method
-    if (!bbGetUpdateTransferedToParent()) 
-      { 
-	  AtomicBlackBox::bbBackwardUpdate(caller);
+	// Sets the name of the wxWindow to the input WinTitle
+	bbGetOutputWidget()->SetName(bbtk::std2wx(bbGetInputWinTitle()));
       }
     
-    bbtkDebugMessageDec("process",3,
-			"<= WxBlackBox::bbBackwardUpdate() ["
-			<<bbGetFullName()<<"]"<<std::endl);
     
-   return bbGetStatus();
-     
-
   }
-
-  //=========================================================================
-  void WxBlackBox::bbProcess()
-  { 
-    if (bbGetOutputWidget()==0) this->bbUserCreateWidget();
-    this->bbUserProcess(); 
-    bbShowWindow();
-    //    this->bbUserOnShow();
+  
+  
+  
+  wxWindow*  WxBlackBox::bbCreateWidgetOfInput(const std::string& in, wxWindow* parent)
+  {
+    wxWindow* w = 0;
+    // If input is connected 
+    BlackBoxInputConnector* c = bbGetInputConnectorMap().find(in)->second ;
+    if ( c->IsConnected() )			
+      {
+	// Get black box from 
+	BlackBox::Pointer from = 
+	  c->GetConnection()->GetBlackBoxFrom();
+	// Cast it into a WxBlackBox
+	WxBlackBox::Pointer wfrom = boost::dynamic_pointer_cast<WxBlackBox>(from);
+	// Call bbCreateWidgetAndEventHandler
+	wfrom->bbCreateWidgetAndEventHandler(parent);
+	// Get the widget created
+	w = wfrom->bbGetOutputWidget();
+      }
+    return w;
   }
-  //=========================================================================
   
+  /*
   //==================================================================
   /// Specific methods for window creation during pipeline execution
   /// Shows the window associated to the box 
@@ -609,7 +656,9 @@ namespace bbtk
 			     "   Input WinDialog set to true : creating a Dialog"
 			     <<std::endl);
 	    show = (Window*) new WxBlackBoxDialog( GetThisPointer<WxBlackBox>(),
-						   bbGetWxParent(), 
+						  // bbGetWxParent(), 
+											  // LG 24/11/08 : New widget pipeline
+											  Wx::GetTopWindow(),
 						   std2wx( bbGetInputWinTitle() + " - bbtk (c) CREATIS LRMN"),
 						   wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
 	  }
@@ -620,7 +669,9 @@ namespace bbtk
 			     "   Input WinDialog set to false : creating a Frame"
 			     <<std::endl);
 	    show = (Window*) new WxBlackBoxFrame( GetThisPointer<WxBlackBox>(),
-						  bbGetWxParent(), 
+						  // bbGetWxParent(), 
+											 // LG 24/11/08 : New widget pipeline
+											 Wx::GetTopWindow(),
 						  std2wx( bbGetInputWinTitle()  + " - bbtk (c) CREATIS LRMN"),
 						  wxSize( bbGetInputWinWidth() , bbGetInputWinHeight() ) );
 	  }
@@ -646,12 +697,12 @@ namespace bbtk
       }
   
 
-    bbtkDebugMessage("wx",1,"<= WxBlackBox::bbShowWindow() ["
+    bbtkDebugMessage("wx",2,"<= WxBlackBox::bbShowWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
   }
   //==================================================================
-
+*/
 
 
 
@@ -663,7 +714,7 @@ namespace bbtk
 
     if (bbGetWindow()!=0) bbGetWindow()->bbHide();
 
-    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbHideWindow() ["
+    bbtkDebugMessageDec("wx",2,"<= WxBlackBox::bbHideWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
@@ -677,7 +728,7 @@ namespace bbtk
 
     if (bbGetWindow()!=0) bbGetWindow()->bbClose();
 
-    bbtkDebugMessageDec("wx",1,"<= WxBlackBox::bbCloseWindow() ["
+    bbtkDebugMessageDec("wx",2,"<= WxBlackBox::bbCloseWindow() ["
 			<<bbGetFullName()<<"]"<<std::endl);
   }
   //==================================================================
@@ -700,7 +751,8 @@ namespace bbtk
 
 
   //==================================================================
-  wxWindow* WxBlackBox::bbGetWxParent() { return Wx::GetTopWindow(); }
+	// LG 24/11/08 : New widget pipeline
+	//  wxWindow* WxBlackBox::bbGetWxParent() { return Wx::GetTopWindow(); }
   //==================================================================