]> Creatis software - bbtk.git/commitdiff
*** empty log message ***
authorguigues <guigues>
Thu, 24 Apr 2008 10:24:58 +0000 (10:24 +0000)
committerguigues <guigues>
Thu, 24 Apr 2008 10:24:58 +0000 (10:24 +0000)
kernel/src/bbtkAtomicBlackBoxMacros.h
kernel/src/bbtkComplexBlackBox.cxx
kernel/src/bbtkWxBlackBox.h

index df08807f69fd3288d441505560551ec9df4594b2..ff2d034d70a85c98b1c9583523986b6f2ef89d7c 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 10:11:27 $
-  Version:   $Revision: 1.6 $
+  Date:      $Date: 2008/04/24 10:24:58 $
+  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
@@ -79,7 +79,7 @@
     bbtkDebugMessage("process",1,"**> Processing ["<<bbGetFullName()   \
                     <<"]"<<std::endl);                                 \
     CALLBACK();                                                                \
-    bbtkDebugMessage("process",1,"<** Processing ["<<bbGetFullName()   \
+    bbtkDebugMessage("process",2,"<** Processing ["<<bbGetFullName()   \
                     <<"]"<<std::endl);                                 \
   }
 //============================================================================
index 3a9c3c0e1e02d376352e79366634aa334234bb67..c06e715270299414e754be1022d8947c1075cc8b 100644 (file)
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkComplexBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/04/24 10:11:28 $
-Version:   $Revision: 1.17 $
+Date:      $Date: 2008/04/24 10:24:58 $
+Version:   $Revision: 1.18 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See Doc/License.txt or
@@ -79,13 +79,17 @@ namespace bbtk
                        <<from.bbGetName()<<"\",\""
                        <<name<<"\")"<<std::endl);
     bbtkDebugMessage("object",4,"  * Cloning Black Boxes"<<std::endl);
+
+    // We have to make the shared_ptr on this because it is used 
+    // in bbUnsafeAddBlackBox !
+    MakePointer(this,true);
+
     BlackBoxMapType::const_iterator i;
     for ( i = from.mBlackBoxMap.begin(); i != from.mBlackBoxMap.end(); ++i ) 
       {
        bbtkDebugMessageInc("object",5,"    * Cloning \""<<i->first<<"\""<<std::endl);
        BlackBox::Pointer B = i->second->bbClone(i->second->bbGetName());
        bbUnsafeAddBlackBox(B);
-       
       }
    
     bbtkDebugMessage("object",4,"  * Cloning Connections"<<std::endl);
index f369b8b427b7826203495a1d42d6614a8d9f13bd..dd870f95b3663bb6259e631bbe167137c1fdbeae 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxBlackBox.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/24 10:11:28 $
-  Version:   $Revision: 1.14 $
+  Date:      $Date: 2008/04/24 10:24:58 $
+  Version:   $Revision: 1.15 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -206,7 +206,7 @@ namespace bbtk
     bbtkDebugMessageInc("process",1,"**> Creating widget for ["                \
                        <<bbGetFullName()<<"]"<<std::endl);             \
     CALLBACK();                                                                \
-    bbtkDebugMessageInc("process",1,"<** Creating widget for ["                \
+    bbtkDebugMessageInc("process",2,"<** Creating widget for ["                \
                        <<bbGetFullName()<<"]"<<std::endl);             \
   }