Fixed Window deletion mechanism

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

diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx
index bf354ab3e909da3bdeb9d43e37a8a52e2b7029d8..49dbcac191bea0843a08671c5a5cd8b25cf4ef4e 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBox.cxx
+++ b/kernel/src/bbtkAtomicBlackBox.cxx
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBox.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/12/11 09:50:34 $
-  Version:   $Revision: 1.12 $
+  Date:      $Date: 2009/05/28 08:12:05 $
+  Version:   $Revision: 1.13 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -42,11 +42,8 @@ namespace bbtk
   AtomicBlackBox::AtomicBlackBox(const std::string &name, bool alloc)
     : BlackBox(name)
   {
-    bbtkDebugMessage("object",3,
-                    "==> AtomicBlackBox::AtomicBlackBox(\""
-                    <<name<<"\")"<<std::endl);
-    bbtkDebugMessage("object",3,
-                    "<== AtomicBlackBox::AtomicBlackBox(\""
+    bbtkBlackBoxDebugMessage("object",3,
+                    "==> AtomicBlackBox(\""
                     <<name<<"\")"<<std::endl);
   }
   //========================================================================= 
@@ -58,15 +55,10 @@ namespace bbtk
                 bool alloc)
     : BlackBox(from,name)
   {
-    bbtkDebugMessage("object",3,
-                    "==>AtomicBlackBox::AtomicBlackBox("
-                    <<from.bbGetFullName()<<",\""
-                    <<name<<"\")"<<std::endl);
-    bbtkDebugMessage("object",3,
-                    "<==AtomicBlackBox::AtomicBlackBox("
-                    <<from.bbGetFullName()<<",\""
-                    <<name<<"\")"<<std::endl);
-    
+    bbtkBlackBoxDebugMessage("object",3,
+                            "==> AtomicBlackBox("
+                            <<from.bbGetFullName()<<",\""
+                            <<name<<"\")"<<std::endl);
   }
   //=========================================================================
   
@@ -75,9 +67,9 @@ namespace bbtk
   ///  Destructor
   AtomicBlackBox::~AtomicBlackBox()
   {
-    bbtkDebugMessage("object",3,"==> AtomicBlackBox::~AtomicBlackBox()"
+    bbtkBlackBoxDebugMessage("object",3,"==> ~AtomicBlackBox()"
                     <<std::endl);
-    bbtkDebugMessage("object",3,"<== AtomicBlackBox::~AtomicBlackBox()"
+    bbtkBlackBoxDebugMessage("object",3,"<== ~AtomicBlackBox()"
                     <<std::endl);
   } 
   //=========================================================================
@@ -88,15 +80,13 @@ namespace bbtk
   //=========================================================================
   Data AtomicBlackBox::bbGetOutput( const std::string &name )
   {
-    bbtkDebugMessageInc("Data",7,
-            "AtomicBlackBox::bbGetOutput(\""<<name<<"\") ["
-            <<bbGetFullName()<<"]"
-            <<std::endl);
+    bbtkBlackBoxDebugMessage("data",7,
+                            "AtomicBlackBox::bbGetOutput(\""<<name<<"\")"
+                            <<std::endl);
     
     Data p = ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()
-                ->GetOutputDescriptor(name))->GetGetFunctor()->Get(this);
+             ->GetOutputDescriptor(name))->GetGetFunctor()->Get(this);
     
-    bbtkDebugDecTab("Data",7);
     return p;
   }
   //=========================================================================
@@ -106,15 +96,13 @@ namespace bbtk
   ///  Gets the input Data of a given name
   Data AtomicBlackBox::bbGetInput( const std::string &name ) 
   {
-    bbtkDebugMessageInc("Data",7,
-            "AtomicBlackBox::bbGetInput(\""<<name<<"\") ["
-            <<bbGetFullName()<<"]"
-            <<std::endl);  
+    bbtkBlackBoxDebugMessage("data",7,
+                            "AtomicBlackBox::bbGetInput(\""<<name<<"\")"
+                            <<std::endl);  
     
     Data p = ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()
-                ->GetInputDescriptor(name))->GetGetFunctor()->Get(this);
+             ->GetInputDescriptor(name))->GetGetFunctor()->Get(this);
     
-    bbtkDebugDecTab("Data",7);
     return p;
   }
   //=========================================================================
@@ -124,9 +112,8 @@ namespace bbtk
   ///  Sets the data of the output called <name>
   void AtomicBlackBox::bbSetOutput( const std::string &name, Data data)
   {
-    bbtkDebugMessageInc("Data",7,
-            "AtomicBlackBox::bbSetOutput(\""<<name<<"\",data) ["
-            <<bbGetFullName()<<"]"
+    bbtkBlackBoxDebugMessage("data",7,
+            "AtomicBlackBox::bbSetOutput(\""<<name<<"\",data)"
             <<std::endl); 
     
     ((AtomicBlackBoxOutputDescriptor*)bbGetDescriptor()
@@ -143,9 +130,8 @@ namespace bbtk
                                  Data data, 
                                  bool setModified )
   {
-    bbtkDebugMessageInc("data",7,
-            "AtomicBlackBox::bbSetInput(\""<<name<<"\",data) ["
-            <<bbGetFullName()<<"]"
+    bbtkBlackBoxDebugMessage("data",7,
+            "AtomicBlackBox::bbSetInput(\""<<name<<"\",data)"
             <<std::endl);  
     ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()->GetInputDescriptor(name))->GetSetFunctor()->Set(this,data);
     
@@ -155,7 +141,6 @@ namespace bbtk
                                MODIFIED);
       }
     
-    bbtkDebugDecTab("data",7);
   }
   //=========================================================================
   
@@ -166,10 +151,9 @@ namespace bbtk
                                                   bool setModified
                                                   )
   {
-    bbtkDebugMessageInc("data",7,
+    bbtkBlackBoxDebugMessage("data",7,
             "AtomicBlackBox::bbBruteForceSetInputPointer(\""
-            <<name<<"\",data) ["
-            <<bbGetFullName()<<"]"
+            <<name<<"\",data)"
             <<std::endl);  
     ((AtomicBlackBoxInputDescriptor*)bbGetDescriptor()
         ->GetInputDescriptor(name))->GetSetFunctor()
@@ -181,7 +165,6 @@ namespace bbtk
                                MODIFIED);
       }
     
-    bbtkDebugDecTab("data",7);
   }
   //=========================================================================