X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkBlackBox.cxx;h=7955ccfc4ab4a0b1b77f13ae4246c6675c870d3c;hb=6ea571ab3b7a539aaaca066db3941f5017920209;hp=3aa696ab482be13d0e63864a488278ebcd596192;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkBlackBox.cxx b/kernel/src/bbtkBlackBox.cxx
index 3aa696a..7955ccf 100644
--- a/kernel/src/bbtkBlackBox.cxx
+++ b/kernel/src/bbtkBlackBox.cxx
@@ -3,8 +3,8 @@
 Program:   bbtk
 Module:    $RCSfile: bbtkBlackBox.cxx,v $
 Language:  C++
-Date:      $Date: 2008/01/22 15:02:00 $
-Version:   $Revision: 1.1 $
+Date:      $Date: 2008/02/20 16:05:38 $
+Version:   $Revision: 1.5 $
                                                                                 
 Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
 l'Image). All rights reserved. See doc/license.txt or
@@ -40,7 +40,7 @@ namespace bbtk
     : bbmName(name), bbmStatus(MODIFIED), 
       bbmBoxProcessMode("Pipeline"),bbmParent(NULL)
   {
-    bbtkDebugMessage("Core",7,"BlackBox::BlackBox(\""
+    bbtkDebugMessage("Kernel",7,"BlackBox::BlackBox(\""
 		     <<name<<"\")"<<std::endl);
   }
   //=========================================================================
@@ -52,7 +52,7 @@ namespace bbtk
       bbmStatus(from.bbmStatus), 
       bbmBoxProcessMode(from.bbmBoxProcessMode),bbmParent(NULL)
   {
-    bbtkDebugMessage("Core",7,"BlackBox::BlackBox("
+    bbtkDebugMessage("Kernel",7,"BlackBox::BlackBox("
 		     <<from.bbGetFullName()<<",\""
 		     <<name<<"\")"<<std::endl);
   }
@@ -63,10 +63,10 @@ namespace bbtk
   BlackBox::~BlackBox()
   {
     //    std::cout << "EED BlackBox::~BlackBox 01 [" << bbGetName()<<"]\n";
-    bbtkDebugMessageInc("Core",7,"BlackBox::~BlackBox()"<<std::endl);
+    bbtkDebugMessageInc("Kernel",7,"BlackBox::~BlackBox()"<<std::endl);
     this->bbDesallocateConnectors();
     //printf("EED BlackBox::~BlackBox 02 \n");
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -74,7 +74,7 @@ namespace bbtk
   /// Destruction method of a black box
   void BlackBox::bbDelete()
   {
-    bbtkDebugMessage("Core",5,"BlackBox::bbDelete() ["
+    bbtkDebugMessage("Kernel",5,"BlackBox::bbDelete() ["
 		     <<bbGetFullName()<<"]"<<std::endl);    
     this->bbUserDelete();
   }
@@ -89,7 +89,7 @@ namespace bbtk
 			"=> BlackBox::bbExecute() ["
 			<<bbGetFullName()<<"]"<<std::endl);
 
-    wx::BeginBusyCursor();
+    Wx::BeginBusyCursor();
 
     // If execution frozen : return
     if (bbGlobalGetFreezeExecution()) 
@@ -104,7 +104,7 @@ namespace bbtk
     // Calls the main recursive update method 
     bbBackwardUpdate(0);
 
-    wx::EndBusyCursor();
+    Wx::EndBusyCursor();
 
     bbtkDebugMessageDec("Process",1,
 			"<= BlackBox::bbExecute() ["
@@ -149,13 +149,13 @@ namespace bbtk
   /// Returns true if the UserBlackBox has an input of name name
   bool BlackBox::bbHasInput(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbHasInput(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"
 			<<std::endl);
     bool r = ( bbGetDescriptor()->GetInputDescriptorMap().find(name)
 	       != bbGetDescriptor()->GetInputDescriptorMap().end());
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -165,11 +165,11 @@ namespace bbtk
   /// Returns true if the UserBlackBox has an output of name name
   bool BlackBox::bbHasOutput(const std::string& name) const
   {
-    bbtkDebugMessageInc("Core",8,"BlackBox::bbHasOutput(\""
+    bbtkDebugMessageInc("Kernel",8,"BlackBox::bbHasOutput(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     bool r = ( bbGetDescriptor()->GetOutputDescriptorMap().find(name)
 	       != bbGetDescriptor()->GetOutputDescriptorMap().end());
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -179,11 +179,11 @@ namespace bbtk
   ///  Gets the output type of a given name
   TypeInfo BlackBox::bbGetOutputType( const std::string &name ) const 
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbGetOutputType(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     TypeInfo r = bbGetDescriptor()->GetOutputDescriptor(name)->GetTypeInfo();
-    bbtkDebugDecTab("Core",8); 
+    bbtkDebugDecTab("Kernel",8); 
     return r;
   }
   //=========================================================================
@@ -192,11 +192,11 @@ namespace bbtk
   ///  Gets the input type of a given name
   TypeInfo BlackBox::bbGetInputType( const std::string &name ) const
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbGetInputType(\""
 			<<name<<"\") ["<<bbGetFullName()<<"]"<<std::endl);
     TypeInfo r = bbGetDescriptor()->GetInputDescriptor(name)->GetTypeInfo();
-    bbtkDebugDecTab("Core",8);
+    bbtkDebugDecTab("Kernel",8);
     return r;
   }
   //=========================================================================
@@ -206,7 +206,7 @@ namespace bbtk
   /// Allocates the i/o connectors of the black box
   void BlackBox::bbAllocateConnectors()
   {  
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbAllocateConnectors() ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);					
@@ -215,7 +215,7 @@ namespace bbtk
     BlackBoxDescriptor::InputDescriptorMapType::const_iterator i;	
     for ( i = imap.begin(); i != imap.end(); ++i )			
       {									
-	bbtkDebugMessage("Core",8,"* Allocate \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<i->first<<"\""<<std::endl);
 	bbGetInputConnectorMap()[i->second->GetName()] 
 	  = new BlackBoxInputConnector(this);
       }									
@@ -224,11 +224,11 @@ namespace bbtk
     BlackBoxDescriptor::OutputDescriptorMapType::const_iterator o; 
     for ( o = omap.begin(); o != omap.end(); ++o )
       {							
-	bbtkDebugMessage("Core",8,"* Allocate \""<<o->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Allocate \""<<o->first<<"\""<<std::endl);
 	bbGetOutputConnectorMap()[o->second->GetName()] 
 	  = new BlackBoxOutputConnector();
       }
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
   }
   //=========================================================================
 
@@ -237,7 +237,7 @@ namespace bbtk
   /// Desallocates the i/o connectors of the black box
   void BlackBox::bbDesallocateConnectors()
   {
-    bbtkDebugMessageInc("Core",8,
+    bbtkDebugMessageInc("Kernel",8,
 			"BlackBox::bbDesallocateConnectors()"
 			<<std::endl);					
 
@@ -245,18 +245,18 @@ namespace bbtk
     for ( i = bbGetInputConnectorMap().begin();
 	  i != bbGetInputConnectorMap().end(); ++i )		       
       {									
-	bbtkDebugMessage("Core",8,"* Delete \""<<i->first<<"\""<<std::endl);
+	bbtkDebugMessage("Kernel",8,"* Delete \""<<i->first<<"\""<<std::endl);
 	delete (i->second);
       }									
     OutputConnectorMapType::const_iterator o;	
     for ( o = bbGetOutputConnectorMap().begin(); 
 	  o != bbGetOutputConnectorMap().end(); ++o )			
       {									
-	bbtkDebugMessage("Core",8,"* Delete \""<<o->first<<"\""<<std::endl);	       
+	bbtkDebugMessage("Kernel",8,"* Delete \""<<o->first<<"\""<<std::endl);	       
 	delete (o->second);
       }									
    
-    bbtkDebugDecTab("Core",8);  
+    bbtkDebugDecTab("Kernel",8);  
 
   }
   //=========================================================================
@@ -266,7 +266,7 @@ namespace bbtk
   /// Copies the input / output values from another box
   void BlackBox::bbCopyIOValues(BlackBox& from)
   {
-    bbtkDebugMessageInc("Core",9,
+    bbtkDebugMessageInc("Kernel",9,
     			"BlackBox::bbCopyIOValues("
 			<<from.bbGetFullName()<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);
@@ -291,7 +291,7 @@ namespace bbtk
 	this->bbSetOutput(output, from.bbGetOutput(output) );
       }
 
-    bbtkDebugDecTab("Core",9);
+    bbtkDebugDecTab("Kernel",9);
 
   }
   //=========================================================================
@@ -303,7 +303,7 @@ namespace bbtk
   { 
     return ( bbGlobalGetSomeBoxExecuting() 
 #ifdef _USE_WXWIDGETS_
-	     || WxBlackBox::bbGlobalIsSomeWindowAlive() 
+	     || Wx::IsSomeWindowAlive() 
 #endif
 	     ); 
   }
@@ -465,10 +465,10 @@ namespace bbtk
       }
   if (reaction) bbGlobalProcessExecutionList();
 
-    bbtkDebugMessageDec("Process",5,
-			"<= BlackBox::bbSignalOutputModification("
-			<<output<<") ["
-			<<bbGetFullName()<<"]"<<std::endl);
+  bbtkDebugMessageDec("Process",5,
+                      "<= BlackBox::bbSignalOutputModification("
+                      <<output<<") ["
+                      <<bbGetFullName()<<"]"<<std::endl);
 
   }  
   //=========================================================================   
@@ -520,7 +520,7 @@ namespace bbtk
 			<<std::endl);	
 
     IOStatus s = UPTODATE;
-    
+
     InputConnectorMapType::iterator i;
     for ( i = bbGetInputConnectorMap().begin(); 
 	  i!= bbGetInputConnectorMap().end(); ++i) 
@@ -551,7 +551,7 @@ namespace bbtk
   /// Connects the input <name> to the connection c
   void BlackBox::bbConnectInput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbConnectInput(\""<<name<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"
 			<<std::endl);       
@@ -564,7 +564,7 @@ namespace bbtk
     
     //  bbSetModifiedStatus();
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -573,7 +573,7 @@ namespace bbtk
   /// Connects the output <name> to the connection c
   void BlackBox::bbConnectOutput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbConnectOutput(\""<<name<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"<<std::endl);       
 
@@ -584,7 +584,7 @@ namespace bbtk
       }
     i->second->SetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -593,7 +593,7 @@ namespace bbtk
   /// Disconnects the input <name> from the connection c
   void BlackBox::bbDisconnectInput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbDisconnectInput(\""<<name
 			<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"
@@ -606,7 +606,7 @@ namespace bbtk
       }
     i->second->UnsetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   }
   //=========================================================================
 
@@ -615,7 +615,7 @@ namespace bbtk
   /// Disconnects the output <name> from the connection c
   void BlackBox::bbDisconnectOutput( const std::string& name, Connection* c)
   {
-    bbtkDebugMessageInc("Core",7,
+    bbtkDebugMessageInc("Kernel",7,
 			"BlackBox::bbDisconnectOutput(\""<<name
 			<<"\","<<c<<") ["
 			<<bbGetFullName()<<"]"
@@ -628,7 +628,7 @@ namespace bbtk
       }
     i->second->UnsetConnection(c);
 
-    bbtkDebugDecTab("Core",7);
+    bbtkDebugDecTab("Kernel",7);
   } 
   //=========================================================================
  
@@ -758,17 +758,19 @@ namespace bbtk
 					bool instanceOrtype,
 					bool relative_link )
 
-  {
+  { 
     InputConnectorMapType::iterator i;
     // label
     std::string labelStr;
     std::string valueStr("");
-    if (detail==0)
-      {
-	labelStr = bbGetName() ; 
-      } else {
-      labelStr = bbGetName();
-      labelStr = labelStr + "   [" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]  ";
+
+	if (detail==0) {
+		labelStr = bbGetName() ; 
+//EED 18 Fev 2008
+		labelStr = labelStr + "\\n[" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]";
+	} else {
+		labelStr = bbGetName();
+		labelStr = labelStr + "   [" +this->bbGetDescriptor()->GetPackage()->GetName()+"::"+ bbGetTypeName() + "]  ";
     }
 
     SubsBrackets(labelStr);