From 487dbfe275c2c6fa7454a000503082bfca54396b Mon Sep 17 00:00:00 2001 From: guigues Date: Mon, 3 Mar 2008 14:15:52 +0000 Subject: [PATCH] *** empty log message *** --- kernel/src/bbtkAtomicBlackBoxMacros.h | 12 ++++++++---- packages/itk/src/bbitkAnyImageToTypedImage.h | 1 - packages/std/src/bbstdCast.h | 1 - packages/std/src/bbstdStringTo.h | 1 - packages/std/src/bbstdStringToVector.h | 1 - packages/std/src/bbstdToString.h | 1 - packages/std/src/bbstdVectorToString.h | 9 ++++----- 7 files changed, 12 insertions(+), 14 deletions(-) diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h index cd4028e..46a6b95 100644 --- 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 8b10cbe..768b57e 100644 --- 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()+")"); 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 ce2df7a..81f6e20 100644 --- 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()+" (" +bbtk::TypeName()+") to "+bbtk::HumanTypeName() +" ("+bbtk::TypeName()+")"); - 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 b86e3b5..49e672c 100644 --- 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()); 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() diff --git a/packages/std/src/bbstdStringToVector.h b/packages/std/src/bbstdStringToVector.h index c31ba56..bd5d9f2 100644 --- 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 >()); 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 >() diff --git a/packages/std/src/bbstdToString.h b/packages/std/src/bbstdToString.h index f7bd2d3..b69312d 100644 --- 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()+"ToString"); BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); - BBTK_CATEGORY("adaptor"); BBTK_DEFAULT_ADAPTOR(); BBTK_DESCRIPTION("Converts a "+bbtk::HumanTypeName()+" (" +bbtk::TypeName()+") into a string"); diff --git a/packages/std/src/bbstdVectorToString.h b/packages/std/src/bbstdVectorToString.h index 50bffc5..96816d7 100644 --- 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 >()+"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 >()+") to a string in which each item is separated by the value of the input 'Separator'"); - typedef std::vector 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 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); //================================================================= -- 2.45.1