Test code

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index cb686699c8f8f05eacfbe1b7518484f15a3cd2e8..0b76e372fd937c90dec927f63321d3ab46b5d1f1 100644 (file)
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -76,6 +76,7 @@ void print_trace()
 
 namespace bbtk
 {
+  static bool bbmgInConstruction    = false;
   static bool bbmgSomeBoxExecuting     = false;
   static bool bbmgFreezeExecution      = false;
   static std::set<BlackBox::WeakPointer> bbmgExecutionList;
@@ -521,24 +522,28 @@ namespace bbtk
                             "=> BlackBox::bbSignalOutputModification("
                             <<reaction<<")"
                             <<"]"<<std::endl);
-
-    OutputConnectorMapType::iterator i;
-    for ( i  = bbGetOutputConnectorMap().begin(); 
-         i != bbGetOutputConnectorMap().end(); ++i) 
-      {
-       //      std::cout << "Stat = "
-       //<<GetIOStatusString(i->second->GetStatus())
-       //                <<std::endl;
-       // LG : CANNOT SIGNAL ONLY WHEN UPTODATE 
-       // See bbtkSampleOutputObserver
-       //      if (i->second->GetStatus()==UPTODATE) 
-       //        {
-           i->second->SignalChange(GetThisPointer<BlackBox>(),i->first); 
-           //    }
-      } // for
-
-    if (reaction) bbGlobalProcessExecutionList();
-
+    if (bbGlobalGetInConstruction()==false)
+    {
+        OutputConnectorMapType::iterator i;
+        for ( i  = bbGetOutputConnectorMap().begin();
+             i != bbGetOutputConnectorMap().end(); ++i)
+        {
+            // std::cout << "Stat = "
+            //<<GetIOStatusString(i->second->GetStatus())
+            //           <<std::endl;
+            // LG : CANNOT SIGNAL ONLY WHEN UPTODATE
+            // See bbtkSampleOutputObserver
+            // if (i->second->GetStatus()==UPTODATE)
+            //   {
+            i->second->SignalChange(GetThisPointer<BlackBox>(),i->first);
+            //   }
+        } // for
+        
+        if (reaction = true) 
+        {
+            bbGlobalProcessExecutionList();
+        } // if reaction
+    } // if inCosntruction
     bbtkBlackBoxDebugMessage("change",5,
                             "<= BlackBox::bbSignalOutputModification()"
                             <<std::endl);
@@ -554,75 +559,87 @@ namespace bbtk
                             "=> BlackBox::bbSignalOutputModification("
                             <<output<<","<<reaction<<")"
                             <<std::endl);
-    
-    OutputConnectorMapType::iterator i = 
-      bbGetOutputConnectorMap().find(output);
-
-
-    if ( i == bbGetOutputConnectorMap().end() ) 
-       {
-         bbtkError("BlackBox["<<bbGetFullName()<<"]::bbSignalOutputModification("<<output<<") : unknown output");
-       }
-
-    //    if (i->second->GetStatus()==UPTODATE) 
-    //      {
-       i->second->SignalChange(GetThisPointer<BlackBox>(),i->first); 
-       // Has to notify the output "BoxChange" also
-       if (output != "BoxChange") 
-         {
-           i = bbGetOutputConnectorMap().find("BoxChange");
-           if ( i != bbGetOutputConnectorMap().end() ) 
-             {
-               i->second->SignalChange(GetThisPointer<BlackBox>(),i->first); 
-             }
-         }
-       if (reaction) bbGlobalProcessExecutionList();
-       //      }
-
+      if (bbGlobalGetInConstruction()==false)
+      {
+          
+          OutputConnectorMapType::iterator i =
+          bbGetOutputConnectorMap().find(output);
+          
+          
+          if ( i == bbGetOutputConnectorMap().end() )
+          {
+              bbtkError("BlackBox["<<bbGetFullName()<<"]::bbSignalOutputModification("<<output<<") : unknown output");
+          }
+          
+          //    if (i->second->GetStatus()==UPTODATE)
+          //      {
+          i->second->SignalChange(GetThisPointer<BlackBox>(),i->first);
+          // Has to notify the output "BoxChange" also
+          if (output != "BoxChange")
+          {
+              i = bbGetOutputConnectorMap().find("BoxChange");
+              if ( i != bbGetOutputConnectorMap().end() )
+              {
+                  i->second->SignalChange(GetThisPointer<BlackBox>(),i->first);
+              }
+          }
+          if (reaction=true)
+          {
+              bbGlobalProcessExecutionList();
+          } // if reaction
+          //      }
+          
+      } // if inConstruction
+          
        bbtkBlackBoxDebugMessage("change",5,
                             "<= BlackBox::bbSignalOutputModification("
                             <<output<<")"
                             <<std::endl);
   }  
-  //=========================================================================   
-  //=========================================================================  
+ //=========================================================================
+
+ //=========================================================================
   void BlackBox::bbSignalOutputModification(const std::vector<std::string>& output,
        bool reaction)
   {
     bbtkBlackBoxDebugMessage("change",5,
                        "=> BlackBox::bbSignalOutputModification(vector of outputs)"
 <<std::endl);
-    OutputConnectorMapType::iterator i;
-    std::vector<std::string>::const_iterator o;
-    bool changed = false;
-    for (o=output.begin();o!=output.end();++o) 
-      {
-       // the output "BoxChange" must be signaled **AFTER** all others
-       if (*o == "BoxChange") continue;
-       // Look for the connector
-       i = bbGetOutputConnectorMap().find(*o);
-       if ( i == bbGetOutputConnectorMap().end() ) 
-         {
-           bbtkError("BlackBox["<<bbGetFullName()<<"]::bbSignalOutputModification("<<*o<<") : unknown output");
-         }
-
-       //      if (i->second->GetStatus()==UPTODATE)
-       //        {
-           i->second->SignalChange(GetThisPointer<BlackBox>(),i->first); 
-           changed = true;
-           //  }
-      }
-    // Has to notify the output "BoxChange" also
-    i = bbGetOutputConnectorMap().find("BoxChange");
-    if ( changed && (i != bbGetOutputConnectorMap().end())) 
+      
+      if (bbGlobalGetInConstruction()==false)
       {
-       // if (i->second->GetStatus()==UPTODATE) 
-       //        {
-           i->second->SignalChange(GetThisPointer<BlackBox>(),i->first); 
-           if (reaction) bbGlobalProcessExecutionList();
-           //  }
-      }
-
+          
+          OutputConnectorMapType::iterator i;
+          std::vector<std::string>::const_iterator o;
+          bool changed = false;
+          for (o=output.begin();o!=output.end();++o)
+          {
+              // the output "BoxChange" must be signaled **AFTER** all others
+              if (*o == "BoxChange") continue;
+              // Look for the connector
+              i = bbGetOutputConnectorMap().find(*o);
+              if ( i == bbGetOutputConnectorMap().end() )
+              {
+                  bbtkError("BlackBox["<<bbGetFullName()<<"]::bbSignalOutputModification("<<*o<<") : unknown output");
+              }
+              
+              //       if (i->second->GetStatus()==UPTODATE)
+              //         {
+              i->second->SignalChange(GetThisPointer<BlackBox>(),i->first);
+              changed = true;
+              //  }
+          }
+          // Has to notify the output "BoxChange" also
+          i = bbGetOutputConnectorMap().find("BoxChange");
+          if ( changed && (i != bbGetOutputConnectorMap().end()))
+          {
+              // if (i->second->GetStatus()==UPTODATE)
+              //         {
+              i->second->SignalChange(GetThisPointer<BlackBox>(),i->first);
+              if (reaction) bbGlobalProcessExecutionList();
+              //  }
+          } // if changed
+      } // if inConstruction
     bbtkBlackBoxDebugMessage("change",5,
                             "<= BlackBox::bbSignalOutputModification(vector of outputs)"
                             <<std::endl);
@@ -762,7 +779,7 @@ namespace bbtk
                         )
                        {
 
-printf("EED BlackBox::bbRecursiveExecute bbProcess start %s \n", bbGetFullName().c_str() );
+//printf("EED BlackBox::bbRecursiveExecute bbProcess start %s \n", bbGetFullName().c_str() );
                 
 //auto start = std::chrono::high_resolution_clock::now();
                 this->bbProcess();
@@ -770,7 +787,7 @@ printf("EED BlackBox::bbRecursiveExecute bbProcess start %s \n", bbGetFullName()
 //auto duration   = std::chrono::duration_cast<std::chrono::microseconds>(stop - start);
 //printf("EED BlackBox::bbRecursiveExecute bbProcess time= %ld  %s \n", duration.count() , bbGetFullName().c_str() );
 
-printf("EED BlackBox::bbRecursiveExecute bbProcess end %s \n", bbGetFullName().c_str() );
+//printf("EED BlackBox::bbRecursiveExecute bbProcess end %s \n", bbGetFullName().c_str() );
 
                    } // Manual analysis
                  
@@ -1516,6 +1533,15 @@ printf("EED BlackBox::bbRecursiveExecute bbProcess end %s \n", bbGetFullName().c
   //=========================================================================
 
 
+bool BlackBox::bbGlobalGetInConstruction()
+{
+    return bbmgInConstruction;
+}
+
+void BlackBox::bbGlobalSetInConstruction(bool b)
+{
+    bbmgInConstruction =  b;
+}
 
 
 }  // EO namespace bbtk

diff --git a/kernel/src/bbtkBlackBox.h b/kernel/src/bbtkBlackBox.h
index d81ff2102cb28ba82042a4a63bb5021f8710d044..2bd1bbd9f4d407003d61ebafef142fe397b982f1 100644 (file)
--- a/kernel/src/bbtkBlackBox.h
+++ b/kernel/src/bbtkBlackBox.h
@@ -341,6 +341,9 @@ namespace bbtk
 
             //@}
     //JCP 09-06-09
+      
+      static bool bbGlobalGetInConstruction();
+      static void bbGlobalSetInConstruction(bool b);
 
   protected:
    //==================================================================

diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx
index 516c7b800ee39c8b750d75fa14eb25d301720839..b13f5aaa9f01ba3cf7c0464ad618a0086328534e 100644 (file)
--- a/kernel/src/bbtkComplexBlackBox.cxx
+++ b/kernel/src/bbtkComplexBlackBox.cxx
@@ -275,6 +275,7 @@ namespace bbtk
                             "**> ComplexBlackBox::bbExecute()"
                             <<std::endl);
     
+    bbGlobalSetInConstruction(true);
     
     Wx::BusyCursor wait;
     
@@ -296,6 +297,9 @@ namespace bbtk
               i->second->bbExecute(force);
           } // for i
     }
+      
+    bbGlobalSetInConstruction(false);
+
     bbtkBlackBoxDebugMessage("process",2,
                             "<** ComplexBlackBox::bbExecute()"
                             <<std::endl);