X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBox.cxx;h=49321eed2d2d639e78cab3a8f556c90ae39f0d37;hb=cb74ad8d12e03d219df87c69f6caef29afee4cfc;hp=7b3c4a8e319b0d4eac2e9d4c5c1b59eea3913776;hpb=a32025c531a0e20e967dc2ba3e0817f6932061b1;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 7b3c4a8..49321ee 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/05/07 12:59:23 $
-Version:   $Revision: 1.18 $
+Date:      $Date: 2008/07/24 14:37:05 $
+Version:   $Revision: 1.23 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See doc/license.txt or
@@ -90,11 +90,12 @@ namespace bbtk
 
   //=========================================================================
   BlackBox::BlackBox(const std::string &name) 
-    : bbmName(name), 
-      bbmStatus(MODIFIED), 
-      bbmBoxProcessMode("Pipeline"),
-      bbmParent()
-
+    : 
+    bbmStatus(MODIFIED), 
+    bbmName(name),
+    bbmBoxProcessMode("Pipeline"),
+    bbmParent()
+    
   {
     bbtkDebugMessage("object",4,"==> BlackBox::BlackBox(\""
 		     <<name<<"\")"<<std::endl);
@@ -109,8 +110,9 @@ namespace bbtk
 
   //=========================================================================
   BlackBox::BlackBox(BlackBox& from, const std::string &name) 
-    : bbmName(name), 
+    :
       bbmStatus(from.bbmStatus), 
+      bbmName(name), 
       bbmBoxProcessMode(from.bbmBoxProcessMode),
       bbmParent()
 
@@ -145,7 +147,7 @@ namespace bbtk
 			"=> BlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
  
-    Wx::BeginBusyCursor();
+    Wx::BusyCursor wait;
 
     // If execution frozen : return
     if (bbGlobalGetFreezeExecution()) 
@@ -160,8 +162,6 @@ namespace bbtk
     // Calls the main recursive update method 
     bbBackwardUpdate(Connection::Pointer());
 
-    Wx::EndBusyCursor();
-
     bbtkDebugMessageDec("process",2,
 			"<= BlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
@@ -434,6 +434,16 @@ namespace bbtk
 	this->bbSetStatus(MODIFIED); 
 	return;
       }
+    if ( (c==bbGetInputConnectorMap().find("WinClose")->second) )
+      //	 && (bbCanReact()))
+      {
+	bbtkDebugMessage("modified",2,
+			 "-> Close triggered by WinClose input change"
+			 <<std::endl);
+	this->bbHideWindow();
+	this->bbSetStatus(MODIFIED); 
+	return;
+      }
     
     if ( ( bbBoxProcessModeIsReactive()  ||
 	   (c==bbGetInputConnectorMap().find("BoxExecute")->second))
@@ -444,11 +454,13 @@ namespace bbtk
 	this->bbSetStatus(MODIFIED); 
         bbGlobalAddToExecutionList( GetThisPointer<BlackBox>() );
       }
+    /*
     else if ( bbGetStatus() == MODIFIED ) //! this->bbIsUptodate()) 
       { 
 	bbtkDebugMessage("modified",2,"-> Already modified"<<std::endl);
 	return;
       }
+    */
     else 
       {
 	bbtkDebugMessage("modified",2,"-> Status set to modified"<<std::endl);
@@ -1007,7 +1019,7 @@ namespace bbtk
     InputConnectorMapType::iterator i;
     unsigned int namelmax = 0;
     unsigned int valuelmax = 0;
-    unsigned int connlmax = 0;
+    //   unsigned int connlmax = 0;
     for ( i = mInputConnectorMap.begin(); i != mInputConnectorMap.end(); ++i ) 
       {
 	iname.push_back(i->first);
@@ -1156,13 +1168,6 @@ namespace bbtk
 	} 
 
 
-  //=========================================================================
-  // Static members initialization
-/*EED
-  bool BlackBox::bbmgSomeBoxExecuting = false;
-  bool BlackBox::bbmgFreezeExecution = false;
-  std::set<BlackBox*> BlackBox::bbmgExecutionList;
-*/
    //=========================================================================
 
   //=========================================================================
@@ -1173,6 +1178,16 @@ namespace bbtk
   }
   //=========================================================================
 
+  void BlackBox::bbUserOnShowWidget(std::string nameInput)
+  {
+	  bbtk::BlackBoxInputConnector *cc;
+	  cc = this->bbGetInputConnectorMap().find( nameInput.c_str() )->second;
+	  if (cc->GetConnection()!=NULL) 
+	  {
+		  cc->GetConnection()->GetBlackBoxFrom()->bbUserOnShow();
+	  }
+  }
+
 
 
 }  // EO namespace bbtk