X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxOutputConnector.cxx;h=af6bf5f21ed88febf007ea7e523d198dcf525aa7;hb=4ad5b5ee44357ad873bc8c43230defb6d0a79879;hp=70352ff2aebd66d5cc9008e38697ae6bda6620ef;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx
index 70352ff..af6bf5f 100644
--- a/kernel/src/bbtkBlackBoxOutputConnector.cxx
+++ b/kernel/src/bbtkBlackBoxOutputConnector.cxx
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxOutputConnector.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/18 12:59:15 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -32,26 +32,28 @@ namespace bbtk
   BlackBoxOutputConnector::BlackBoxOutputConnector() 
   // : mStatus(MODIFIED)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxOutputConnector::BlackBoxOutputConnector()"<<std::endl);
+    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::BlackBoxOutputConnector()"<<std::endl);
   }
 
   BlackBoxOutputConnector::~BlackBoxOutputConnector() 
   {
-    bbtkDebugMessageInc("Core",9,
-			"BlackBoxOutputConnector::~BlackBoxOutputConnector()"
-			<<std::endl);
-    std::vector<Connection*>::iterator i;
-    for (i=mConnection.begin();i!=mConnection.end();++i) 
-      {
-	delete *i;
-      }
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugMessage("Kernel",9,
+		     "==> BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+		     <<std::endl);
+    ConnectionVector::iterator i;
+    for (i=mConnection.begin();
+	 i!=mConnection.end();
+	 ++i)
+      (*i) = Connection::WeakPointer();
+    bbtkDebugMessage("Kernel",9,
+		     "<== BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+		     <<std::endl);
   }
 
   ///
-  void BlackBoxOutputConnector::SetConnection(Connection* c)
+  void BlackBoxOutputConnector::SetConnection(Connection::Pointer c)
   {
-    bbtkDebugMessage("Core",9,"BlackBoxOutputConnector::SetConnection("
+    bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::SetConnection("
 		     <<c<<")"<<std::endl);
     mConnection.push_back(c);
   }
@@ -59,24 +61,33 @@ namespace bbtk
 
 
   ///
-  void BlackBoxOutputConnector::UnsetConnection(Connection* c)
+  void BlackBoxOutputConnector::UnsetConnection(Connection::Pointer c)
   {
-    bbtkDebugMessageInc("Core",9,"BlackBoxOutputConnector::UnsetConnection("
+    bbtkDebugMessageInc("Kernel",9,"BlackBoxOutputConnector::UnsetConnection("
 		     <<c<<")"<<std::endl);
 
-    std::vector<Connection*>::iterator i;
-    for (i=mConnection.begin();i!=mConnection.end();++i) 
+    if (!c) 
+      {
+	bbtkInternalError("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();
+	 ++i)
       {
-	if ( *i == c) break;
+	if (i->lock()==c) break;
       }
-    //= std::find(mConnection,c);
     if (i==mConnection.end())
       {
-	bbtkError("no connexion "<<c);
+	bbtkInternalError("BlackBoxOutputConnector::UnsetConnection("<<c<<") : connection is absent from connections list");
       }
     mConnection.erase(i);
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
   }
 
 
@@ -86,10 +97,10 @@ namespace bbtk
     bbtkDebugMessageInc("Process",5,
 			"BlackBoxOutputConnector::SetModifiedStatus()"
 			<<std::endl);
-    std::vector<Connection*>::iterator i;
+    ConnectionVector::iterator i;
     for (i=mConnection.begin();i!=mConnection.end();++i) 
       {
-	(*i)->SetModifiedStatus();
+	(*i).lock()->SetModifiedStatus();
       }
     
     bbtkDebugDecTab("Process",5);