X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBox.cxx;h=a249bfc79f9193fadebce4d7d02e4aa71054c0bc;hb=2d564c78c449d67b1d85511ba9601d3afb57c924;hp=c35e82c78a5bb50c0eb4df6267a87b5cdd9eb518;hpb=b297410bce4fc9141ade21cbeca71061369b4932;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index c35e82c..a249bfc 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/01/21 16:03:17 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2012/07/26 08:28:31 $
+  Version:   $Revision: 1.55 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -48,8 +48,6 @@
 
 namespace bbtk
 {
-
-
   static bool bbmgSomeBoxExecuting = false;
   static bool bbmgFreezeExecution = false;
   static std::set<BlackBox::WeakPointer> bbmgExecutionList;
@@ -111,6 +109,7 @@ namespace bbtk
     bbmExecuting(false),
     bbmName(name),
     bbmBoxProcessMode("Pipeline"),
+	bbLetRecursiveExecuteManualMode(false),
     bbmParent()
     
   {
@@ -137,6 +136,7 @@ namespace bbtk
     bbmExecuting(false),
     bbmName(name), 
     bbmBoxProcessMode(from.bbmBoxProcessMode),
+	bbLetRecursiveExecuteManualMode(false),
     bbmParent()
     
   {
@@ -281,7 +281,6 @@ namespace bbtk
 	bbGetOutputConnectorMap()[o->second->GetName()] 
 	  = new BlackBoxOutputConnector(GetThisPointer<BlackBox>());
       }
-
   }
   //=========================================================================
 
@@ -308,8 +307,7 @@ namespace bbtk
 	delete (o->second);
       }									
    
-    bbtkDebugDecTab("kernel",8);  
-
+    bbtkDebugDecTab("kernel",8);
   }
   //=========================================================================
 
@@ -345,7 +343,6 @@ namespace bbtk
       }
 
     bbtkDebugDecTab("kernel",9);
-
   }
   //=========================================================================
 
@@ -358,7 +355,7 @@ namespace bbtk
 #ifdef USE_WXWIDGETS
 	     || Wx::IsSomeWindowAlive() 
 #endif
-	     ); 
+	     );
   }
   //=========================================================================
 
@@ -370,45 +367,57 @@ namespace bbtk
     const std::string& p = bbmBoxProcessMode;
     if ( (p == "0") ||
 	 (p == "P") || (p == "p") ||
-	 (p == "Pipeline") || (p == "pipeline") ) return Pipeline;
+	 (p == "Pipeline") || (p == "pipeline") ) return bbPipeline;
     if ( (p == "1") ||
 	 (p == "A") || (p == "a") ||
-	 (p == "Always") || (p == "always") ) return Always;
+	 (p == "Always") || (p == "always") ) return bbAlways;
     if ( (p == "2") ||
 	 (p == "R") || (p == "r") ||
 	 (p == "Reactive") || (p == "reactive") ) 
-		return Reactive;
+		return bbReactive;
     /*
     if ( (p == "3") ||
 	 (p == "F") || (p == "f") ||
 	 (p == "Flash") || (p == "flash") ) return Flash;
     */
-    bbtkError(bbGetFullName()<<" : BoxProcessMode value '"<<p
+
+	  if ( (p == "3") ||
+	   (p == "M") || (p == "m") ||
+	   (p == "Manual") || (p == "manual") ) return bbManual;
+	  
+	  bbtkError(bbGetFullName()<<" : BoxProcessMode value '"<<p
 	      <<"' unknown. Possible values : "
 	      <<"'0'/'P'/'p'/'Pipeline'/'pipeline' | "
 	      <<"'1'/'A'/'a'/'Always'/'always' | "
 	      <<"'2'/'R'/'r'/'Reactive'/'reactive'"
 	      //      <<"'3'/'F'/'f'/'Flash'/'flash'"
-	      <<std::endl);
+	      <<"'3'/'M'/'m'/'Manual'/'manual'"
+		  <<std::endl);
   }
   //=========================================================================
   
   //=========================================================================
   bool  BlackBox::bbBoxProcessModeIsReactive() const
   {
-    return (bbGetBoxProcessModeValue() == Reactive);
+    return (bbGetBoxProcessModeValue() == bbReactive);
   }
   //=========================================================================
 
   //=========================================================================
   bool  BlackBox::bbBoxProcessModeIsAlways() const
   {
-    return (bbGetBoxProcessModeValue() == Always);
+    return (bbGetBoxProcessModeValue() == bbAlways);
   }
   //=========================================================================
 
 
-
+	//=========================================================================
+	bool  BlackBox::bbBoxProcessModeIsManual() const
+	{
+		return (bbGetBoxProcessModeValue() == bbManual);
+	}
+	//=========================================================================
+	
 
   //=========================================================================
   void BlackBox::bbAddOutputObserver(const std::string& output, 
@@ -458,9 +467,9 @@ namespace bbtk
 	  }
 	}								
     
-    if ( ( bbBoxProcessModeIsReactive()  ||
-	   (c==bbGetInputConnectorMap().find("BoxExecute")->second))
-	 && (bbCanReact() ) )
+    if (  ( bbBoxProcessModeIsReactive()
+	   || (c==bbGetInputConnectorMap().find("BoxExecute")->second))
+	   && (bbCanReact() ) )
       {
 	bbtkBlackBoxDebugMessage("change",2,
 			 "-> Execution triggered by Reactive mode or BoxExecute input change"<<std::endl);
@@ -480,7 +489,7 @@ namespace bbtk
 			     "=> BlackBox::bbSignalOutputModification("
 			     <<reaction<<")"
 			     <<"]"<<std::endl);
-    
+
     OutputConnectorMapType::iterator i;
     for ( i  = bbGetOutputConnectorMap().begin(); 
 	  i != bbGetOutputConnectorMap().end(); ++i) 
@@ -494,16 +503,17 @@ namespace bbtk
 	//	  {
 	    i->second->SignalChange(GetThisPointer<BlackBox>(),i->first); 
 	    //	  }
-      } 
+      } // for
 
     if (reaction) bbGlobalProcessExecutionList();
 
     bbtkBlackBoxDebugMessage("change",5,
 			     "<= BlackBox::bbSignalOutputModification()"
 			     <<std::endl);
-    
   }  
   //=========================================================================   
+
+
   //=========================================================================  
   void BlackBox::bbSignalOutputModification(const std::string& output,
 					    bool reaction)
@@ -541,7 +551,6 @@ namespace bbtk
 			     "<= BlackBox::bbSignalOutputModification("
 			     <<output<<")"
 			     <<std::endl);
-    
   }  
   //=========================================================================   
   //=========================================================================  
@@ -585,7 +594,6 @@ namespace bbtk
     bbtkBlackBoxDebugMessage("change",5,
 			     "<= BlackBox::bbSignalOutputModification(vector of outputs)"
 			     <<std::endl);
-
   }  
   //=========================================================================   
 
@@ -625,9 +633,22 @@ namespace bbtk
     // If force is true then update is triggered even if the box is UPTODATE
     //    if (force) bbSetModifiedStatus();
 
+	if ( bbBoxProcessModeIsManual() ) 
+	{
+		bbLetRecursiveExecuteManualMode = true;
+    }
+	  
+	  
     // Calls the main recursive execution method 
     bbRecursiveExecute(Connection::Pointer());
 
+	  
+	if ( bbBoxProcessModeIsManual() ) 
+	{
+		bbLetRecursiveExecuteManualMode = false;
+	}
+	  
+	  
     bbtkBlackBoxDebugMessage("process",2,
 			     "<= BlackBox::bbExecute()"
 			     <<std::endl);
@@ -688,20 +709,40 @@ namespace bbtk
     this->bbCreateWindow();
     
     // Updates its inputs
-    IOStatus s = bbUpdateInputs();
-    
-    if ( (s != UPTODATE) ||
-	 bbBoxProcessModeIsAlways() )
+	  
+//	  IOStatus s;
+	  IOStatus s=UPTODATE;
+//	  IOStatus s=OUTOFDATE;
+//	  IOStatus s=MODIFIED;
+	  
+	  
+	  if ( ( bbBoxProcessModeIsManual()==false )  || 
+		   ( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==true) ) )
+	  {
+    		  s = bbUpdateInputs();
+	  }	  
+		  
+    if ( (s != UPTODATE) ||  bbBoxProcessModeIsAlways() )
       {
 	  // Displays the window (WxBlackbox)
  	  //	bbShowWindow(caller);
 
 	  // Actual processing (virtual)
-	  this->bbProcess();
-	
-	
-	  // Update the I/O statuses
-	  bbComputePostProcessStatus();
+		  if ( ( bbBoxProcessModeIsManual()==false )  || 
+			   ( (bbBoxProcessModeIsManual()==true)&&(bbLetRecursiveExecuteManualMode==true) ) 
+			 )
+			{
+				this->bbProcess();		
+		    } // Manual analysis
+		  
+//EED ups			if ((bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==false))
+//EED ups			{
+//EED ups			  bbSignalOutputModification(true);
+//EED ups			}
+		  
+		  
+		  // Update the I/O statuses
+		  bbComputePostProcessStatus();
       }
     else 
       {
@@ -733,8 +774,7 @@ namespace bbtk
     bbSetExecuting(false);
     bbGlobalSetSomeBoxExecuting(wasExecuting);
 
-    return; 
-
+    return;
   }
   //=========================================================================
   
@@ -777,9 +817,7 @@ namespace bbtk
     
     bbtkBlackBoxDebugMessage("process",4,
 			"<= BlackBox::bbUpdateInputs()"
-			<<std::endl);	
-    
-    
+			<<std::endl);
     return s;
   }
   //=========================================================================
@@ -818,13 +856,24 @@ namespace bbtk
     for ( o = bbGetOutputConnectorMap().begin(); 
 	  o!= bbGetOutputConnectorMap().end(); ++o) 
       {
-	o->second->SetStatus(new_output_status);
+		
+//EED		  if  ( ( bbBoxProcessModeIsManual()==false )  || 
+//EED			    ( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==true) ) 
+//EED			  )
+//EED		  {
+			  o->second->SetStatus(new_output_status);
+//EED		  }  else  {
+//EED			  if  (( (bbBoxProcessModeIsManual()==true) && (bbLetRecursiveExecuteManualMode==false) )  ) 
+//EED			  {
+//EED				  o->second->SetStatus(UPTODATE);
+//EED			  }
+//EED		  } // Manual analysis
+			  
       }
 
     bbtkBlackBoxDebugMessage("process",4,
 			"<= BlackBox::bbComputePostProcessStatus()"
-			<<std::endl);	
-
+			<<std::endl);
   }
   //==================================================================
 
@@ -836,7 +885,6 @@ namespace bbtk
 			<<name<<"\","<<c->GetFullName()<<")"
 			<<std::endl);       
 
-
     InputConnectorMapType::iterator i = bbGetInputConnectorMap().find(name);
     if (i==bbGetInputConnectorMap().end())
       {
@@ -845,12 +893,11 @@ namespace bbtk
     i->second->SetConnection(c);
     // The input *MUST* be set OUTOFDATE to update its input on next execution
     bbSetStatusAndPropagate(i->second,OUTOFDATE);
-    
+
     bbtkBlackBoxDebugMessage("connection",2,
 			"<== BlackBox::bbConnectInput(\""
 			<<name<<"\","<<c->GetFullName()<<")"
-			<<std::endl);       
-
+			<<std::endl);
   }
   //=========================================================================
 
@@ -862,7 +909,7 @@ namespace bbtk
 			     "==> BlackBox::bbConnectOutput(\""<<name<<"\","
 			     <<c->GetFullName()<<")"
 			     <<std::endl);       
-    
+
     OutputConnectorMapType::iterator i = bbGetOutputConnectorMap().find(name);
     if (i==bbGetOutputConnectorMap().end())
       {
@@ -873,8 +920,7 @@ namespace bbtk
     bbtkBlackBoxDebugMessage("connection",2,
 			     "<== BlackBox::bbConnectOutput(\""<<name<<"\","
 			     <<c->GetFullName()<<")"
-			     <<std::endl);       
-
+			     <<std::endl);
   }
   //=========================================================================
 
@@ -886,8 +932,7 @@ namespace bbtk
     bbtkBlackBoxDebugMessage("connection",2,
 		     "==> BlackBox::bbDisconnectInput(\""<<name
 		     <<"\","<<c->GetFullName()<<")"
-		     <<std::endl);      
-
+		     <<std::endl);
     if (!c) 
       {
 
@@ -1164,8 +1209,8 @@ namespace bbtk
 	   const BlackBoxOutputDescriptor* id = bbGetDescriptor()->GetOutputDescriptor(ii->first); 
 	   tempStrTypeName=id->GetTypeName();
 	   SubsBrackets(tempStrTypeName);
-	    std::string Name(ii->first);
-	    SubsBrackets(Name);
+	   std::string Name(ii->first);
+	   SubsBrackets(Name);
 	   labelStr=labelStr+"<"+ii->first.c_str()+"> " + valueStr + Name.c_str() + "  ["+tempStrTypeName+"]";
 	}
 	labelStr = labelStr+ "      } }" ;
@@ -1225,23 +1270,23 @@ namespace bbtk
      
     if (this->bbGetDescriptor()->GetPackage()) 
       {
-	bbtkBlackBoxMessage("help",1,"Black Box '"<<bbGetName()<<"' <"<<
+	     bbtkBlackBoxMessage("help",1,"Black Box '"<<bbGetName()<<"' <"<<
 		    this->bbGetDescriptor()->GetPackage()->GetName()
 		    <<"::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
       }
     else 
       {
-	bbtkBlackBoxMessage("help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
+	     bbtkBlackBoxMessage("help",1,"Black Box <::"<<this->bbGetDescriptor()->GetTypeName()<<">"<<std::endl);
       }
     /*
     if (bbIsUpToDate())
       {
-	bbtkBlackBoxMessage("help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
+	     bbtkBlackBoxMessage("help",1,"Up-to-date ["<<mMaxInputChangeTime<<","
 		    <<mMinOutputChangeTime<<"]"<<std::endl);
       }
     else 
       {
-	bbtkBlackBoxMessage("help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
+	     bbtkBlackBoxMessage("help",1,"Out-of-date ["<<mMaxInputChangeTime<<","
 		    <<mMinOutputChangeTime<<"]"<<std::endl);
       }
     */
@@ -1258,47 +1303,49 @@ namespace bbtk
     unsigned int valuelmax = 0;
     //   unsigned int connlmax = 0;
     for ( i = mInputConnectorMap.begin(); i != mInputConnectorMap.end(); ++i ) 
-      {
-	iname.push_back(i->first);
-	if (iname.back().size()>namelmax) namelmax = iname.back().size();
-	ivalue.push_back(bbGetInputAsString(i->first));
-	if (ivalue.back().size()>valuelmax) valuelmax = ivalue.back().size();
-	std::string s("");
-	Connection* con = i->second->GetConnection();
-	if (con!=0){
-	  s = con->GetOriginalBlackBoxFrom()->bbGetName();
-	  s += ".";
-	  s += con->GetOriginalBlackBoxFromOutput();
-	}  // if con
-	iconn.push_back(s);
-	istatus.push_back(GetIOStatusString(i->second->GetStatus()));
-      }
+    {
+	   iname.push_back(i->first);
+	   if (iname.back().size()>namelmax) namelmax = iname.back().size();
+	   ivalue.push_back(bbGetInputAsString(i->first));
+	   if (ivalue.back().size()>valuelmax) valuelmax = ivalue.back().size();
+	   std::string s("");
+	   Connection* con = i->second->GetConnection();
+	   if (con!=0){
+	      s = con->GetOriginalBlackBoxFrom()->bbGetName();
+	      s += ".";
+	      s += con->GetOriginalBlackBoxFromOutput();
+	   }  // if con
+	   iconn.push_back(s);
+	   istatus.push_back(GetIOStatusString(i->second->GetStatus()));
+    }
     OutputConnectorMapType::iterator o;
     std::vector<std::string> oname;
     std::vector<std::string> ovalue;
     std::vector<std::vector<std::string> > oconn;
     std::vector<std::string> ostatus;
     for ( o = mOutputConnectorMap.begin(); o != mOutputConnectorMap.end(); ++o ) 
-      {
-	oname.push_back(o->first);
-	if (oname.back().size()>namelmax) namelmax = oname.back().size();
-	ovalue.push_back(bbGetOutputAsString(o->first));
-	if (ovalue.back().size()>valuelmax) valuelmax = ovalue.back().size();
-	std::vector<std::string> ss;
-	const std::vector<Connection*>& con 
-	  = o->second->GetConnectionVector();
-	std::vector<Connection*>::const_iterator c;
-	for (c=con.begin();c!=con.end();++c) 
-	  {
-	    std::string s;
-	    s = (*c)->GetOriginalBlackBoxTo()->bbGetName();
-	    s += ".";
-	    s += (*c)->GetOriginalBlackBoxToInput();
-	    ss.push_back(s);
-	}  // if con
-	oconn.push_back(ss);
-	ostatus.push_back(GetIOStatusString(o->second->GetStatus()));
-      }
+    {
+	   oname.push_back(o->first);
+	   if (oname.back().size()>namelmax)
+          namelmax = oname.back().size();
+	   ovalue.push_back(bbGetOutputAsString(o->first));
+	   if (ovalue.back().size()>valuelmax) 
+          valuelmax = ovalue.back().size();
+	   std::vector<std::string> ss;
+	   const std::vector<Connection*>& con 
+	                            = o->second->GetConnectionVector();
+	   std::vector<Connection*>::const_iterator c;
+	   for (c=con.begin();c!=con.end();++c) 
+	   {
+	       std::string s;
+	       s = (*c)->GetOriginalBlackBoxTo()->bbGetName();
+	       s += ".";
+	       s += (*c)->GetOriginalBlackBoxToInput();
+	       ss.push_back(s);
+	    }  // if con
+	    oconn.push_back(ss);
+	    ostatus.push_back(GetIOStatusString(o->second->GetStatus()));
+    }
 
     if (iname.size()) 
       bbtkBlackBoxMessage("help",1," * Inputs : "<<std::endl);
@@ -1307,53 +1354,52 @@ namespace bbtk
 
     std::vector<std::string>::iterator i1,i2,i3,i4;
     for (i1=iname.begin(),i2=ivalue.begin(),i3=iconn.begin(),i4=istatus.begin();
-	 i1!=iname.end(),i2!=ivalue.end(),i3!=iconn.end(),i4!=istatus.end();
-	 ++i1,++i2,++i3,++i4)
-      {
-	std::string name(*i1);
-	name += "'";
-	name.append(1+namelmax-name.size(),' ');
-	std::string value(*i2);
-	value += "'";
-	value.append(1+valuelmax-value.size(),' ');
-	if (i3->size()) 
-	  bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value<<" <-- '"
-		      <<*i3<<"'");
-	else 
-	  bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
-	bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
-      }
+	     i1!=iname.end(),i2!=ivalue.end(),i3!=iconn.end(),i4!=istatus.end();
+	   ++i1,++i2,++i3,++i4)
+     {
+	    std::string name(*i1);
+	    name += "'";
+	    name.append(1+namelmax-name.size(),' ');
+	    std::string value(*i2);
+	    value += "'";
+	    value.append(1+valuelmax-value.size(),' ');
+	    if (i3->size()) 
+	      bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value<<" <-- '" <<*i3<<"'");
+	    else 
+	      bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
+	    bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
+     }
 
     if (oname.size()) 
-      bbtkBlackBoxMessage("help",1," * Outputs : "<<std::endl);
+       bbtkBlackBoxMessage("help",1," * Outputs : "<<std::endl);
     else 
-      bbtkBlackBoxMessage("help",1," * No outputs"<<std::endl);
+       bbtkBlackBoxMessage("help",1," * No outputs"<<std::endl);
 
     std::vector<std::vector<std::string> >::iterator i5;
 
     for (i1=oname.begin(),i2=ovalue.begin(),i5=oconn.begin(),i4=ostatus.begin();
-	 i1!=oname.end(),i2!=ovalue.end(),i5!=oconn.end(),i4!=ostatus.end();
-	 ++i1,++i2,++i4,++i5)
-      {
-	std::string name(*i1);
-	name += "'";
-	name.append(1+namelmax-name.size(),' ');
-	std::string value(*i2);
-	value += "'";
-	value.append(1+valuelmax-value.size(),' ');
-	if (!(*i5).size())
-	  bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
-	else 
-	  {
-	    std::string pref = "    '"+name+" = '"+value;
-	    for (i3=i5->begin();i3!=i5->end();++i3)
-	      {
-		bbtkBlackBoxMessage("help",1,pref<<" --> '"<<*i3<<"'");
-		pref.replace(0,pref.size(),pref.size(),' ');
-	      }
-	  }
-	bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
-      }
+	     i1!=oname.end(),i2!=ovalue.end(),i5!=oconn.end(),i4!=ostatus.end();
+	   ++i1,++i2,++i4,++i5)
+    {
+	    std::string name(*i1);
+	    name += "'";
+	    name.append(1+namelmax-name.size(),' ');
+	    std::string value(*i2);
+	    value += "'";
+	    value.append(1+valuelmax-value.size(),' ');
+	    if (!(*i5).size())
+	      bbtkBlackBoxMessage("help",1,"    '"<<name<<" = '"<<value);
+	    else 
+	    {
+	       std::string pref = "    '"+name+" = '"+value;
+	       for (i3=i5->begin();i3!=i5->end();++i3)
+	       {
+		      bbtkBlackBoxMessage("help",1,pref<<" --> '"<<*i3<<"'");
+		      pref.replace(0,pref.size(),pref.size(),' ');
+	       }
+	    }
+	    bbtkBlackBoxMessage("help",1," ["<<*i4<<"]"<<std::endl);
+    }
 
    }
   //=========================================================================