X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=kernel%2Fsrc%2FbbtkComplexBlackBoxDescriptor.cxx;h=a56659c030cb2b2572bd4dfe8fbe49544efa6401;hb=664e5cdbbcaf3dafa5fc9f206a7094248c289d5a;hp=6faae520dbb8ddd47d8d86c2a1e2bcdb90a40424;hpb=027bd220c2819146658da884f08b10ffc40545e3;p=bbtk.git diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index 6faae52..a56659c 100644 --- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx @@ -1,21 +1,34 @@ -/*========================================================================= - +/*========================================================================= Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/18 10:41:02 $ - Version: $Revision: 1.10 $ - - 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: 2009/05/28 08:12:05 $ + Version: $Revision: 1.20 $ =========================================================================*/ +/* --------------------------------------------------------------------- + +* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) +* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux +* +* 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. +* ------------------------------------------------------------------------ */ + + /** * \file * \brief Class bbtk::ComplexBlackBoxDescriptor : describes a ComplexBlackBox (constituents, connections) and is able to create an instance of it. @@ -26,20 +39,37 @@ #include "bbtkMessageManager.h" #include "bbtkUtilities.h" +#define bbtkDMessage(key,level,mess) \ + bbtkMessage(key,level,"["< ComplexBlackBoxDescriptor::New(\""< ComplexBlackBoxDescriptor(\""<SetAsPrototype(); + bbtkDDebugMessage("object",2,"<== ComplexBlackBoxDescriptor(\""< ~ComplexBlackBoxDescriptor()"<Check(recursive); + } + //========================================================================= //======================================================================= /// Creates an instance of 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("Kernel",5, - "ComplexBlackBoxDescriptor::CreateInstance(\"" - <bbClone(name); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= - + /* + //======================================================================= + /// Release + void ComplexBlackBoxDescriptor::Release(bool release_package) + { + } + //======================================================================= + */ //======================================================================= /// Adds a black box to the complex box @@ -82,11 +124,16 @@ namespace bbtk const std::string& name ) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::Add(\"" - <bbUnsafeGetBlackBox( name ) ) @@ -94,22 +141,32 @@ namespace bbtk bbtkError("a black box \""<bbAddBlackBox ( /*mFactory->Create*/ NewBlackBox(type,name) ); + mPrototype->bbAddBlackBox ( GetFactory()->NewBlackBox(type,name) ); + - bbtkDebugDecTab("Kernel",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("Kernel",5, - "ComplexBlackBoxDescriptor::AddToExecutionList(\"" - <bbUnsafeGetBlackBox( box ); + BlackBox::Pointer b = mPrototype->bbUnsafeGetBlackBox( box ); if ( !b ) { bbtkError("the black box \""<bbAddToExecutionList ( box ); - bbtkDebugDecTab("Kernel",5); + } @@ -129,29 +186,37 @@ namespace bbtk const std::string& input ) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::Connect(\"" <bbGetBlackBox( from ); + BlackBox::Pointer bbfrom = mPrototype->bbGetBlackBox( from ); if ( !bbfrom ) { bbtkError("the black box \""<bbGetBlackBox( to ); + BlackBox::Pointer bbto = mPrototype->bbGetBlackBox( to ); if ( !bbto ) { bbtkError("the black box \""<*/ NewConnection( bbfrom, output, bbto, input ); + Connection::Pointer c + = GetFactory()->NewConnection( bbfrom, output, bbto, input ); mPrototype->bbAddConnection(c); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -163,14 +228,14 @@ namespace bbtk const std::string& input, const std::string& help) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::DefineInput(\"" <bbGetBlackBox( box ); + BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box ); if ( !bb ) { bbtkError("the black box \""<bbGetDescriptor()->GetInputDescriptor(input); AddInputDescriptor ( new ComplexBlackBoxInputDescriptor ( typeid(ComplexBlackBoxDescriptor), name, help, + d->GetNature(), box, input, - bb->bbGetInputType(input))); + d->GetTypeInfo())); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -202,14 +270,14 @@ namespace bbtk const std::string& output, const std::string& help) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::DefineOutput(\"" <bbGetBlackBox( box ); + BlackBox::Pointer bb = mPrototype->bbGetBlackBox( box ); if ( !bb ) { bbtkError("the black box \""<bbGetDescriptor()->GetOutputDescriptor(output); AddOutputDescriptor ( new ComplexBlackBoxOutputDescriptor ( typeid(ComplexBlackBoxDescriptor), name, help, + d->GetNature(), box, output, - bb->bbGetOutputType(output))); + d->GetTypeInfo())); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -260,10 +331,9 @@ namespace bbtk int detail, int level, const std::string& output_dir, bool relative_link) { -printf("ComplexBlackBoxDescriptor::InsertHtmlHelp 01 xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n"); - bbtkDebugMessageInc("Kernel",9, - "ComplexBlackBoxDescriptor::InsertHtmlHelp() [" - <0) { s << " To use it : include "; - s << inc << "  [source]"; + // s << inc << "  [source]"; + // LG TODO : USE PACKAGE BBS PATH + s << inc << "  [source]"; s << "\n"; } @@ -324,16 +396,16 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp 01 xxxxxxxxxxxxxxxxxxxxxxxxx { (s) << " Uses : "; - std::set pdeps; + std::set pdeps; ComplexBlackBox::BlackBoxMapType::const_iterator b; for ( b = B.begin(); b != B.end(); ++b ) { - BlackBoxDescriptor* d = b->second->bbGetDescriptor(); + BlackBoxDescriptor::Pointer d = b->second->bbGetDescriptor(); if (pdeps.find(d) != pdeps.end()) continue; pdeps.insert(d); - Package* p = d->GetPackage(); + Package::Pointer p = d->GetPackage(); std::string name = b->second->bbGetTypeName(); @@ -342,14 +414,14 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp 01 xxxxxxxxxxxxxxxxxxxxxxxxx url = p->GetDocRelativeURL(); else url = p->GetDocURL(); - + s << "" << p->GetName()<<"::"<\n"; - } + } // for (s) << "\n"; - } + } // If B.size (s) << "\n"; @@ -382,7 +454,7 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp 01 xxxxxxxxxxxxxxxxxxxxxxxxx Utilities::html_format(type); std::string descr(in->second->GetDescription()); - Utilities::html_format(descr); + //Utilities::html_format(descr); (s) << "
 "<"
 	  << "
 "<"
@@ -415,7 +487,7 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  01  xxxxxxxxxxxxxxxxxxxxxxxxx
 	Utilities::html_format(type);
 	
 	std::string descr(o->second->GetDescription());
-	Utilities::html_format(descr);
+	//Utilities::html_format(descr);
 	
 	(s) << "
 "<"
 	  << "
 "<"
@@ -427,8 +499,7 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  01  xxxxxxxxxxxxxxxxxxxxxxxxx
     //------------
     // End
 
-    bbtkDebugDecTab("Kernel",9);
-printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  02  xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n");
+
    }
   //=========================================================================
  
@@ -436,25 +507,28 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  02  xxxxxxxxxxxxxxxxxxxxxxxxx
   //=======================================================================
   void ComplexBlackBoxDescriptor::GetHelp(bool full) const
   {
-    if (full) bbtkMessage("Help",1,"Complex Black Box <"<<
+    if (full) bbtkMessage("help",1,"Complex Black Box <"<<
 			  GetPackage()->GetName()<<"::"
 			  <"<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) 
@@ -465,6 +539,8 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  02  xxxxxxxxxxxxxxxxxxxxxxxxx
 	       namelmax = o->second->GetName().size();
 	    if (o->second->GetTypeName().size()>typelmax) 
 	       typelmax = o->second->GetTypeName().size();
+	   if (o->second->GetNature().size()>natlmax) 
+	     natlmax = o->second->GetNature().size();
 	   }
     }
     //
@@ -477,17 +553,21 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  02  xxxxxxxxxxxxxxxxxxxxxxxxx
 	   std::string type(i->second->GetTypeName());
 	   type += ">";
 	   type.append(1+typelmax-type.size(),' ');
-	   bbtkMessage("Help",1,
-		    "    '"<second->GetDescription()<second->GetNature());
+	   nature += "]";
+	   nature.append(1+natlmax-nature.size(),' ');
+	   bbtkMessage("help",1,
+		       "    '"<second->GetDescription()<second->GetName());
@@ -496,9 +576,13 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  02  xxxxxxxxxxxxxxxxxxxxxxxxx
 	     std::string type(o->second->GetTypeName());
 	     type += ">";
 	     type.append(1+typelmax-type.size(),' ');
-	     bbtkMessage("Help",1,
-			 "    '"<second->GetNature());
+	     nature += "]";
+	     nature.append(1+natlmax-nature.size(),' ');
+	     bbtkMessage("help",1,
+		       "    '"<second->GetDescription()<bbGetBlackBoxMap();
 	
 	   if (B.size()) 
-	     bbtkMessage("Help",1," * Boxes : "<second->bbGetName()<<
+	     bbtkMessage("help",1,"    '"<second->bbGetName()<<
 			 "' <"
 			 << b->second->bbGetDescriptor()->GetPackage()->GetName() 
 			 <<"::"
@@ -525,6 +609,43 @@ printf("ComplexBlackBoxDescriptor::InsertHtmlHelp  02  xxxxxxxxxxxxxxxxxxxxxxxxx
   }   
   //=======================================================================
 
-
+  //==========================================================================
+  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;
+  }
+  //==========================================================================
 
 }