]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Mon, 8 Dec 2008 14:02:15 +0000 (14:02 +0000)
committerguigues <guigues>
Mon, 8 Dec 2008 14:02:15 +0000 (14:02 +0000)
kernel/src/bbtkBlackBoxOutputConnector.cxx
kernel/src/bbtkConnection.cxx
kernel/src/bbtkWxBlackBox.cxx

index 8024663d81f4734857e704d718bfea3bdf893b94..c6813f250564ae15afce0b14bdcac3044b57e3d4 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxOutputConnector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/08 12:54:00 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/12/08 14:02:15 $
+  Version:   $Revision: 1.10 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -120,19 +120,22 @@ namespace bbtk
   void BlackBoxOutputConnector::SignalChange( BlackBox::Pointer box,
                                              const std::string& output )
   {
-    bbtkDebugMessage("change",2,
+         IOStatus s = OUTOFDATE; //mStatus;
+         //if (s==UPTODATE) s=MODIFIED;
+         
+         bbtkDebugMessage("change",2,
                     "==> BlackBoxOutputConnector::SignalChange("
                     <<box->bbGetFullName()<<",'"
-                    <<output<<"','"<<GetIOStatusString(mStatus)<<"') ["
+                    <<output<<"','"<<GetIOStatusString(s)<<"') ["
                     <<this<<"]"
                     <<std::endl);
 
-    mChangeSignal(box,output,mStatus);
+   mChangeSignal(box,output,s);
 
     bbtkDebugMessage("change",2,
                     "<== BlackBoxOutputConnector::SignalChange("
                     <<box->bbGetFullName()<<",'"
-                    <<output<<"','"<<GetIOStatusString(mStatus)<<"') ["
+                    <<output<<"','"<<GetIOStatusString(s)<<"') ["
                     <<this<<"]"
                     <<std::endl);
   }
index 51538159f28d03e9d3981c014f53104e1ecbde7b..38051fbff9e41ac2b83df54e4bf2e5e53062ca38 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkConnection.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/08 12:54:19 $
-  Version:   $Revision: 1.16 $
+  Date:      $Date: 2008/12/08 14:02:15 $
+  Version:   $Revision: 1.17 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -519,11 +519,10 @@ Connection::Connection(BlackBox::Pointer from, const std::string& output,
     bbtkDebugMessage("change",2,
                     "==> Connection::OnOutputChange("<<status<<") ["
                     <<GetFullName()<<"]"<<std::endl);
-    
     if (mAdaptor) 
       {
-       BlackBoxInputConnector* ac = mAdaptor->bbGetInputConnectorMap().find("In")->second;
-       mAdaptor->bbSetStatusAndPropagate(ac,status);
+           BlackBoxInputConnector* ac = mAdaptor->bbGetInputConnectorMap().find("In")->second;
+           mAdaptor->bbSetStatusAndPropagate(ac,status);
       }
     
     mTo->bbSetStatusAndPropagate( mTo->bbGetInputConnectorMap().find(mInput)->second, status);
index 4ccfe67a2b8661f5416806620cb545ef5aad00fd..beec07cbc532a81877784ef857c0ae47442a7ec7 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/08 12:54:27 $
-  Version:   $Revision: 1.33 $
+  Date:      $Date: 2008/12/08 14:02:15 $
+  Version:   $Revision: 1.34 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -433,6 +433,7 @@ namespace bbtk
     
     // If the output 'Widget' is connected then 
     // we must execute the parent box
+         /*
     BlackBox::OutputConnectorMapType::const_iterator i 
       = bbGetOutputConnectorMap().find("Widget");
     
@@ -444,7 +445,7 @@ namespace bbtk
                    <<"Execute the top level Layout widget to create and "
                    <<"display the widget.");
       }
-
+*/
     AtomicBlackBox::bbExecute(force);
 
     bbtkDebugMessageDec("process",2,