X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fitk%2Fsrc%2FbbitkAnyImageToTypedImage.h;h=768b57e617a7fad4ba6ef4ab3da50b94dc240e5a;hb=c2a4b1893412e50a3d9abff221938a2d16c4a7cb;hp=b780362f0226126b937070490395329753291281;hpb=d73a7833a28e6111e1e805efae5df3ab18a240e2;p=bbtk.git

diff --git a/packages/itk/src/bbitkAnyImageToTypedImage.h b/packages/itk/src/bbitkAnyImageToTypedImage.h
index b780362..768b57e 100644
--- a/packages/itk/src/bbitkAnyImageToTypedImage.h
+++ b/packages/itk/src/bbitkAnyImageToTypedImage.h
@@ -3,19 +3,19 @@
 #ifndef __bbitkAnyImageToTypedImage_h_INCLUDED__
 #define __bbitkAnyImageToTypedImage_h_INCLUDED__
 
-#include "bbtkUserBlackBox.h"
+#include "bbtkAtomicBlackBox.h"
 #include "bbitkImage.h"
 
 namespace bbitk
 {
 
   //=================================================================
-  // UserBlackBox declaration
+  // BlackBox declaration
   template <class itkImageTypePointer>
-  class AnyImageToTypedImage : public bbtk::UserBlackBox
+  class AnyImageToTypedImage : public bbtk::AtomicBlackBox
   {  
     BBTK_USER_BLACK_BOX_INTERFACE(AnyImageToTypedImage,
-				  bbtk::UserBlackBox);
+				  bbtk::AtomicBlackBox);
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_OUTPUT(Out,itkImageTypePointer);
     BBTK_PROCESS(DoIt);
@@ -24,19 +24,20 @@ namespace bbitk
   //=================================================================
   
   //=================================================================
-  // UserBlackBox description
+  // BlackBox description
   BBTK_BEGIN_DESCRIBE_TEMPLATE_BLACK_BOX(AnyImageToTypedImage);
-  BBTK_NAME(bbtk::HumanTypeName<anyImagePointer>() + "To"+bbtk::HumanTypeName<T>());
+  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_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);
   //=================================================================
   
@@ -58,12 +59,12 @@ namespace bbitk
   //=================================================================
 
   //=================================================================
-  // UserBlackBox declaration
+  // BlackBox declaration
   template <class itkImageTypePointer, class itkImageTypeConstPointer>
-  class AnyImageToConstTypedImage : public bbtk::UserBlackBox
+  class AnyImageToConstTypedImage : public bbtk::AtomicBlackBox
   {  
     BBTK_USER_BLACK_BOX_INTERFACE(AnyImageToConstTypedImage,
-				  bbtk::UserBlackBox);
+				  bbtk::AtomicBlackBox);
     BBTK_DECLARE_INPUT(In,anyImagePointer);
     BBTK_DECLARE_OUTPUT(Out,itkImageTypeConstPointer);
     BBTK_PROCESS(DoIt);
@@ -72,20 +73,21 @@ namespace bbitk
   //=================================================================
   
   //=================================================================
-  // UserBlackBox description
+  // BlackBox description
   BBTK_BEGIN_DESCRIBE_TEMPLATE2_BLACK_BOX(AnyImageToConstTypedImage);
-  BBTK_NAME("Convert<"+bbtk::TypeName<anyImagePointer>() + "," +
-	    bbtk::TypeName<T2>()+">");
+  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);
   //=================================================================