Fixed Window deletion mechanism

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

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index de6d2b70922fe06ff02e89c24ae5c258c1950ff8..a56659c030cb2b2572bd4dfe8fbe49544efa6401 100644 (file)
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/30 15:22:51 $
-  Version:   $Revision: 1.19 $
+  Date:      $Date: 2009/05/28 08:12:05 $
+  Version:   $Revision: 1.20 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -39,6 +39,11 @@
 #include "bbtkMessageManager.h"
 #include "bbtkUtilities.h"
 
+#define bbtkDMessage(key,level,mess) \
+  bbtkMessage(key,level,"["<<GetFullTypeName()<<"] "<<mess)
+#define bbtkDDebugMessage(key,level,mess)      \
+  bbtkDebugMessage(key,level,"["<<GetFullTypeName()<<"] "<<mess)
+
 namespace bbtk
 {
    //=======================================================================
@@ -58,13 +63,13 @@ namespace bbtk
   /// Default ctor
   ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(const std::string& name)
   {
-    bbtkDebugMessage("object",2,"==> ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
+    bbtkDDebugMessage("object",2,"==> ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
     SetTypeName(name);
     AddToCategory("complex box");
     mPrototype = ComplexBlackBox::New(name+std::string("Prototype"),
                                      MakePointer(this,true));
     mPrototype->SetAsPrototype();
-    bbtkDebugMessage("object",2,"<== ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
+    bbtkDDebugMessage("object",2,"<== ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
   }
   //=======================================================================
 
@@ -74,10 +79,9 @@ namespace bbtk
   /// Default dtor
   ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor()
   {
-    bbtkDebugMessage("object",2,"==> ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
-    //    mPrototype->Delete();
+    bbtkDDebugMessage("object",2,"==> ~ComplexBlackBoxDescriptor()"<<std::endl);
     mPrototype.reset();
-    bbtkDebugMessage("object",2,"<== ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
+    bbtkDDebugMessage("object",2,"<== ~ComplexBlackBoxDescriptor()"<<std::endl);
   }
   //=======================================================================
 
@@ -94,14 +98,14 @@ namespace bbtk
   BlackBox::Pointer 
   ComplexBlackBoxDescriptor::NewBlackBox(const std::string& name)
   {
-    bbtkDebugMessageInc("Kernel",5,
-                       "ComplexBlackBoxDescriptor::NewBlackBox(\""
-                       <<name<<"\") ["
-                       <<GetTypeName()<<"]"<<std::endl);
+    bbtkDDebugMessage("kernel",5,
+                     "ComplexBlackBoxDescriptor::NewBlackBox(\""
+                     <<name<<"\")"
+                     <<std::endl);
     
     return mPrototype->bbClone(name);
 
-    bbtkDebugDecTab("Kernel",5);
+
   }
   //=======================================================================
 
@@ -120,10 +124,10 @@ namespace bbtk
                                        const std::string& name
                                        )
   {
-    bbtkDebugMessageInc("Kernel",5,
+    bbtkDDebugMessage("kernel",5,
                        "ComplexBlackBoxDescriptor::Add(\""
-                       <<type<<"\",\""<<name<<"\") ["
-                       <<GetTypeName()<<"]"<<std::endl);
+                       <<type<<"\",\""<<name<<"\")"
+                       <<std::endl);
     
     // 
     if (!GetFactory()) 
@@ -139,7 +143,7 @@ namespace bbtk
     // ok : create new one
     mPrototype->bbAddBlackBox ( GetFactory()->NewBlackBox(type,name) );
 
-    bbtkDebugDecTab("Kernel",5);
+
   }
   //=======================================================================
   
@@ -157,10 +161,10 @@ namespace bbtk
   /// Adds a black box to the execution list 
   void ComplexBlackBoxDescriptor::AddToExecutionList ( const std::string& box)
   {
-    bbtkDebugMessageInc("Kernel",5,
-                       "ComplexBlackBoxDescriptor::AddToExecutionList(\""
-                       <<box<<"\" ["
-                       <<GetTypeName()<<"]"<<std::endl);
+    bbtkDDebugMessage("kernel",5,
+                     "ComplexBlackBoxDescriptor::AddToExecutionList(\""
+                     <<box<<"\""
+                     <<std::endl);
     // Verify that the box exists
     BlackBox::Pointer b = mPrototype->bbUnsafeGetBlackBox( box ); 
     if ( !b ) 
@@ -170,7 +174,7 @@ namespace bbtk
     // ok 
     mPrototype->bbAddToExecutionList ( box  );
 
-    bbtkDebugDecTab("Kernel",5);
+
     }
 
 
@@ -182,12 +186,12 @@ namespace bbtk
                                            const std::string& input
                                            )
   {
-    bbtkDebugMessageInc("Kernel",5,
+    bbtkDDebugMessage("kernel",5,
                        "ComplexBlackBoxDescriptor::Connect(\""
                        <<from<<"\",\""<<output<<"\",\""
                        <<to<<"\",\""<<input
-                       <<"\") ["
-                       <<GetTypeName()<<"]"<<std::endl);
+                       <<"\")"
+                       <<std::endl);
   // 
     if (!GetFactory()) 
       { 
@@ -212,7 +216,7 @@ namespace bbtk
 
     mPrototype->bbAddConnection(c);
 
-    bbtkDebugDecTab("Kernel",5);
+
   }
   //=======================================================================
 
@@ -224,12 +228,12 @@ namespace bbtk
                                                const std::string& input,
                                                const std::string& help)
   {
-    bbtkDebugMessageInc("Kernel",5,
+    bbtkDDebugMessage("kernel",5,
                        "ComplexBlackBoxDescriptor::DefineInput(\""
                        <<name<<"\",\""<<box<<"\",\""
                        <<input<<"\",\""<<help
-                       <<"\") ["
-                       <<GetTypeName()<<"]"<<std::endl);
+                       <<"\")"
+                       <<std::endl);
 
     BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box );
     if ( !bb ) 
@@ -255,7 +259,7 @@ namespace bbtk
                           d->GetTypeInfo()));
     
     
-    bbtkDebugDecTab("Kernel",5);
+
   }
   //=======================================================================
 
@@ -266,12 +270,12 @@ namespace bbtk
                                                 const std::string& output,
                                                 const std::string& help)
   {
-    bbtkDebugMessageInc("Kernel",5,
+    bbtkDDebugMessage("kernel",5,
                        "ComplexBlackBoxDescriptor::DefineOutput(\""
                        <<name<<"\",\""<<box<<"\",\""
                        <<output<<"\",\""<<help
-                       <<"\") ["
-                       <<GetTypeName()<<"]"<<std::endl);
+                       <<"\")"
+                       <<std::endl);
 
     BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box );
     if ( !bb ) 
@@ -297,7 +301,7 @@ namespace bbtk
                            d->GetTypeInfo()));
     
     
-    bbtkDebugDecTab("Kernel",5);
+
   }
   //=======================================================================
 
@@ -327,9 +331,9 @@ namespace bbtk
                                                   int detail, int level,
                                                   const std::string& output_dir, bool relative_link)
   {
-    bbtkDebugMessageInc("Kernel",9,
-                       "ComplexBlackBoxDescriptor::InsertHtmlHelp() ["
-                       <<GetTypeName()<<"]"<<std::endl);
+    bbtkDDebugMessage("kernel",9,
+                     "ComplexBlackBoxDescriptor::InsertHtmlHelp()"
+                      <<std::endl);
     
     //-------------
     // General info 
@@ -495,7 +499,7 @@ namespace bbtk
     //------------
     // End
 
-    bbtkDebugDecTab("Kernel",9);
+
    }
   //=========================================================================
  
@@ -503,16 +507,16 @@ namespace bbtk
   //=======================================================================
   void ComplexBlackBoxDescriptor::GetHelp(bool full) const
   {
-    if (full) bbtkMessage("Help",1,"Complex Black Box <"<<
+    if (full) bbtkMessage("help",1,"Complex Black Box <"<<
                          GetPackage()->GetName()<<"::"
                          <<GetTypeName()<<">"<<std::endl);
-    bbtkMessage("Help",1," "                << GetDescription() <<std::endl);
-    bbtkMessage("Help",1," By : "           << GetAuthor()      <<std::endl);
-    bbtkMessage("Help",1," Category(s) : "  << GetCategory()     <<std::endl);    
+    bbtkMessage("help",1," "                << GetDescription() <<std::endl);
+    bbtkMessage("help",1," By : "           << GetAuthor()      <<std::endl);
+    bbtkMessage("help",1," Category(s) : "  << GetCategory()     <<std::endl);    
     if (mInput.size()) 
-      bbtkMessage("Help",1," * Inputs : "<<std::endl);
+      bbtkMessage("help",1," * Inputs : "<<std::endl);
     else 
-      bbtkMessage("Help",1," * No inputs"<<std::endl);
+      bbtkMessage("help",1," * No inputs"<<std::endl);
     InputDescriptorMapType::const_iterator i;
     unsigned int namelmax = 0;
     unsigned int typelmax = 0;
@@ -552,7 +556,7 @@ namespace bbtk
           std::string nature(i->second->GetNature());
           nature += "]";
           nature.append(1+natlmax-nature.size(),' ');
-          bbtkMessage("Help",1,
+          bbtkMessage("help",1,
                       "    '"<<name
                       <<" <"<<type
                       <<" ["<<nature
@@ -561,9 +565,9 @@ namespace bbtk
     if (full) 
     {
           if (mOutput.size()) 
-            bbtkMessage("Help",1," * Outputs : "<<std::endl);
+            bbtkMessage("help",1," * Outputs : "<<std::endl);
           else 
-            bbtkMessage("Help",1," * No outputs"<<std::endl);
+            bbtkMessage("help",1," * No outputs"<<std::endl);
           for ( o = mOutput.begin();  o != mOutput.end(); ++o ) 
           {
             std::string name(o->second->GetName());
@@ -575,7 +579,7 @@ namespace bbtk
             std::string nature(o->second->GetNature());
             nature += "]";
             nature.append(1+natlmax-nature.size(),' ');
-            bbtkMessage("Help",1,
+            bbtkMessage("help",1,
                       "    '"<<name
                         <<" <"<<type
                         <<" ["<<nature
@@ -587,14 +591,14 @@ namespace bbtk
           const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
        
           if (B.size()) 
-            bbtkMessage("Help",1," * Boxes : "<<std::endl);
+            bbtkMessage("help",1," * Boxes : "<<std::endl);
           else 
-            bbtkMessage("Help",1," * No boxes"<<std::endl);
+            bbtkMessage("help",1," * No boxes"<<std::endl);
        
           ComplexBlackBox::BlackBoxMapType::const_iterator b;
           for ( b = B.begin(); b != B.end(); ++b ) 
           {
-            bbtkMessage("Help",1,"    '"<<b->second->bbGetName()<<
+            bbtkMessage("help",1,"    '"<<b->second->bbGetName()<<
                         "' <"
                         << b->second->bbGetDescriptor()->GetPackage()->GetName() 
                         <<"::"