X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBoxOutputConnector.cxx;h=cdc8f3335f8e38b2aaacc680e4399f51bf5146ca;hb=9d5a41aa77e7749118fc4885f7b26ea25bd90629;hp=7535b352eae06e19751cb6fef8c47d4d096d6f24;hpb=71376d8384d5d21b5c56d36ecc8cbf31315c039a;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx
index 7535b35..cdc8f33 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/02/05 13:23:46 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/04/24 10:11:28 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -37,15 +37,20 @@ namespace bbtk
 
   BlackBoxOutputConnector::~BlackBoxOutputConnector() 
   {
-    bbtkDebugMessageInc("Kernel",9,
-			"BlackBoxOutputConnector::~BlackBoxOutputConnector()"
-			<<std::endl);
-    std::vector<Connection*>::iterator i;
-    for (i=mConnection.begin();i!=mConnection.end();++i) 
-      {
-	delete *i;
-      }
-    bbtkDebugDecTab("Kernel",9);
+    bbtkDebugMessage("Kernel",9,
+		     "==> BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+		     <<std::endl);
+    /*
+    ConnectionVector::iterator i;
+    for (i=mConnection.begin();
+	 i!=mConnection.end();
+	 ++i)
+      (*i) = Connection::WeakPointer();
+    */
+    mConnection.clear();
+    bbtkDebugMessage("Kernel",9,
+		     "<== BlackBoxOutputConnector::~BlackBoxOutputConnector()"
+		     <<std::endl);
   }
 
   ///
@@ -64,15 +69,24 @@ namespace bbtk
     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==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);
 
@@ -83,16 +97,16 @@ namespace bbtk
   
   void BlackBoxOutputConnector::SetModifiedStatus()
   {
-    bbtkDebugMessageInc("Process",5,
-			"BlackBoxOutputConnector::SetModifiedStatus()"
-			<<std::endl);
-    std::vector<Connection*>::iterator i;
+    bbtkDebugMessage("modified",2,
+		     "==> BlackBoxOutputConnector::SetModifiedStatus() ["
+		     <<this<<"]"
+		     <<std::endl);
+    ConnectionVector::iterator i;
     for (i=mConnection.begin();i!=mConnection.end();++i) 
       {
 	(*i)->SetModifiedStatus();
       }
     
-    bbtkDebugDecTab("Process",5);
     
    }