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

diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index beec07c..91d1085 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/12/08 14:02:15 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2008/12/12 12:56:28 $
+  Version:   $Revision: 1.36 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -95,6 +95,7 @@ namespace bbtk
     bbtkDebugMessage("wx",9,"WxBlackBoxWindow::bbShow()"<<std::endl);
     Wx::IncNbWindowsShown();
     mShown = true;
+    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();
   }
   //=========================================================================
 
@@ -248,19 +249,19 @@ namespace bbtk
     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**)
-
-
+    
+    
 #if defined(_WIN32)
-      wxFrame::Refresh();
+    wxFrame::Refresh();
 #endif
-
-      wxFrame::Update();
-      wxFrame::SetFocus();
-    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();
+    
+    wxFrame::Update();
+    wxFrame::SetFocus();
+    //    if (bbGetBlackBox()) bbGetBlackBox()->bbUserOnShow();
   }
   //=========================================================================
 
@@ -382,24 +383,6 @@ namespace bbtk
   //=========================================================================
   
 
-  /*
-  //=========================================================================
-  WxBlackBox::Widget*  WxBlackBox::bbGetWidget()
-  { 
-    if (bbGetOutputWidget() && bbGetOutputWidget()->IsDead()) 
-      {
-	bbtkDebugMessage("wx",9,"WxBlackBox::bbGetWidget() ["<<
-			 bbGetFullName()<<"] : Widget is dead : deleting it"
-			 <<std::endl);
-	delete bbGetOutputWidget();
-	bbSetOutputWidget(0);
-      }
-    return bbGetOutputWidget();
-  }
-  //=========================================================================
-  */
-
-
   //=========================================================================
   /**
    * \brief Initialize the attributes of the class
@@ -421,51 +404,10 @@ namespace bbtk
   }
   //=========================================================================
 
-  //=========================================================================
-  /// Main processing method of the box.
-  void WxBlackBox::bbExecute(bool force)
-  {
-    
-    bbtkDebugMessageInc("process",2,
-			"=> 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 ) 
-      {
-	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() ["
-			<<bbGetFullName()<<"]"<<std::endl);
-  }
-  //=========================================================================
-
-
   //=========================================================================
   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 output widget not connected : have to create and show the window
     if ( (*bbGetOutputConnectorMap().find("Widget")).second
 	 ->GetConnectionVector().size() == 0 ) 
       {
@@ -485,7 +427,6 @@ namespace bbtk
 			     "-> Creating the window"
 			     <<std::endl);
 	    
-	    
 	    // Input WinDialog set to true : creating a Dialog
 	    if (bbGetInputWinDialog()) 
 	      {
@@ -493,8 +434,6 @@ namespace bbtk
 				 "   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() ) );
@@ -506,8 +445,6 @@ namespace bbtk
 				 "   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() ) );
@@ -527,7 +464,7 @@ namespace bbtk
  
 	
 	
-  // LG 24/11/08 : New widget pipeline
+  //=========================================================================
   void WxBlackBox::bbCreateWidgetAndEventHandler(wxWindow* parent)
   {
     if (bbGetOutputWidget()==0)
@@ -561,10 +498,12 @@ namespace bbtk
     
     
   }
+  //=========================================================================
   
   
-  
-  wxWindow*  WxBlackBox::bbCreateWidgetOfInput(const std::string& in, wxWindow* parent)
+  //========================================================================= 
+  wxWindow*  WxBlackBox::bbCreateWidgetOfInput(const std::string& in, 
+					       wxWindow* parent)
   {
     wxWindow* w = 0;
     // If input is connected 
@@ -583,127 +522,7 @@ namespace bbtk
       }
     return w;
   }
-  
-  /*
   //==================================================================
-  /// Specific methods for window creation during pipeline execution
-  /// Shows the window associated to the box 
-  /// (called after bbProcess during bbExecute)
-  void WxBlackBox::bbShowWindow()
-  {
-    bbtkDebugMessageInc("wx",1,"=> WxBlackBox::bbShowWindow() ["
-			<<bbGetFullName()<<"]"<<std::endl);
- 
-    // If Event Handler for the widget does not exist or is obsolete : create it 
-    if (bbGetOutputWidget()!=0)
-      {
-	if (bbGetWidgetEventHandler()==0)
-	  {
-	    bbtkDebugMessage("wx",3,
-			     "-> No widget event handler : creating one"
-			     <<std::endl);
-	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
-					     bbGetOutputWidget());
-	  }
-	else if ( ! bbGetWidgetEventHandler()->IsHandlerOf 
-		  ( bbGetOutputWidget() ) )
-	  {
-	    bbtkDebugMessage("wx",3,
-			     "-> Obsolete widget event handler : re-creating one"
-			     <<std::endl);
-	    delete bbGetWidgetEventHandler();
-	    new WxBlackBoxWidgetEventHandler(GetThisPointer<WxBlackBox>(),
-					     bbGetOutputWidget());
-	  }
-	// Sets the name of the wxWindow to the input WinTitle
-	bbGetOutputWidget()->SetName(bbtk::std2wx(bbGetInputWinTitle()));
-      }
-
-    // If the output 'Widget' is connected then it's gonna 
-    // be captured by its parent window : nothing to do 
-    if ( (*bbGetOutputConnectorMap().find("Widget")).second
-	 ->GetConnectionVector().size() != 0 ) 
-      {
-	
-	bbtkDebugMessage("wx",2,
-			 "-> Output 'Widget' connected : nothing to do"
-			 <<std::endl);
-	return;
-      }
-
-
-    Window* show = 0;
-    // If the window already exists : no need creating it
-    if (bbGetWindow()!=0)
-      {
-	bbtkDebugMessage("wx",2,
-			 "-> Window already exists"
-			 <<std::endl);
-	show = bbGetWindow();
-      }
-    // Else if the widget exists : create window 
-    else if (bbGetOutputWidget()!=0) 
-      {
-	bbtkDebugMessage("wx",2,
-			 "-> Widget exists : 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() ) );
-	  }
-
-      }
-    // No window nor widget : error
-    else
-      {
-	bbtkError("WxBlackBox::bbShowWindow() ["
-		  <<bbGetFullName()
-		  <<"] : No widget. Did you set the box output 'Widget' in the processing method of the box ?");
-      }
- 
-    
-    // Show the window
-    if (true) //!show->IsShown())
-      {
-	show->bbShow(); 
-      }
-    else 
-      {
-	bbtkDebugMessage("wx",2,"-> Already shown : nothing to do"<<std::endl);
-      }
-  
-
-    bbtkDebugMessage("wx",2,"<= WxBlackBox::bbShowWindow() ["
-			<<bbGetFullName()<<"]"<<std::endl);
-
-  }
-  //==================================================================
-*/
-
 
 
   //==================================================================
@@ -750,12 +569,6 @@ namespace bbtk
   //==================================================================
 
 
-  //==================================================================
-	// LG 24/11/08 : New widget pipeline
-	//  wxWindow* WxBlackBox::bbGetWxParent() { return Wx::GetTopWindow(); }
-  //==================================================================
-  
-  
   //==================================================================
   bool WxBlackBox::bbIsShown()
   {