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

diff --git a/kernel/src/bbtkBlackBoxOutputConnector.cxx b/kernel/src/bbtkBlackBoxOutputConnector.cxx
index af6bf5f..b09f262 100644
--- a/kernel/src/bbtkBlackBoxOutputConnector.cxx
+++ b/kernel/src/bbtkBlackBoxOutputConnector.cxx
@@ -1,21 +1,34 @@
-/*=========================================================================
-                                                                                
+/*=========================================================================                                                                               
   Program:   bbtk
   Module:    $RCSfile: bbtkBlackBoxOutputConnector.cxx,v $
   Language:  C++
-  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
-  http://www.creatis.insa-lyon.fr/Public/bbtk/License.html for details.
-                                                                                
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notices for more information.
-                                                                                
+  Date:      $Date: 2008/10/17 08:18:12 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
+/* ---------------------------------------------------------------------
+
+* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
+* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
+*
+*  This software is governed by the CeCILL-B license under French law and 
+*  abiding by the rules of distribution of free software. You can  use, 
+*  modify and/ or redistribute the software under the terms of the CeCILL-B 
+*  license as circulated by CEA, CNRS and INRIA at the following URL 
+*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
+*  or in the file LICENSE.txt.
+*
+*  As a counterpart to the access to the source code and  rights to copy,
+*  modify and redistribute granted by the license, users are provided only
+*  with a limited warranty  and the software's author,  the holder of the
+*  economic rights,  and the successive licensors  have only  limited
+*  liability. 
+*
+*  The fact that you are presently reading this means that you have had
+*  knowledge of the CeCILL-B license and that you accept its terms.
+* ------------------------------------------------------------------------ */                                                                         
+
+
 /**
  *  \file 
  *  \brief Class bbtk::BlackBoxOutputConnector : 
@@ -40,18 +53,21 @@ namespace bbtk
     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);
   }
 
   ///
-  void BlackBoxOutputConnector::SetConnection(Connection::Pointer c)
+  void BlackBoxOutputConnector::SetConnection(Connection* c)
   {
     bbtkDebugMessage("Kernel",9,"BlackBoxOutputConnector::SetConnection("
 		     <<c<<")"<<std::endl);
@@ -61,7 +77,7 @@ namespace bbtk
 
 
   ///
-  void BlackBoxOutputConnector::UnsetConnection(Connection::Pointer c)
+  void BlackBoxOutputConnector::UnsetConnection(Connection* c)
   {
     bbtkDebugMessageInc("Kernel",9,"BlackBoxOutputConnector::UnsetConnection("
 		     <<c<<")"<<std::endl);
@@ -74,12 +90,12 @@ namespace bbtk
     //    c->Check();
     //Connection::WeakPointer w(c);
     ConnectionVector::iterator i;
-    //      = find(mConnection.begin(),mConnection.end(),c);
+    //  = find(mConnection.begin(),mConnection.end(),c);
     for (i=mConnection.begin();
 	 i!=mConnection.end();
 	 ++i)
       {
-	if (i->lock()==c) break;
+	if (*i==c) break;
       }
     if (i==mConnection.end())
       {
@@ -94,16 +110,16 @@ namespace bbtk
   
   void BlackBoxOutputConnector::SetModifiedStatus()
   {
-    bbtkDebugMessageInc("Process",5,
-			"BlackBoxOutputConnector::SetModifiedStatus()"
-			<<std::endl);
+    bbtkDebugMessage("modified",2,
+		     "==> BlackBoxOutputConnector::SetModifiedStatus() ["
+		     <<this<<"]"
+		     <<std::endl);
     ConnectionVector::iterator i;
     for (i=mConnection.begin();i!=mConnection.end();++i) 
       {
-	(*i).lock()->SetModifiedStatus();
+	(*i)->SetModifiedStatus();
       }
     
-    bbtkDebugDecTab("Process",5);
     
    }