X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxInputConnector.cxx;h=a2355debee3a22923e2279b16ad9b15a6933ab33;hb=8a05f9b39b1a8639e96b938f95cd93cfb2fd4de6;hp=0acb2460b36cac9750bc9f288940753d5cd0fccb;hpb=bfd7e9034cbfd9c535e98ccb302c08e5e42da8c6;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBoxInputConnector.cxx b/kernel/src/bbtkBlackBoxInputConnector.cxx
index 0acb246..a2355de 100644
--- a/kernel/src/bbtkBlackBoxInputConnector.cxx
+++ b/kernel/src/bbtkBlackBoxInputConnector.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxInputConnector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/11 09:50:35 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2009/06/08 14:50:02 $
+  Version:   $Revision: 1.11 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -39,36 +39,114 @@
 
 namespace bbtk
 {
+
+  //========================================================================
+  /// The Pimpl
+  class BlackBoxInputConnector::Pimpl
+  {
+  public:
+    Pimpl() : mConnection(0), mStatus(MODIFIED) {}
+      
+    /// 
+    BlackBoxWeakPointer mBox;
+    /// The connection plugged into the input
+    Connection* mConnection;
+    /// The status of the input (UPTODATE | MODIFIED | OUTOFDATE)
+    IOStatus mStatus;
+
+  };
+  //========================================================================
+
+  //========================================================================
+  BBTK_IMPL_PIMPL(BlackBoxInputConnector)
+  //========================================================================
+
+
   //========================================================================
   BlackBoxInputConnector::BlackBoxInputConnector(BlackBox::Pointer b)  
-    : mBox(b), mConnection(0), mStatus(MODIFIED)
+  //: mBox(b), mConnection(0), mStatus(MODIFIED)
   {
-    bbtkDebugMessage("Kernel",9,"BlackBoxInputConnector::BlackBoxInputConnector()"<<std::endl);
+    bbtkDebugMessage("kernel",9,
+		     "["<<b->bbGetName()
+		     <<"] BlackBoxInputConnector()"<<std::endl);
+    PimplConstruct();
+    p->mBox = b;
   }
   //========================================================================
 
   //========================================================================
   BlackBoxInputConnector::~BlackBoxInputConnector() 
   {
-    bbtkDebugMessageInc("Kernel",9,"BlackBoxInputConnector::~BlackBoxInputConnector()"<<std::endl);
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("kernel",9,
+		     "[DEAD BOX] ~BlackBoxInputConnector()"
+		     <<std::endl);
+    PimplDestruct();
   }
   //========================================================================
 
+  //========================================================================
+  /// Returns the connection plugged into this input (const)
+  Connection* BlackBoxInputConnector::GetConnection() const 
+  { 
+    return p->mConnection; 
+  }
+  //========================================================================
+  
+
+  //========================================================================
+  /// Returns true iff a connection is connected to it
+    bool BlackBoxInputConnector::IsConnected() const 
+  { 
+    return (p->mConnection != 0); 
+  }
+   //========================================================================
+   
+
+   //========================================================================
+   /// Returns the status of the input 
+    IOStatus BlackBoxInputConnector::GetStatus() const 
+   { 
+     return p->mStatus; 
+   }
+  //========================================================================
+
+  //========================================================================
+    /// Sets the status of the input 
+    void BlackBoxInputConnector::SetStatus(IOStatus s) 
+    { 
+      p->mStatus = s; 
+    }
+   //========================================================================
+   
+    
+
+  //========================================================================
+    /// Returns the black box which owns the connector
+    BlackBoxPointer BlackBoxInputConnector::GetBlackBox() const 
+    { 
+      return p->mBox.lock(); 
+    } 
+
+  //========================================================================
+
   //========================================================================
   void BlackBoxInputConnector::SetConnection(Connection* c) 
   { 
-    bbtkDebugMessage("Kernel",9,"BlackBoxInputConnector::SetConnection("<<c<<")"<<std::endl);
-    mConnection = c; 
+    bbtkDebugMessage("kernel",9,
+		     "["<<p->mBox.lock()->bbGetName()
+		     <<"] BlackBoxInputConnector::SetConnection("<<c<<")"<<std::endl);
+    p->mConnection = c; 
   }
   //========================================================================
 
   //========================================================================
   void BlackBoxInputConnector::UnsetConnection(Connection* c) 
   { 
-    bbtkDebugMessage("Kernel",9,"BlackBoxInputConnector::UnsetConnection("
+    bbtkDebugMessage("kernel",9,
+		     "["<<p->mBox.lock()->bbGetName()
+		     <<"] BlackBoxInputConnector::UnsetConnection("
 		     <<c<<")"<<std::endl);
-    mConnection = 0; 
+    p->mConnection = 0; 
   }
   //========================================================================
   
@@ -78,17 +156,23 @@ namespace bbtk
     // If connected and OUTOFDATE : recursive update
     // Post-update status is updated by the connection 
     // (either MODIFIED or OUTOFDATE)
-    if ( mConnection && (mStatus == OUTOFDATE) )
+    if ( p->mConnection && (p->mStatus == OUTOFDATE) )
       {
-	mConnection->RecursiveExecute();
+	p->mConnection->RecursiveExecute();
       }
     else
       {
-	bbtkDebugMessage("process",5,
-			 "--> BlackBoxInputConnector::RecursiveExecute() : "
-			 <<"No connection or input not Out-of-date : nothing to do"
-			 <<std::endl);
-
+	if (!p->mBox.expired())
+	  bbtkDebugMessage("process",5,"["<<p->mBox.lock()->bbGetName()
+			   <<"] --> BlackBoxInputConnector::RecursiveExecute() : "
+			   <<"No connection or input not Out-of-date : nothing to do"
+			   <<std::endl);
+	else
+	  bbtkDebugMessage("process",5,
+			   "[DEAD BOX] --> BlackBoxInputConnector::RecursiveExecute() : "
+			   <<"No connection or input not Out-of-date : nothing to do"
+			   <<std::endl);
+	  
       }
   }
   //========================================================================