*** empty log message ***

[bbtk.git] / packages / itk / src / bbitkAnyImageToTypedImage.h

diff --git a/packages/itk/src/bbitkAnyImageToTypedImage.h b/packages/itk/src/bbitkAnyImageToTypedImage.h
index beb8a20378d251a04d8523fd9edcab0533e81612..61e404ffb25e6df8f65ee56ef33b8f8f55326c1d 100644 (file)
--- a/packages/itk/src/bbitkAnyImageToTypedImage.h
+++ b/packages/itk/src/bbitkAnyImageToTypedImage.h
@@ -14,8 +14,9 @@ namespace bbitk
   template <class itkImageTypePointer>
   class AnyImageToTypedImage : public bbtk::AtomicBlackBox
   {  
-    BBTK_USER_BLACK_BOX_INTERFACE(AnyImageToTypedImage,
-                                 bbtk::AtomicBlackBox);
+    BBTK_TEMPLATE_BLACK_BOX_INTERFACE(AnyImageToTypedImage,
+                                     bbtk::AtomicBlackBox,
+                                     itkImageTypePointer);
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_OUTPUT(Out,itkImageTypePointer);
     BBTK_PROCESS(DoIt);
@@ -25,19 +26,20 @@ namespace bbitk
   
   //=================================================================
   // BlackBox description
-  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(AnyImageToTypedImage);
-  BBTK_NAME(bbtk::HumanTypeName<anyImagePointer>() + "To"+bbtk::HumanTypeName<T>());
+  BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(AnyImageToTypedImage,
+                                     bbtk::AtomicBlackBox);
+  BBTK_NAME(bbtk::HumanTypeName<anyImagePointer>() + "To"
+           +bbtk::HumanTypeName<T>());
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Transforms a generic itk image ("+
+  BBTK_DESCRIPTION("Converts a generic itk image pointer ("+
                   bbtk::HumanTypeName<anyImagePointer>()+
-                  ") into a typed itk image ("+
-                  bbtk::HumanTypeName<T>()+"*)");
+                  ") into a typed itk image pointer ("+
+                  bbtk::HumanTypeName<T>()+")");
   BBTK_DEFAULT_ADAPTOR();
-  BBTK_CATEGORY("adaptor");
   BBTK_TEMPLATE_INPUT(AnyImageToTypedImage,In,
-                     "Input generic image",anyImagePointer);
+                     "Input generic image pointer",anyImagePointer);
   BBTK_TEMPLATE_OUTPUT(AnyImageToTypedImage,Out,
-                       "Output typed image",T);
+                       "Output typed image pointer",T);
   BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(AnyImageToTypedImage);
   //=================================================================
   
@@ -63,8 +65,10 @@ namespace bbitk
   template <class itkImageTypePointer, class itkImageTypeConstPointer>
   class AnyImageToConstTypedImage : public bbtk::AtomicBlackBox
   {  
-    BBTK_USER_BLACK_BOX_INTERFACE(AnyImageToConstTypedImage,
-                                 bbtk::AtomicBlackBox);
+    BBTK_TEMPLATE2_BLACK_BOX_INTERFACE(AnyImageToConstTypedImage,
+                                      bbtk::AtomicBlackBox,
+                                      itkImageTypePointer,
+                                      itkImageTypeConstPointer);
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_OUTPUT(Out,itkImageTypeConstPointer);
     BBTK_PROCESS(DoIt);
@@ -74,20 +78,21 @@ namespace bbitk
   
   //=================================================================
   // BlackBox description
-  BBTK_BEGIN_DESCRIBE_TEMPLATE2_BLACK_BOX(AnyImageToConstTypedImage);
-  BBTK_NAME("Convert<"+bbtk::TypeName<anyImagePointer>() + "," +
-           bbtk::TypeName<T2>()+">");
+  BBTK_BEGIN_DESCRIBE_TEMPLATE2_BLACK_BOX(AnyImageToConstTypedImage,
+                                      bbtk::AtomicBlackBox);
+  BBTK_NAME(bbtk::HumanTypeName<anyImagePointer>() + "To" +
+           bbtk::HumanTypeName<T2>());
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Transforms a generic itk image ("+
-                  bbtk::TypeName<anyImagePointer>()+
-                  ") into a typed itk image ("+
-                  bbtk::TypeName<T2>()+"*)");
+  BBTK_DESCRIPTION("Converts a generic itk image pointer ("+
+                  bbtk::HumanTypeName<anyImagePointer>()+
+                  ") into a const typed itk image pointer ("+
+                  bbtk::HumanTypeName<T2>()+")");
   BBTK_CATEGORY("adaptor");
   BBTK_DEFAULT_ADAPTOR();
   BBTK_TEMPLATE2_INPUT(AnyImageToConstTypedImage,In,
-                     "Input generic image",anyImagePointer);
+                     "Input generic image pointer",anyImagePointer);
   BBTK_TEMPLATE2_OUTPUT(AnyImageToConstTypedImage,Out,
-                       "Output typed image",T2);
+                       "Output const typed image pointer",T2);
   BBTK_END_DESCRIBE_TEMPLATE2_BLACK_BOX(AnyImageToConstTypedImage);
   //=================================================================