From: guigues <guigues>
Date: Mon, 21 Apr 2008 12:43:05 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.1~69
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=93d88be3faa40557ad9279e2f32b2f9518fa839f;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index ae0869d..99fe6d2 100644
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:14 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2008/04/21 12:43:05 $
+  Version:   $Revision: 1.5 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -81,26 +81,11 @@ namespace bbtk
 			<<(caller?caller->GetFullName():"0")<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
-    if (bbGetExecuting()) 
-      {
-	bbtkWarning(bbGetFullName()<<" : Cyclic execution stopped");
-	return UPTODATE;
-      }
-    bbSetExecuting(true);
-
     bbtkDebugMessage("Process",5,"Initial Status  = "<<bbGetStatus()
                     <<std::endl);
     bbtkDebugMessage("Process",5,"BoxProcessMode  = "
                     <<bbGetInputBoxProcessMode()<<std::endl);
    
-    /* 
-    if ( bbGetStatus() == UPDATING ) 
-      {
-    bbtkMessage("Warning",1,"!! WARNING !! Cyclic pipeline execution (bbBackwardUpdate ["<<bbGetFullName()<<"] reentered). This may indicate an error in pipeline conception"<<std::endl);
-    //	return UPTODATE;
-    bbSetStatus(MODIFIED);
-      }
-    */
 
     if ( ( bbGetStatus() == MODIFIED ) ||
         ( bbBoxProcessModeIsAlways() ) )
@@ -108,8 +93,6 @@ namespace bbtk
         bool wasExecuting = bbGlobalGetSomeBoxExecuting();
         bbGlobalSetSomeBoxExecuting(true);
 
-        //	bbSetStatus(UPDATING);
-
         // Updates its inputs
         IOStatus s = bbUpdateInputs();
     
@@ -149,7 +132,6 @@ namespace bbtk
             <<bbGetFullName()<<"]"<<std::endl);
     bbtkDebugDecTab("Process",1);
 
-    bbSetExecuting(false);
 
     return bbGetStatus();
 
diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 58ae959..dbba13d 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/04/18 12:59:15 $
-Version:   $Revision: 1.10 $
+Date:      $Date: 2008/04/21 12:43:05 $
+Version:   $Revision: 1.11 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See doc/license.txt or
@@ -93,8 +93,8 @@ namespace bbtk
     : bbmName(name), 
       bbmStatus(MODIFIED), 
       bbmBoxProcessMode("Pipeline"),
-      bbmParent(),
-      bbmExecuting(false)
+      bbmParent()
+
   {
     bbtkDebugMessage("object",4,"==> BlackBox::BlackBox(\""
 		     <<name<<"\")"<<std::endl);
@@ -109,8 +109,8 @@ namespace bbtk
     : bbmName(name), 
       bbmStatus(from.bbmStatus), 
       bbmBoxProcessMode(from.bbmBoxProcessMode),
-      bbmParent(),
-      bbmExecuting(false)
+      bbmParent()
+
   {
     bbtkDebugMessage("object",4,"==> BlackBox::BlackBox("
 		     <<from.bbGetFullName()<<",\""
diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index 04843d2..d5f0671 100644
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:15 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/04/21 12:43:05 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See doc/license.txt or
@@ -363,9 +363,6 @@ bool reaction = true);
     virtual void bbCopyIOValues(BlackBox& from);
     //==================================================================
 
-    bool bbGetExecuting() const { return bbmExecuting; }
-    void bbSetExecuting(bool b) { bbmExecuting = b; }
-
     // Black box objects have a special deleter 
     // which must take care of releasing the descriptor 
     // **AFTER** the box is deleted 
@@ -407,10 +404,6 @@ bool reaction = true);
     BlackBox::WeakPointer bbmParent;
     //==================================================================
 
-    //==================================================================
-    // Am I executing (to test pipeline cycles) ?
-    bool bbmExecuting;
-    //==================================================================
 
    //==================================================================
     // ATTRIBUTES
diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index 56fdb05..922701b 100644
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/04/21 11:41:56 $
-Version:   $Revision: 1.11 $
+Date:      $Date: 2008/04/21 12:43:05 $
+Version:   $Revision: 1.12 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See Doc/License.txt or
@@ -324,12 +324,6 @@ namespace bbtk
 	bbtkInternalError("ComplexBlackBox::bbBackwardUpdate called with caller=0");
       }
 
-    if (bbGetExecuting()) 
-      {
-	bbtkWarning(bbGetFullName()<<" : Cyclic execution stopped");
-	return UPTODATE;
-      }
-    bbSetExecuting(true);
 
     IOStatus s = UPTODATE;
     const BlackBoxDescriptor::OutputDescriptorMapType& omap 
@@ -373,11 +367,8 @@ namespace bbtk
       }
     bbtkDebugDecTab("Process",1);
 
-    bbSetExecuting(false);
-
     return s;
     
-    //    return UPTODATE;
   }
   //==================================================================
 
diff --git a/kernel/src/bbtkWxBlackBox.cxx b/kernel/src/bbtkWxBlackBox.cxx
index 2413e4a..b278488 100644
--- a/kernel/src/bbtkWxBlackBox.cxx
+++ b/kernel/src/bbtkWxBlackBox.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:16 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2008/04/21 12:43:05 $
+  Version:   $Revision: 1.13 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -540,40 +540,41 @@ namespace bbtk
 			"=> WxBlackBox::bbBackwardUpdate("
 			<<(caller?caller->GetFullName():"0")<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
-
-    if (bbGetExecuting()) 
-      {
-	bbtkWarning(bbGetFullName()<<" : Cyclic execution stopped");
-	return UPTODATE;
-      }
-    bbSetExecuting(true);
-
     // If the caller is not the connection to the output widget
     // and the output 'Widget' is connected then 
-    // we must execute the parent box
-    bool done = false;
+    // 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"))
 	 )
       {
 	BlackBox::OutputConnectorMapType::const_iterator i 
 	  = bbGetOutputConnectorMap().find("Widget") ;
-	if ( 
-	    i->second->GetConnectionVector().size() != 0 ) 
+	if ( i->second->GetConnectionVector().size() != 0 )
+	     
 	  {
 	    bbtkDebugMessage("Process",2,
-			     "-> Output 'Widget' connected : transfering execution to parent"
+			     "-> Output 'Widget' connected : transfering update order to parent"
 			     <<std::endl);
-	    
-	    i->second->GetConnectionVector().front().lock()
-	      ->GetBlackBoxTo()->bbExecute(false);
-	    done = true;
+	    if ( bbGetUpdateTransferedToParent() )	    
+	      {
+		bbSetUpdateTransferedToParent(false);
+		bbtkDebugMessage("Process",2,
+				 "   ... already transfered : abort"
+				 <<std::endl);
+	      }
+	    else 
+	      {
+		bbSetUpdateTransferedToParent(true);
+		i->second->GetConnectionVector().front().lock()
+		  ->GetBlackBoxTo()->bbExecute(false);
+	      }
 	  }
       }
     // call 'standard' BlackBox execution method
-    if (!done) 
+    if (!bbGetUpdateTransferedToParent()) 
       { 
-	bbSetExecuting(false);
 	AtomicBlackBox::bbBackwardUpdate(caller);
       }
     
@@ -581,7 +582,6 @@ namespace bbtk
 			"<= WxBlackBox::bbBackwardUpdate() ["
 			<<bbGetFullName()<<"]"<<std::endl);
     
-    bbSetExecuting(false);
   }
 
   //=========================================================================
diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h
index 92d711d..6196323 100644
--- a/kernel/src/bbtkWxBlackBox.h
+++ b/kernel/src/bbtkWxBlackBox.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/18 12:59:16 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2008/04/21 12:43:05 $
+  Version:   $Revision: 1.12 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -184,6 +184,16 @@ namespace bbtk
     /// Main processing method of the box. Overloaded to handle windows inclusion : if the output Widget is connected then the execution is transfered to the box to which it is connected (the container window must be created and displayed - this box will be also executed by the normal pipeline recursion mechanism)
     virtual void bbExecute(bool force = false);
 
+
+    /// Is set to true before transfering update to parent 
+    /// in order to not re-transfer a second time...
+    bool bbmUpdateTransferedToParent;
+
+    bool bbGetUpdateTransferedToParent() const { return bbmUpdateTransferedToParent; }
+    void bbSetUpdateTransferedToParent(bool b) 
+    { bbmUpdateTransferedToParent = b; }
+
+
   };
   //=================================================================