Fixed Window deletion mechanism

[bbtk.git] / kernel / src / bbtkBlackBoxOutputConnector.cxx

diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx
index 789cda41ffe91f058e491db6f424ccfc8351f9e6..6631657a3c3a76f374545f3061b77aa1c566cc13 100644 (file)
--- 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/10 09:33:18 $
-  Version:   $Revision: 1.11 $
+  Date:      $Date: 2009/05/28 08:12:05 $
+  Version:   $Revision: 1.12 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -43,10 +43,13 @@ namespace bbtk
 {
 
   //======================================================================
-  BlackBoxOutputConnector::BlackBoxOutputConnector() 
-    : mStatus(OUTOFDATE)
+  BlackBoxOutputConnector::BlackBoxOutputConnector(BlackBox::Pointer b) 
+    : mBox(b),
+      mStatus(OUTOFDATE)
   {
-    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::BlackBoxOutputConnector()"<<std::endl);
+    bbtkDebugMessage("kernel",9,
+                    "["<<b->bbGetName()
+                    <<"] BlackBoxOutputConnector()"<<std::endl);
   }
   //======================================================================
 
@@ -54,8 +57,9 @@ namespace bbtk
   //======================================================================
   BlackBoxOutputConnector::~BlackBoxOutputConnector() 
   {
-    bbtkDebugMessage("Kernel",9,
-                    "==> BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+    bbtkDebugMessage("kernel",9,
+                    "[NULL"//<<mBox.lock()->bbGetName()
+                    <<"] ==> ~BlackBoxOutputConnector()"
                     <<std::endl);
     /*
     ConnectionVector::iterator i;
@@ -65,8 +69,9 @@ namespace bbtk
       (*i) = Connection::WeakPointer();
     */
     mConnection.clear();
-    bbtkDebugMessage("Kernel",9,
-                    "<== BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+    bbtkDebugMessage("kernel",9,
+                    "[NULL"//<<mBox.lock()->bbGetName()
+                    <<"] <== ~BlackBoxOutputConnector()"
                     <<std::endl);
   }
   //======================================================================
@@ -75,7 +80,9 @@ namespace bbtk
   ///
   void BlackBoxOutputConnector::SetConnection(Connection* c)
   {
-    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::SetConnection("
+    bbtkDebugMessage("kernel",9,
+                    "["<<mBox.lock()->bbGetName()
+                    <<"] BlackBoxOutputConnector::SetConnection("
                     <<c<<")"<<std::endl);
     mConnection.push_back(c);
     //    AddChangeObserver(boost::bind(&Connection::SignalChange,c));
@@ -86,12 +93,15 @@ namespace bbtk
   //======================================================================
   void BlackBoxOutputConnector::UnsetConnection(Connection* c)
   {
-    bbtkDebugMessageInc("Kernel",9,"BlackBoxOutputConnector::UnsetConnection("
+    bbtkDebugMessage("kernel",9,"["<<mBox.lock()->bbGetName()
+                    <<"] BlackBoxOutputConnector::UnsetConnection("
                     <<c<<")"<<std::endl);
 
     if (!c) 
       {
-       bbtkInternalError("BlackBoxOutputConnector::UnsetConnection("<<c<<") : invalid connection");
+       bbtkInternalError(mBox.lock()->bbGetFullName()
+                         <<": BlackBoxOutputConnector::UnsetConnection("
+                         <<c<<") : invalid connection");
 
       }
     //    c->Check();
@@ -106,12 +116,15 @@ namespace bbtk
       }
     if (i==mConnection.end())
       {
-       bbtkInternalError("BlackBoxOutputConnector::UnsetConnection("<<c<<") : connection is absent from connections list");
+       bbtkInternalError(mBox.lock()->bbGetFullName()
+                         <<": BlackBoxOutputConnector::UnsetConnection("
+                         <<c
+                         <<") : connection is absent from connections list");
       }
     mConnection.erase(i);
     //    RemoveChangeObserver(boost::bind(&Connection::SignalChange,c));
 
-    bbtkDebugDecTab("Kernel",9);
+
   }
   //======================================================================
 
@@ -124,20 +137,20 @@ namespace bbtk
     //if (s==UPTODATE) s=MODIFIED;
     
     bbtkDebugMessage("change",2,
-                    "==> BlackBoxOutputConnector::SignalChange("
-                    <<box->bbGetFullName()<<",'"
+                    "["<<box->bbGetName()
+                    <<"] ==> BlackBoxOutputConnector::SignalChange('"
                     <<output<<"','"<<GetIOStatusString(s)<<"') ["
                     <<this<<"]"
                     <<std::endl);
     
     //    std::cout<<"BlackBoxOutputConnector::SignalChange("
-    //      <<box->bbGetFullName()<<",'"
+    //      <<box->bbGetName()<<",'"
     //      <<output<<"')"<<std::endl;
     mChangeSignal(box,output,s);
     
     bbtkDebugMessage("change",2,
-                    "<== BlackBoxOutputConnector::SignalChange("
-                    <<box->bbGetFullName()<<",'"
+                    "["<<box->bbGetName()
+                    <<"] <== BlackBoxOutputConnector::SignalChange('"
                     <<output<<"','"<<GetIOStatusString(s)<<"') ["
                     <<this<<"]"
                     <<std::endl);