X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxOutputConnector.cxx;h=e6ba06c5c9780ba86018a56923b4f6537e8f4b60;hb=e0df8df54991d75c3d61d7df7f5b627d42525ba2;hp=c6813f250564ae15afce0b14bdcac3044b57e3d4;hpb=a7158b8ae6724e3b7cdf3c3a3aad1157365fbcb0;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx
index c6813f2..e6ba06c 100644
--- a/kernel/src/bbtkBlackBoxOutputConnector.cxx
+++ b/kernel/src/bbtkBlackBoxOutputConnector.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxOutputConnector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/08 14:02:15 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2009/06/08 14:50:03 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -42,11 +42,39 @@
 namespace bbtk
 {
 
+  //========================================================================
+  /// The Pimpl
+  class BlackBoxOutputConnector::Pimpl
+  {
+  public:
+    Pimpl() : mStatus(OUTOFDATE) {}
+    Pimpl(const Pimpl&) {}
+   /// 
+    BlackBoxWeakPointer mBox;
+    /// The vector of output connections
+    ConnectionVector mConnection;
+    /// The status of the output 
+    IOStatus mStatus;
+    /// The output changed signal 
+    BlackBox::OutputChangeSignalType mChangeSignal;
+
+
+  };
+  //========================================================================
+
+  //========================================================================
+  BBTK_IMPL_PIMPL(BlackBoxOutputConnector)
+  //========================================================================
+
+
   //======================================================================
-  BlackBoxOutputConnector::BlackBoxOutputConnector() 
-    : mStatus(OUTOFDATE)
+  BlackBoxOutputConnector::BlackBoxOutputConnector(BlackBox::Pointer b) 
   {
-    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::BlackBoxOutputConnector()"<<std::endl);
+    bbtkDebugMessage("kernel",9,
+		     "["<<b->bbGetName()
+		     <<"] BlackBoxOutputConnector()"<<std::endl);
+    PimplConstruct();
+    p->mBox = b;
   }
   //======================================================================
 
@@ -54,8 +82,8 @@ namespace bbtk
   //======================================================================
   BlackBoxOutputConnector::~BlackBoxOutputConnector() 
   {
-    bbtkDebugMessage("Kernel",9,
-		     "==> BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+    bbtkDebugMessage("kernel",9,
+		     "[DEAD BOX] ==> ~BlackBoxOutputConnector()"
 		     <<std::endl);
     /*
     ConnectionVector::iterator i;
@@ -64,9 +92,11 @@ namespace bbtk
 	 ++i)
       (*i) = Connection::WeakPointer();
     */
-    mConnection.clear();
-    bbtkDebugMessage("Kernel",9,
-		     "<== BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+    p->mConnection.clear();
+    PimplDestruct();
+  
+    bbtkDebugMessage("kernel",9,
+		     "[DEAD BOX] <== ~BlackBoxOutputConnector()"
 		     <<std::endl);
   }
   //======================================================================
@@ -75,9 +105,11 @@ namespace bbtk
   ///
   void BlackBoxOutputConnector::SetConnection(Connection* c)
   {
-    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::SetConnection("
+    bbtkDebugMessage("kernel",9,
+		     "["<<p->mBox.lock()->bbGetName()
+		     <<"] BlackBoxOutputConnector::SetConnection("
 		     <<c<<")"<<std::endl);
-    mConnection.push_back(c);
+    p->mConnection.push_back(c);
     //    AddChangeObserver(boost::bind(&Connection::SignalChange,c));
   }
   //======================================================================
@@ -86,119 +118,98 @@ namespace bbtk
   //======================================================================
   void BlackBoxOutputConnector::UnsetConnection(Connection* c)
   {
-    bbtkDebugMessageInc("Kernel",9,"BlackBoxOutputConnector::UnsetConnection("
+    bbtkDebugMessage("kernel",9,"["<<p->mBox.lock()->bbGetName()
+		     <<"] BlackBoxOutputConnector::UnsetConnection("
 		     <<c<<")"<<std::endl);
 
     if (!c) 
       {
-	bbtkInternalError("BlackBoxOutputConnector::UnsetConnection("<<c<<") : invalid connection");
+	bbtkInternalError(p->mBox.lock()->bbGetFullName()
+			  <<": BlackBoxOutputConnector::UnsetConnection("
+			  <<c<<") : invalid connection");
 
       }
     //    c->Check();
     //Connection::WeakPointer w(c);
     ConnectionVector::iterator i;
     //  = find(mConnection.begin(),mConnection.end(),c);
-    for (i=mConnection.begin();
-	 i!=mConnection.end();
+    for (i=p->mConnection.begin();
+	 i!=p->mConnection.end();
 	 ++i)
       {
 	if (*i==c) break;
       }
-    if (i==mConnection.end())
+    if (i==p->mConnection.end())
       {
-	bbtkInternalError("BlackBoxOutputConnector::UnsetConnection("<<c<<") : connection is absent from connections list");
+	bbtkInternalError(p->mBox.lock()->bbGetFullName()
+			  <<": BlackBoxOutputConnector::UnsetConnection("
+			  <<c
+			  <<") : connection is absent from connections list");
       }
-    mConnection.erase(i);
+    p->mConnection.erase(i);
     //    RemoveChangeObserver(boost::bind(&Connection::SignalChange,c));
 
-    bbtkDebugDecTab("Kernel",9);
+
   }
   //======================================================================
-
   
-   //======================================================================
-  void BlackBoxOutputConnector::SignalChange( BlackBox::Pointer box,
-					      const std::string& output )
-  {
-	  IOStatus s = OUTOFDATE; //mStatus;
-	  //if (s==UPTODATE) s=MODIFIED;
-	  
-	  bbtkDebugMessage("change",2,
-		     "==> BlackBoxOutputConnector::SignalChange("
-		     <<box->bbGetFullName()<<",'"
-		     <<output<<"','"<<GetIOStatusString(s)<<"') ["
-		     <<this<<"]"
-		     <<std::endl);
-
-   mChangeSignal(box,output,s);
-
-    bbtkDebugMessage("change",2,
-		     "<== BlackBoxOutputConnector::SignalChange("
-		     <<box->bbGetFullName()<<",'"
-		     <<output<<"','"<<GetIOStatusString(s)<<"') ["
-		     <<this<<"]"
-		     <<std::endl);
+  //======================================================================
+  const BlackBoxOutputConnector::ConnectionVector& 
+  BlackBoxOutputConnector::GetConnectionVector() const
+  { 
+    return p->mConnection; 
   }
   //======================================================================
- /*
-  void BlackBoxOutputConnector::SetModifiedStatus()
-  {
-    bbtkDebugMessage("modified",2,
-		     "==> BlackBoxOutputConnector::SetModifiedStatus() ["
-		     <<this<<"]"
-		     <<std::endl);
-    ConnectionVector::iterator i;
-    for (i=mConnection.begin();i!=mConnection.end();++i) 
-      {
-	(*i)->SetModifiedStatus();
-      }
-    
-    
-   }
-  */
-  /*
+  
+  //======================================================================
+  /// Returns the status of the input 
+  IOStatus BlackBoxOutputConnector::GetStatus() const 
+  { 
+    return p->mStatus; 
+  }
+  //======================================================================
+
   //======================================================================
-  void BlackBoxOutputConnector::SetChangeTime(const ChangeTime& t)
+  /// Sets the status of the input 
+  void BlackBoxOutputConnector::SetStatus( IOStatus s ) 
   {
-    bbtkDebugMessage("change",2,
-		     "==> BlackBoxOutputConnector::SetChangeTime("<<t<<") ["
-		     <<this<<"]"
-		     <<std::endl);
-    if (mChangeTime.Set(t))
-      {
-	mChangeSignal(this);
-      }
-    bbtkDebugMessage("change",2,
-		     "<== BlackBoxOutputConnector::SetChangeTime("<<t<<") ["
-		     <<this<<"]"
-		     <<std::endl);
+    p->mStatus = s; 
   }
   //======================================================================
-  */
-  /*
- //======================================================================
-  void BlackBoxOutputConnector::SetChangeTimeToCurrentTime()
+  
+  //======================================================================
+  void BlackBoxOutputConnector::SignalChange( BlackBox::Pointer box,
+					      const std::string& output )
   {
+    IOStatus s = OUTOFDATE; //mStatus;
+    //if (s==UPTODATE) s=MODIFIED;
+    
     bbtkDebugMessage("change",2,
-		     "==> BlackBoxOutputConnector::SetChangeTimetoCurrentTime() ["
+		     "["<<box->bbGetName()
+		     <<"] ==> BlackBoxOutputConnector::SignalChange('"
+		     <<output<<"','"<<GetIOStatusString(s)<<"') ["
 		     <<this<<"]"
 		     <<std::endl);
-    mChangeTime.Set(ChangeTime::GetCurrentTime());
-    mChangeSignal(this);
+    
+    //    std::cout<<"BlackBoxOutputConnector::SignalChange("
+    //	     <<box->bbGetName()<<",'"
+    //	     <<output<<"')"<<std::endl;
+    p->mChangeSignal(box,output,s);
     
     bbtkDebugMessage("change",2,
-		     "<==> BlackBoxOutputConnector::SetChangeTimetoCurrentTime() ["
+		     "["<<box->bbGetName()
+		     <<"] <== BlackBoxOutputConnector::SignalChange('"
+		     <<output<<"','"<<GetIOStatusString(s)<<"') ["
 		     <<this<<"]"
 		     <<std::endl);
   }
   //======================================================================
-  */
-
 
   //======================================================================
   void BlackBoxOutputConnector::AddChangeObserver(OutputChangeCallbackType f)
   { 
-    mChangeSignal.connect(f); 
+    //    std::cout << "BlackBoxOutputConnector::AddChangeObserver" << std::endl;
+    p->mChangeSignal.connect(f); 
   }
   //======================================================================