X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBoxDescriptor.cxx;h=b79fed3e10f1a81d3f5456a91313da7bd09651d2;hb=03cc68dd6b831aa98e1e0fad20a977ffa074be39;hp=4d6b6e88533c1b74a84e978766b12cf5d6c40fe4;hpb=a26195c366a89795288009cf7e20f11afa494970;p=bbtk.git

diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
index 4d6b6e8..b79fed3 100644
--- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
+++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx
@@ -1,21 +1,41 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  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.
+ # ------------------------------------------------------------------------ */
+
+
 /*=========================================================================
-                                                                                
   Program:   bbtk
   Module:    $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $
   Language:  C++
-  Date:      $Date: 2008/01/22 15:02:00 $
-  Version:   $Revision: 1.1 $
-                                                                                
-  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: 2012/11/16 08:49:01 $
+  Version:   $Revision: 1.23 $
 =========================================================================*/
 
+                                                                    
+  
+
 /**
  *  \file 
  *  \brief Class bbtk::ComplexBlackBoxDescriptor : describes a ComplexBlackBox (constituents, connections) and is able to create an instance of it.
@@ -26,19 +46,38 @@
 #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
 {
-  
+   //=======================================================================
+  /// 
+  ComplexBlackBoxDescriptor::Pointer 
+  ComplexBlackBoxDescriptor::New(const std::string& name)
+  {
+    bbtkDebugMessage("object",1,"##> ComplexBlackBoxDescriptor::New(\""<<name<<"\")"<<std::endl);
+    ComplexBlackBoxDescriptor::Pointer p = 
+      MakePointer(new ComplexBlackBoxDescriptor(name));
+    bbtkDebugMessage("object",1,"<## ComplexBlackBoxDescriptor::New(\""<<name<<"\")"<<std::endl);
+    return p;
+  }
+  //=======================================================================
 
   //=======================================================================
   /// Default ctor
   ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(const std::string& name)
-    : BlackBoxDescriptor()
   {
-    bbtkDebugMessageInc("Core",9,"ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
+    bbtkDDebugMessage("object",2,"==> ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
+	SetTypeOfScript(TS_SCRIPT_COMPLEXBOX);
     SetTypeName(name);
-    mPrototype = new ComplexBlackBox(name+std::string("Prototype"),this);
-    bbtkDebugDecTab("Core",9);
+    AddToCategory("complex box");
+    mPrototype = ComplexBlackBox::New(name+std::string("Prototype"),
+				      MakePointer(this,true));
+    mPrototype->SetAsPrototype();
+    bbtkDDebugMessage("object",2,"<== ComplexBlackBoxDescriptor(\""<<name<<"\")"<<std::endl);
   }
   //=======================================================================
 
@@ -48,32 +87,44 @@ namespace bbtk
   /// Default dtor
   ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor()
   {
-    bbtkDebugMessageInc("Core",9,"ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<<GetTypeName()<<"\")"<<std::endl);
-
-    delete mPrototype;
-
-    bbtkDebugDecTab("Core",9);
+    bbtkDDebugMessage("object",2,"==> ~ComplexBlackBoxDescriptor()"<<std::endl);
+    mPrototype.reset();
+    bbtkDDebugMessage("object",2,"<== ~ComplexBlackBoxDescriptor()"<<std::endl);
   }
   //=======================================================================
 
+  //=========================================================================
+  /// Check
+  void ComplexBlackBoxDescriptor::Check(bool recursive) const
+  {
+    mPrototype->Check(recursive);
+  }
+  //=========================================================================
 
   //=======================================================================
   /// Creates an instance of name <name> of the ComplexBlackBox of which this is the descriptor 
-  BlackBox* ComplexBlackBoxDescriptor::CreateInstance(const std::string& name)
+  BlackBox::Pointer 
+  ComplexBlackBoxDescriptor::NewBlackBox(const std::string& name)
   {
-    //bbtkError("ComplexBlackBoxDescriptor::CreateInstance not implemented");
-    bbtkDebugMessageInc("Core",5,
-			"ComplexBlackBoxDescriptor::CreateInstance(\""
-			<<name<<"\") ["
-			<<GetTypeName()<<"]"<<std::endl);
+    bbtkDDebugMessage("kernel",5,
+		      "ComplexBlackBoxDescriptor::NewBlackBox(\""
+		      <<name<<"\")"
+		      <<std::endl);
     
     return mPrototype->bbClone(name);
 
-    bbtkDebugDecTab("Core",5);
+
   }
   //=======================================================================
 
-
+  /*
+  //=======================================================================
+  /// Release
+  void ComplexBlackBoxDescriptor::Release(bool release_package)
+  {
+  }
+  //=======================================================================
+  */
 
   //=======================================================================
   /// Adds a black box to the complex box
@@ -81,11 +132,16 @@ namespace bbtk
 					const std::string& name
 					)
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDDebugMessage("kernel",5,
 			"ComplexBlackBoxDescriptor::Add(\""
-			<<type<<"\",\""<<name<<"\") ["
-			<<GetTypeName()<<"]"<<std::endl);
+			<<type<<"\",\""<<name<<"\")"
+			<<std::endl);
     
+    // 
+    if (!GetFactory()) 
+      { 
+	bbtkError("ComplexBlackBoxDescriptor::Add : no factory set");
+      }
     
     // Verify that a box with the same name does not exist already
     if ( mPrototype->bbUnsafeGetBlackBox( name ) ) 
@@ -93,22 +149,32 @@ namespace bbtk
 	bbtkError("a black box \""<<name<<"\" already exists");
       }
     // ok : create new one
-    mPrototype->bbAddBlackBox ( /*mFactory->Create*/ NewBlackBox(type,name) );
+    mPrototype->bbAddBlackBox ( GetFactory()->NewBlackBox(type,name) );
+
 
-    bbtkDebugDecTab("Core",5);
+  }
+  //=======================================================================
+  
+  //=======================================================================
+  /// Removes a black box from the complex box
+  void ComplexBlackBoxDescriptor::Remove( const std::string& name, 
+					  bool remove_connections)
+  {    
+    mPrototype->bbRemoveBlackBox(name,remove_connections);
   }
   //=======================================================================
 
- //=======================================================================
+
+  //=======================================================================
   /// Adds a black box to the execution list 
   void ComplexBlackBoxDescriptor::AddToExecutionList ( const std::string& box)
   {
-    bbtkDebugMessageInc("Core",5,
-			"ComplexBlackBoxDescriptor::AddToExecutionList(\""
-			<<box<<"\" ["
-			<<GetTypeName()<<"]"<<std::endl);
+    bbtkDDebugMessage("kernel",5,
+		      "ComplexBlackBoxDescriptor::AddToExecutionList(\""
+		      <<box<<"\""
+		      <<std::endl);
     // Verify that the box exists
-    BlackBox* b = mPrototype->bbUnsafeGetBlackBox( box ); 
+    BlackBox::Pointer b = mPrototype->bbUnsafeGetBlackBox( box ); 
     if ( !b ) 
       {
 	bbtkError("the black box \""<<box<<"\" does not exist");
@@ -116,7 +182,7 @@ namespace bbtk
     // ok 
     mPrototype->bbAddToExecutionList ( box  );
 
-    bbtkDebugDecTab("Core",5);
+
     }
 
 
@@ -128,29 +194,37 @@ namespace bbtk
 					    const std::string& input
 					    )
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDDebugMessage("kernel",5,
 			"ComplexBlackBoxDescriptor::Connect(\""
 			<<from<<"\",\""<<output<<"\",\""
 			<<to<<"\",\""<<input
-			<<"\") ["
-			<<GetTypeName()<<"]"<<std::endl);
+			<<"\")"
+			<<std::endl);
+  // 
+    if (!GetFactory()) 
+      { 
+	bbtkError("ComplexBlackBoxDescriptor::Connect : no factory set");
+      }
+    
+
   // Verify that a box with the same name does not exist already
-    BlackBox* bbfrom = mPrototype->bbGetBlackBox( from );
+    BlackBox::Pointer bbfrom = mPrototype->bbGetBlackBox( from );
     if ( !bbfrom ) 
       {
 	bbtkError("the black box \""<<from<<"\" does not exist");
       }
-    BlackBox* bbto = mPrototype->bbGetBlackBox( to );
+    BlackBox::Pointer bbto = mPrototype->bbGetBlackBox( to );
     if ( !bbto ) 
       {
 	bbtkError("the black box \""<<to<<"\" does not exist");
       }
     
-    Connection* c = /*mFactory->*/ NewConnection( bbfrom, output, bbto, input );
+    Connection::Pointer c 
+      = GetFactory()->NewConnection( bbfrom, output, bbto, input );
 
     mPrototype->bbAddConnection(c);
 
-    bbtkDebugDecTab("Core",5);
+
   }
   //=======================================================================
 
@@ -162,14 +236,14 @@ namespace bbtk
 						const std::string& input,
 						const std::string& help)
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDDebugMessage("kernel",5,
 			"ComplexBlackBoxDescriptor::DefineInput(\""
 			<<name<<"\",\""<<box<<"\",\""
 			<<input<<"\",\""<<help
-			<<"\") ["
-			<<GetTypeName()<<"]"<<std::endl);
+			<<"\")"
+			<<std::endl);
 
-    BlackBox* bb = mPrototype->bbGetBlackBox( box );
+    BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box );
     if ( !bb ) 
       {
 	bbtkError("the black box \""<<box<<"\" does not exist");
@@ -181,14 +255,19 @@ namespace bbtk
 		  <<input<<"\"");
       }
     
-    AddInputDescriptor ( new ComplexBlackBoxInputDescriptor ( name,
-							      help,
-							      box,
-							      input,
-							      bb->bbGetInputType(input)));
-							     
+    const BlackBoxInputDescriptor* d = 
+      bb->bbGetDescriptor()->GetInputDescriptor(input);
+    AddInputDescriptor ( new ComplexBlackBoxInputDescriptor 
+			 ( typeid(ComplexBlackBoxDescriptor),
+			   name,
+			   help,
+			   d->GetNature(),
+			   box,
+			   input,
+			   d->GetTypeInfo()));
+    
     
-    bbtkDebugDecTab("Core",5);
+
   }
   //=======================================================================
 
@@ -199,14 +278,14 @@ namespace bbtk
 						 const std::string& output,
 						 const std::string& help)
   {
-    bbtkDebugMessageInc("Core",5,
+    bbtkDDebugMessage("kernel",5,
 			"ComplexBlackBoxDescriptor::DefineOutput(\""
 			<<name<<"\",\""<<box<<"\",\""
 			<<output<<"\",\""<<help
-			<<"\") ["
-			<<GetTypeName()<<"]"<<std::endl);
+			<<"\")"
+			<<std::endl);
 
-    BlackBox* bb = mPrototype->bbGetBlackBox( box );
+    BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box );
     if ( !bb ) 
       {
 	bbtkError("the black box \""<<box<<"\" does not exist");
@@ -218,15 +297,19 @@ namespace bbtk
 		  <<output<<"\"");
       }
     
+    const BlackBoxOutputDescriptor* d = 
+      bb->bbGetDescriptor()->GetOutputDescriptor(output);
     AddOutputDescriptor ( new ComplexBlackBoxOutputDescriptor 
-			  ( name,
+			  ( typeid(ComplexBlackBoxDescriptor),
+			    name,
 			    help,
+			    d->GetNature(),
 			    box,
 			    output,
-			    bb->bbGetOutputType(output)));
+			    d->GetTypeInfo()));
     
     
-    bbtkDebugDecTab("Core",5);
+
   }
   //=======================================================================
 
@@ -256,9 +339,9 @@ namespace bbtk
 						   int detail, int level,
 						   const std::string& output_dir, bool relative_link)
   {
-    bbtkDebugMessageInc("Core",9,
-			"ComplexBlackBoxDescriptor::InsertHtmlHelp() ["
-			<<GetTypeName()<<"]"<<std::endl);
+    bbtkDDebugMessage("kernel",9,
+		      "ComplexBlackBoxDescriptor::InsertHtmlHelp()"
+		       <<std::endl);
     
     //-------------
     // General info 
@@ -278,58 +361,77 @@ namespace bbtk
 
     std::string descr = GetDescription();
     //Utilities::html_format(descr);
+    
     std::string author = GetAuthor();
     Utilities::html_format(author);
     
+    std::vector<std::string> categories;
+    // Split the category string 
+    std::string delimiters = ";,";
+    Utilities::SplitString(GetCategory(),
+			   delimiters,categories);
+
+        
     (s) << "<p><TABLE cellspacing=0  cellpadding=3>\n";
     (s) << "<TR><TD style='vertical-align: top;'><b> Description </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> " 
-      << descr << "</TD></TR>\n";
+        << descr << "</TD></TR>\n";
+
     (s) << "<TR><TD style='vertical-align: top;'><b> Author(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  " 
-      << author << "</TD></TR>\n";
-     
+        << author << "</TD></TR>\n";
+
+    (s) << "<TR><TD style='vertical-align: top;'><b> Category(s) </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
+    std::vector<std::string>::iterator ci;
+    for (ci=categories.begin(); ci!=categories.end(); ++ci)
+      {
+        s << "<a href=\"../index-category.html#"<< *ci <<"\">" << *ci 
+	  << "</a>&nbsp;\n";
+      }
+    s << "</TD></TR>\n";      
     std::string inc = GetScriptFileName();
     if (inc.size()>0) 
       {
-    (s) << "<TR><TD style='vertical-align: top;'><b> Include </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  " 
-      << inc << "</TD></TR>\n";
+	s << "<TR><TD style='vertical-align: top;'><b> To use it </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'> include ";
+	// s << inc << "&nbsp;&nbsp;<a href=\"../../../bbs/"<<inc<<"\">[source]</a>";
+	// LG TODO : USE PACKAGE BBS PATH
+	s << inc << "&nbsp;&nbsp;<a href=\""<<inc<<"\">[source]</a>";
+	s << "</TD></TR>\n";
 	
       }
     
     const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
 	
     if (B.size()) 
-      {
-	(s) << "<TR><TD style='vertical-align: top;'><b> Dependencies </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
- 
-
-
-	std::set<BlackBoxDescriptor*> pdeps;
-	ComplexBlackBox::BlackBoxMapType::const_iterator b;
-	for ( b = B.begin(); b != B.end(); ++b ) 
-	  {
-	    BlackBoxDescriptor* d = b->second->bbGetDescriptor();
-	    if (pdeps.find(d) != pdeps.end()) continue;
-	    pdeps.insert(d);
-
-	    Package* p = d->GetPackage();
+    {
+	   (s) << "<TR><TD style='vertical-align: top;'><b> Uses </b></TD><TD style='vertical-align: top;'> : </TD><TD style='vertical-align: top;'>  ";
+
+	   std::set<BlackBoxDescriptor::Pointer> pdeps;
+	   ComplexBlackBox::BlackBoxMapType::const_iterator b;
+	   for ( b = B.begin(); b != B.end(); ++b ) 
+	   {
+	     BlackBoxDescriptor::Pointer d = b->second->bbGetDescriptor();
+	      if (pdeps.find(d) != pdeps.end()) 
+            continue;
+	      pdeps.insert(d);
+
+	      Package::Pointer p = d->GetPackage();
 	    
-	    std::string name = b->second->bbGetTypeName();
-
-	    std::string url;
-	    if (relative_link) 
-	      url = p->GetDocRelativeURL();
-	    else 
-	      url = p->GetDocURL();
-
-	    s << "<a href=\"" <<url<<"#"<<name<<"\">" 
-	      << p->GetName()<<"::"<<name<<"</a>\n";
-	  }	
+	      std::string name = b->second->bbGetTypeName();
+				
+	      std::string url;
+	      if (relative_link) 
+	         url = p->GetDocRelativeURL();
+	      else 
+	         url = p->GetDocURL();
+		   
+	      s << "<a href=\"" <<url<<"#"<<name<<"\">" 
+	        << p->GetName()<<"::"<<name<<"</a>\n";
+	    }	// for
 	
-	(s) << "</TD></TR>\n";
+	    (s) << "</TD></TR>\n";
 
-      }
+     } // If B.size
 
-    (s) << "</TABLE>\n";
+     (s) << "</TABLE>\n";
 
  
    //-------------
@@ -362,9 +464,15 @@ namespace bbtk
 	std::string descr(in->second->GetDescription());
 	//Utilities::html_format(descr);
 
+/*EED 10/11/2009
 	(s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
 	  << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"
 	  << "<TD style='vertical-align: top;'>"<<descr<<"</TD></TR>\n";
+*/
+
+	(s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
+	  << "<TD style='vertical-align: top;'><I><PRE> "<<descr<<" </PRE></I></TD>"
+	  << "<TD style='vertical-align: top;'>"<<type<<"</TD></TR>\n";
 	
       }
     //	(s) << "</TABLE>\n";
@@ -395,18 +503,22 @@ namespace bbtk
 	std::string descr(o->second->GetDescription());
 	//Utilities::html_format(descr);
 	
-	
+/*EED 10/11/2009
 	(s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
 	  << "<TD style='vertical-align: top;'><I><PRE> "<<type<<" </PRE></I></TD>"
 	  << "<TD style='vertical-align: top;'>"<<descr<<"</TD></TR>\n";
-	
+*/	
+	(s) << "<TR><TD style='vertical-align: top;'><B><PRE> "<<name<<" </PRE></B></TD>"
+	  << "<TD style='vertical-align: top;'><I><PRE> "<<descr<<" </PRE></I></TD>"
+	  << "<TD style='vertical-align: top;'>"<<type<<"</TD></TR>\n";
+
       }
     (s) << "</TABLE>\n";
 
     //------------
     // End
 
-    bbtkDebugDecTab("Core",9);
+
    }
   //=========================================================================
  
@@ -414,94 +526,200 @@ 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," "                << 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;
+    unsigned int natlmax = 0;
     for ( i = mInput.begin();  i != mInput.end(); ++i ) 
-      {
-	if (i->second->GetName().size()>namelmax) 
-	  namelmax = i->second->GetName().size();
-	if (i->second->GetTypeName().size()>typelmax) 
-	  typelmax = i->second->GetTypeName().size();
-      }
+    {
+	   if (i->second->GetName().size()>namelmax) 
+	     namelmax = i->second->GetName().size();
+	   if (i->second->GetTypeName().size()>typelmax) 
+	     typelmax = i->second->GetTypeName().size();
+	   if (i->second->GetNature().size()>natlmax) 
+	     natlmax = i->second->GetNature().size();
+    }
     OutputDescriptorMapType::const_iterator o;
     if (full) 
-      {
-	for ( o = mOutput.begin();  o != mOutput.end(); ++o ) 
-	  {
-	    if (o->second->GetName().size()>namelmax) 
-	      namelmax = o->second->GetName().size();
+    {
+	   for ( o = mOutput.begin();  o != mOutput.end(); ++o ) 
+	   {
+	     if (o->second->GetName().size()>namelmax) 
+	       namelmax = o->second->GetName().size();
 	    if (o->second->GetTypeName().size()>typelmax) 
-	      typelmax = o->second->GetTypeName().size();
-	  }
-      }
+	       typelmax = o->second->GetTypeName().size();
+	   if (o->second->GetNature().size()>natlmax) 
+	     natlmax = o->second->GetNature().size();
+	   }
+    }
     //
 
     for ( i = mInput.begin();  i != mInput.end(); ++i ) 
-      {
-	std::string name(i->second->GetName());
-	name += "'";
-	name.append(1+namelmax-name.size(),' ');
-	std::string type(i->second->GetTypeName());
-	type += ">";
-	type.append(1+typelmax-type.size(),' ');
-	bbtkMessage("Help",1,
-		    "    '"<<name
-		    <<" <"<<type
-		    <<" : "<<i->second->GetDescription()<<std::endl);
-      }
+    {
+	   std::string name(i->second->GetName());
+	   name += "'";
+	   name.append(1+namelmax-name.size(),' ');
+	   std::string type(i->second->GetTypeName());
+	   type += ">";
+	   type.append(1+typelmax-type.size(),' ');
+	   std::string nature(i->second->GetNature());
+	   nature += "]";
+	   nature.append(1+natlmax-nature.size(),' ');
+	   bbtkMessage("help",1,
+		       "    '"<<name
+		       <<" <"<<type
+		       <<" ["<<nature
+		       <<" : "<<i->second->GetDescription()<<std::endl);
+    }
     if (full) 
-      {
-	if (mOutput.size()) 
-	  bbtkMessage("Help",1," * Outputs : "<<std::endl);
-	else 
-	  bbtkMessage("Help",1," * No outputs"<<std::endl);
-	for ( o = mOutput.begin();  o != mOutput.end(); ++o ) 
-	  {
-	    std::string name(o->second->GetName());
-	    name += "'";
-	    name.append(1+namelmax-name.size(),' ');
-	    std::string type(o->second->GetTypeName());
-	    type += ">";
-	    type.append(1+typelmax-type.size(),' ');
-	    bbtkMessage("Help",1,
-			"    '"<<name
-			<<" <"<<type
-			<<" : "<<o->second->GetDescription()<<std::endl);
-	  }
-      }
+    {
+	   if (mOutput.size()) 
+	     bbtkMessage("help",1," * Outputs : "<<std::endl);
+	   else 
+	     bbtkMessage("help",1," * No outputs"<<std::endl);
+	   for ( o = mOutput.begin();  o != mOutput.end(); ++o ) 
+	   {
+	     std::string name(o->second->GetName());
+	     name += "'";
+	     name.append(1+namelmax-name.size(),' ');
+	     std::string type(o->second->GetTypeName());
+	     type += ">";
+	     type.append(1+typelmax-type.size(),' ');
+	     std::string nature(o->second->GetNature());
+	     nature += "]";
+	     nature.append(1+natlmax-nature.size(),' ');
+	     bbtkMessage("help",1,
+		       "    '"<<name
+			 <<" <"<<type
+			 <<" ["<<nature
+			 <<" : "<<o->second->GetDescription()<<std::endl);
+	   }
+    }
     if (full) 
-      {
-	const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
+    {
+	   const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
 	
-	if (B.size()) 
-	  bbtkMessage("Help",1," * Boxes : "<<std::endl);
-	else 
-	  bbtkMessage("Help",1," * No boxes"<<std::endl);
+	   if (B.size()) 
+	     bbtkMessage("help",1," * Boxes : "<<std::endl);
+	   else 
+	     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()<<
-			"' <"
-			<< b->second->bbGetDescriptor()->GetPackage()->GetName() 
-			<<"::"
-			<<b->second->bbGetTypeName()<<">"<<std::endl);
-	  }
-      }
+	   ComplexBlackBox::BlackBoxMapType::const_iterator b;
+	   for ( b = B.begin(); b != B.end(); ++b ) 
+	   {
+	     bbtkMessage("help",1,"    '"<<b->second->bbGetName()<<
+			 "' <"
+			 << b->second->bbGetDescriptor()->GetPackage()->GetName() 
+			 <<"::"
+			 <<b->second->bbGetTypeName()<<">"<<std::endl);
+	   }
+    }
 
   }   
   //=======================================================================
 
+  //==========================================================================
+  std::string ComplexBlackBoxDescriptor::GetObjectName() const
+  {
+    return std::string("ComplexBlackBoxDescriptor '")+GetFullTypeName()
+      +std::string("'");
+  }
+  //==========================================================================
+  //=======================================================================
+  std::string ComplexBlackBoxDescriptor::GetObjectInfo() const
+  {
+    std::string i;
+    return i;     
+  }
+  //=======================================================================
+ //==========================================================================
+size_t  ComplexBlackBoxDescriptor::GetObjectSize() const 
+{
+  size_t s = Superclass::GetObjectSize();
+  s += ComplexBlackBoxDescriptor::GetObjectInternalSize();
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+size_t  ComplexBlackBoxDescriptor::GetObjectInternalSize() const 
+{
+  size_t s = sizeof(ComplexBlackBoxDescriptor);
+  return s;
+  }
+  //==========================================================================
+  //==========================================================================
+  size_t  ComplexBlackBoxDescriptor::GetObjectRecursiveSize() const 
+  {
+    size_t s = Superclass::GetObjectRecursiveSize();
+    s += ComplexBlackBoxDescriptor::GetObjectInternalSize();
+    s += mPrototype->GetObjectRecursiveSize();
+    return s;
+  }
+  //==========================================================================
+void ComplexBlackBoxDescriptor::GetBoxesInside (NodeTreeC& tree, int cont) 
+	{
+		std::cout<<"getBoxesInside recursivo "<<std::endl;
+		cont++;
+		std::string name = GetTypeName();
+		std::cout<<"despues de getTypeName : "<<name<<std::endl;
+    std::string descr = GetDescription();
+    std::string author = GetAuthor();
+	
+   	//list.push_back(name);
+		tree.setData(name);
+   	//list.push_back(descr);
+   	//list.push_back(author);
+		int k = 0;
+		
+    const ComplexBlackBox::BlackBoxMapType& B = mPrototype->bbGetBlackBoxMap();
 
-
+		std::cout<<"----B size "<< B.size() << std::endl;
+		std::cout<<"----antes if "<<std::endl;
+    if (B.size()) 
+    {
+	   std::set<BlackBoxDescriptor::Pointer> pdeps;
+	   ComplexBlackBox::BlackBoxMapType::const_iterator b;
+			std::cout<<"----antes for "<<std::endl;
+	   for ( b = B.begin(); b != B.end(); ++b ) 
+	   {
+				BlackBoxDescriptor::Pointer d = b->second->bbGetDescriptor();
+				//std::cout<<"nombre objeto d "<< d->GetObjectName() <<std::endl;
+				
+	      //if (pdeps.find(d) != pdeps.end()) 
+        //    continue;
+	      //pdeps.insert(d);
+				std::cout<<"----1~ "<<std::endl;
+	      Package::Pointer p = d->GetPackage();
+	      std::string nameBox = b->second->bbGetTypeName();
+				std::string packageBox = p->GetName();
+				tree.insertChild(nameBox);
+				std::cout<<"----2~ "<<std::endl;
+				//list.push_back(nameBox);
+				//list.push_back(packageBox);
+				std::cout<<"-----cont "<<cont<<std::endl;
+				//tree.treeTour(cont);
+				d->GetBoxesInside (tree.childs[k], cont);
+				std::cout<<"----3~ "<<std::endl;
+				//std::cout<<"--despues de la recursion "<<k<<std::endl;
+				k++;
+	    }	// for
+			std::cout<<"----despues for "<<std::endl;
+     } // If B.size
+			std::cout<<"----despues if "<<std::endl;
+			std::cout<<"end getBoxesInside recursivo"<<std::endl;
+	}
+
+//===================================================
+
+	 //==========================================================================
 }