X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkComplexBlackBoxDescriptor.cxx;h=3037cae072d36a075e40e19a3a9786540c36c2c4;hb=1688b52778caa9985ecea38aad38341817e0401a;hp=0e1114d52383c1480eb50ca410ba084ff1aa0746;hpb=ba235cfa6ce74178ab468c01af002af0ab3a7d82;p=bbtk.git diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index 0e1114d..3037cae 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/05/14 10:26:29 $ - Version: $Revision: 1.16 $ - - 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/12/08 14:10:36 $ + Version: $Revision: 1.21 $ =========================================================================*/ +/* --------------------------------------------------------------------- + +* 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,6 +39,11 @@ #include "bbtkMessageManager.h" #include "bbtkUtilities.h" +#define bbtkDMessage(key,level,mess) \ + bbtkMessage(key,level,"["< ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""< ComplexBlackBoxDescriptor(\""<SetAsPrototype(); - bbtkDebugMessage("object",2,"<== ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""< ComplexBlackBoxDescriptor::~ComplexBlackBoxDescriptor(\""<Delete(); + bbtkDDebugMessage("object",2,"==> ~ComplexBlackBoxDescriptor()"<bbClone(name); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -107,10 +124,10 @@ namespace bbtk const std::string& name ) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::Add(\"" - <bbAddBlackBox ( GetFactory()->NewBlackBox(type,name) ); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -144,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(\"" - <bbUnsafeGetBlackBox( box ); if ( !b ) @@ -157,7 +174,7 @@ namespace bbtk // ok mPrototype->bbAddToExecutionList ( box ); - bbtkDebugDecTab("Kernel",5); + } @@ -169,12 +186,12 @@ namespace bbtk const std::string& input ) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::Connect(\"" <bbAddConnection(c); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -211,12 +228,12 @@ namespace bbtk const std::string& input, const std::string& help) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::DefineInput(\"" <bbGetBlackBox( box ); if ( !bb ) @@ -242,7 +259,7 @@ namespace bbtk d->GetTypeInfo())); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -253,12 +270,12 @@ namespace bbtk const std::string& output, const std::string& help) { - bbtkDebugMessageInc("Kernel",5, + bbtkDDebugMessage("kernel",5, "ComplexBlackBoxDescriptor::DefineOutput(\"" <bbGetBlackBox( box ); if ( !bb ) @@ -284,7 +301,7 @@ namespace bbtk d->GetTypeInfo())); - bbtkDebugDecTab("Kernel",5); + } //======================================================================= @@ -314,9 +331,9 @@ namespace bbtk int detail, int level, const std::string& output_dir, bool relative_link) { - 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"; } @@ -395,14 +414,14 @@ namespace bbtk url = p->GetDocRelativeURL(); else url = p->GetDocURL(); - + s << "" << p->GetName()<<"::"<\n"; - } + } // for (s) << "\n"; - } + } // If B.size (s) << "\n"; @@ -437,9 +456,15 @@ namespace bbtk std::string descr(in->second->GetDescription()); //Utilities::html_format(descr); +/*EED 10/11/2009 (s) << "
 "<"
 	  << "
 "<"
 	  << ""<\n";
+*/
+
+	(s) << "
 "<"
+	  << "
 "<"
+	  << ""<\n";
 	
       }
     //	(s) << "\n";
@@ -470,17 +495,22 @@ namespace bbtk
 	std::string descr(o->second->GetDescription());
 	//Utilities::html_format(descr);
 	
+/*EED 10/11/2009
 	(s) << "
 "<"
 	  << "
 "<"
 	  << ""<\n";
-	
+*/	
+	(s) << "
 "<"
+	  << "
 "<"
+	  << ""<\n";
+
       }
     (s) << "\n";
 
     //------------
     // End
 
-    bbtkDebugDecTab("Kernel",9);
+
    }
   //=========================================================================
  
@@ -488,16 +518,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()<<"::"
 			  <"<second->GetNature());
 	   nature += "]";
 	   nature.append(1+natlmax-nature.size(),' ');
-	   bbtkMessage("Help",1,
+	   bbtkMessage("help",1,
 		       "    '"<second->GetName());
@@ -560,7 +590,7 @@ namespace bbtk
 	     std::string nature(o->second->GetNature());
 	     nature += "]";
 	     nature.append(1+natlmax-nature.size(),' ');
-	     bbtkMessage("Help",1,
+	     bbtkMessage("help",1,
 		       "    '"<bbGetBlackBoxMap();
 	
 	   if (B.size()) 
-	     bbtkMessage("Help",1," * Boxes : "<second->bbGetName()<<
+	     bbtkMessage("help",1,"    '"<second->bbGetName()<<
 			 "' <"
 			 << b->second->bbGetDescriptor()->GetPackage()->GetName() 
 			 <<"::"