*** empty log message ***

diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h
index cd4028eddf6792464895c43ca174b811922d1e22..46a6b954004c0cd49034270a0d7b7f112a6daae2 100644 (file)
--- a/kernel/src/bbtkAtomicBlackBoxMacros.h
+++ b/kernel/src/bbtkAtomicBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkAtomicBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/07 11:06:37 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/03/03 14:15:52 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -259,12 +259,16 @@
 
 //============================================================================
 /// Declares that the AtomicBlackBox is an adaptor (to be put inside the UBB description block)
-#define BBTK_ADAPTOR() SetKInd(bbtk::BlackBoxDescriptor::ADAPTOR)
+#define BBTK_ADAPTOR()                       \
+  SetKind(bbtk::BlackBoxDescriptor::ADAPTOR); \
+  AddToCategory("adaptor")
 //============================================================================
 
 //============================================================================
 /// Declares that the AtomicBlackBox is the default adaptor of the package (to be put inside the UBB description block)
-#define BBTK_DEFAULT_ADAPTOR() SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR)
+#define BBTK_DEFAULT_ADAPTOR()                         \
+  SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR);  \
+  AddToCategory("adaptor")
 //============================================================================
 
 //============================================================================

diff --git a/packages/itk/src/bbitkAnyImageToTypedImage.h b/packages/itk/src/bbitkAnyImageToTypedImage.h
index 8b10cbee17060a22b0b03532159125e3a880095c..768b57e617a7fad4ba6ef4ab3da50b94dc240e5a 100644 (file)
--- a/packages/itk/src/bbitkAnyImageToTypedImage.h
+++ b/packages/itk/src/bbitkAnyImageToTypedImage.h
@@ -34,7 +34,6 @@ namespace bbitk
                   ") into a typed itk image pointer ("+
                   bbtk::HumanTypeName<T>()+")");
   BBTK_DEFAULT_ADAPTOR();
-  BBTK_CATEGORY("adaptor");
   BBTK_TEMPLATE_INPUT(AnyImageToTypedImage,In,
                      "Input generic image pointer",anyImagePointer);
   BBTK_TEMPLATE_OUTPUT(AnyImageToTypedImage,Out,

diff --git a/packages/std/src/bbstdCast.h b/packages/std/src/bbstdCast.h
index ce2df7a838b384a91fe54494030323f4f720877f..81f6e20c5bc25b79c2d04f1a8b00731bcb0b9cfc 100644 (file)
--- a/packages/std/src/bbstdCast.h
+++ b/packages/std/src/bbstdCast.h
@@ -38,7 +38,6 @@ namespace bbstd
   BBTK_DESCRIPTION("Static cast from "+bbtk::HumanTypeName<T1>()+" ("
                   +bbtk::TypeName<T1>()+") to "+bbtk::HumanTypeName<T2>()
                   +" ("+bbtk::TypeName<T2>()+")");
-  BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_TEMPLATE2_INPUT(Cast,In,"Input",T1);
   BBTK_TEMPLATE2_OUTPUT(Cast,Out,"Output",T2);

diff --git a/packages/std/src/bbstdStringTo.h b/packages/std/src/bbstdStringTo.h
index b86e3b5f15a3b8ad8ecf8fa900e0dbc5fe3fa837..49e672c80de4ffb2aff461f52065bfab0cdcc0e3 100644 (file)
--- a/packages/std/src/bbstdStringTo.h
+++ b/packages/std/src/bbstdStringTo.h
@@ -23,7 +23,6 @@ namespace bbstd
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(StringTo);
   BBTK_NAME("StringTo"+bbtk::HumanTypeName<T>());
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_DESCRIPTION("Converts the content of the input string to a "
                   +bbtk::HumanTypeName<T>()

diff --git a/packages/std/src/bbstdStringToVector.h b/packages/std/src/bbstdStringToVector.h
index c31ba56e1a0a8a01da1d05ceb39e933425706a06..bd5d9f2ce0bcd8f171798874b8e5cf5d8a2df58f 100644 (file)
--- a/packages/std/src/bbstdStringToVector.h
+++ b/packages/std/src/bbstdStringToVector.h
@@ -24,7 +24,6 @@ namespace bbstd
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(StringToVector);
   BBTK_NAME("StringTo"+bbtk::HumanTypeName<std::vector<T> >());
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_DESCRIPTION("Converts the content of the input string to a "
                   +bbtk::HumanTypeName<std::vector<T> >()

diff --git a/packages/std/src/bbstdToString.h b/packages/std/src/bbstdToString.h
index f7bd2d3505da3f5ba6eb5587a94da0b1c1af9fae..b69312df677e4fda158c2127df48b75e2306406e 100644 (file)
--- a/packages/std/src/bbstdToString.h
+++ b/packages/std/src/bbstdToString.h
@@ -23,7 +23,6 @@ namespace bbstd
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(ToString);
   BBTK_NAME(bbtk::HumanTypeName<T>()+"ToString");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_DESCRIPTION("Converts a "+bbtk::HumanTypeName<T>()+" ("
                   +bbtk::TypeName<T>()+") into a string");

diff --git a/packages/std/src/bbstdVectorToString.h b/packages/std/src/bbstdVectorToString.h
index 50bffc51d40e60a6e18f77765652fc0567783a52..96816d7fb2196fb510a52a901b492277ed0d9e3f 100644 (file)
--- a/packages/std/src/bbstdVectorToString.h
+++ b/packages/std/src/bbstdVectorToString.h
@@ -25,13 +25,12 @@ namespace bbstd
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString);
   BBTK_NAME(bbtk::HumanTypeName<std::vector<T> >()+"ToString");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_DESCRIPTION("Converts the content of the input vector ("+bbtk::TypeName<std::vector<T> >()+") to a string in which each item is separated by the value of the input 'Separator'");
-    typedef std::vector<T> Tvector;
-    BBTK_TEMPLATE_INPUT(VectorToString, In,"Input",Tvector);
-    BBTK_TEMPLATE_INPUT(VectorToString, Separator,"Separator of item in the output string. Default is whitespace.",std::string);
-    BBTK_TEMPLATE_OUTPUT(VectorToString, Out,"Output",std::string);
+  typedef std::vector<T> Tvector;
+  BBTK_TEMPLATE_INPUT(VectorToString, In,"Input",Tvector);
+  BBTK_TEMPLATE_INPUT(VectorToString, Separator,"Separator of item in the output string. Default is whitespace.",std::string);
+  BBTK_TEMPLATE_OUTPUT(VectorToString, Out,"Output",std::string);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(VectorToString);
   //=================================================================