X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=kernel%2Fsrc%2FbbtkUserBlackBoxMacros.h;h=10b12acff5d87463bb62337579546405db47d16d;hb=7eba604321498f7ed6333b7cbe9bf2aceb4ec30e;hp=2ff7aed90366949a269363f2d88b57b21ac2e6a4;hpb=2d76cd309d74d5f83d701d6bb0a4140d5d122b36;p=bbtk.git

diff --git a/kernel/src/bbtkUserBlackBoxMacros.h b/kernel/src/bbtkUserBlackBoxMacros.h
index 2ff7aed..10b12ac 100644
--- a/kernel/src/bbtkUserBlackBoxMacros.h
+++ b/kernel/src/bbtkUserBlackBoxMacros.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkUserBlackBoxMacros.h,v $
   Language:  C++
-  Date:      $Date: 2008/01/30 09:28:16 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/02/06 14:14:22 $
+  Version:   $Revision: 1.7 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -38,18 +38,18 @@
   public: \
   inline static CLASS* bbNew(const std::string& name)			\
   {									\
-    bbtkDebugMessageInc("Core",9,#CLASS<<"::bbNew(\""<<name<<"\")"<<std::endl); \
+    bbtkDebugMessageInc("Kernel",9,#CLASS<<"::bbNew(\""<<name<<"\")"<<std::endl); \
     bbCreateDescriptorIfNeeded();					\
     CLASS* c = new CLASS(name);						\
-    bbtkDebugDecTab("Core",9);						\
+    bbtkDebugDecTab("Kernel",9);						\
     return c;								\
   }									\
   inline bbtk::BlackBox* bbClone(const std::string& name)		\
   {									\
-    bbtkDebugMessageInc("Core",9,#CLASS<<"::bbClone(\""<<name<<"\")"<<std::endl); \
+    bbtkDebugMessageInc("Kernel",9,#CLASS<<"::bbClone(\""<<name<<"\")"<<std::endl); \
     bbCreateDescriptorIfNeeded();					\
     CLASS* c = new CLASS(*this,name);					\
-    bbtkDebugDecTab("Core",9);						\
+    bbtkDebugDecTab("Kernel",9);						\
     return c;								\
   }									\
   bbtk::BlackBoxDescriptor* bbGetDescriptor() const			\
@@ -137,14 +137,14 @@
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_CONSTRUCTOR(CLASS,ALLOC)			\
-  bbtkDebugMessageInc("Core",7,#CLASS<<"::"<<#CLASS			\
+  bbtkDebugMessageInc("Kernel",7,#CLASS<<"::"<<#CLASS			\
 		      <<"(\""<<bbGetName()<<"\")"<<std::endl);		\
   if (ALLOC) bbAllocateConnectors();					
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_COPY_CONSTRUCTOR(CLASS,FROM,ALLOC)		\
-  bbtkDebugMessageInc("Core",7,#CLASS<<"::"<<#CLASS			\
+  bbtkDebugMessageInc("Kernel",7,#CLASS<<"::"<<#CLASS			\
 		      <<"("<<FROM.bbGetFullName()<<",\""		\
 		      <<bbGetName()<<"\")"<<std::endl);			\
   if (ALLOC)								\
@@ -157,12 +157,12 @@
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_CONSTRUCTOR		\
-  bbtkDebugDecTab("Core",7)
+  bbtkDebugDecTab("Kernel",7)
 //============================================================================
 
 //============================================================================
 #define BBTK_BEGIN_BLACK_BOX_DESTRUCTOR(CLASS)				\
-  bbtkDebugMessageInc("Core",7,#CLASS <<"::~"<< #CLASS			\
+  bbtkDebugMessageInc("Kernel",7,#CLASS <<"::~"<< #CLASS			\
 		      <<"() ["<<this->bbGetFullName()<<"]"<<std::endl);
 //============================================================================
 
@@ -171,7 +171,7 @@
 
 //============================================================================
 #define BBTK_END_BLACK_BOX_DESTRUCTOR		\
-  bbtkDebugDecTab("Core",7)
+  bbtkDebugDecTab("Kernel",7)
 //============================================================================
 
 
@@ -214,14 +214,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-	bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+	bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			    <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends the UserBlackBox description block
 #define BBTK_END_DESCRIBE_BLACK_BOX(CLASS)				\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   void CLASS::bbCreateDescriptorIfNeeded()				\
@@ -243,8 +243,8 @@
 //============================================================================
 
 //============================================================================
-/// Declares the keywords of a UserBlackBox (to be put inside the UBB description block)
-#define BBTK_KEYWORD(KEYWORD) AddToKeyword(KEYWORD)
+/// Declares the categories of a UserBlackBox (to be put inside the UBB description block)
+#define BBTK_CATEGORY(CATEGORY) AddToCategory(CATEGORY)
 //============================================================================
 
 //============================================================================
@@ -253,25 +253,26 @@
 //============================================================================
 
 //============================================================================
-/// Declares the category of a UserBlackBox (to be put inside the UBB description block)
-//#define BBTK_CATEGORY(CATEGORY) SetCategory(CATEGORY)
+/// Declares the kind of a UserBlackBox (to be put inside the UBB description block)
+//#define BBTK_KIND(KIND) SetKind(KIND)
 //============================================================================
 
 //============================================================================
 /// Declares that the UserBlackBox is an adaptor (to be put inside the UBB description block)
-#define BBTK_ADAPTOR() SetCategory(bbtk::BlackBoxDescriptor::ADAPTOR)
+#define BBTK_ADAPTOR() SetKInd(bbtk::BlackBoxDescriptor::ADAPTOR)
 //============================================================================
 
 //============================================================================
 /// Declares that the UserBlackBox is the default adaptor of the package (to be put inside the UBB description block)
-#define BBTK_DEFAULT_ADAPTOR() SetCategory(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR)
+#define BBTK_DEFAULT_ADAPTOR() SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR)
 //============================================================================
 
 //============================================================================
 /// Describes a UserBlackBox input (to be put inside the UBB description block)
 #define BBTK_INPUT(CLASS,NAME,DESCR,TYPE)				\
   AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor		\
-		     (#NAME,DESCR,					\
+		     (typeid(CLASS ## Descriptor),			\
+		      #NAME,DESCR,					\
 		      new bbtk::UserBlackBoxTGetFunctor<CLASS,TYPE,TYPE > \
 		      (&CLASS::bbGetInput##NAME),			\
 		      new bbtk::UserBlackBoxTSetFunctor<CLASS,TYPE,TYPE > \
@@ -282,7 +283,7 @@
 /// Describes a UserBlackBox output (to be put inside the UBB description block)
 #define BBTK_OUTPUT(CLASS,NAME,DESCR,TYPE)				\
   AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor		\
-		      (#NAME,DESCR,					\
+		      (typeid(CLASS ## Descriptor),#NAME,DESCR,				\
 		       new bbtk::UserBlackBoxTGetFunctor<CLASS,TYPE,TYPE > \
 		       (&CLASS::bbGetOutput##NAME),			\
 		       new bbtk::UserBlackBoxTSetFunctor<CLASS,TYPE,TYPE > \
@@ -293,7 +294,7 @@
 /// Describes a UserBlackBox input (to be put inside the UBB description block)
 #define BBTK_INPUT_NOCOPY(CLASS,NAME,DESCR,TYPE)			\
   AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor		\
-		     (#NAME,DESCR,					\
+		     (typeid(CLASS ## Descriptor),#NAME,DESCR,					\
 		      new bbtk::UserBlackBoxTGetFunctor<CLASS,TYPE,TYPE > \
 		      (&CLASS::bbGetInput##NAME),			\
 		      new bbtk::UserBlackBoxTSetFunctor<CLASS,TYPE,TYPE > \
@@ -305,7 +306,7 @@
 /// Describes a UserBlackBox output (to be put inside the UBB description block)
 #define BBTK_OUTPUT_NOCOPY(CLASS,NAME,DESCR,TYPE)			\
   AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor		\
-		      (#NAME,DESCR,					\
+		      (typeid(CLASS ## Descriptor),#NAME,DESCR,				\
 		       new bbtk::UserBlackBoxTGetFunctor<CLASS,TYPE,TYPE > \
 		       (&CLASS::bbGetOutput##NAME),			\
 		       new bbtk::UserBlackBoxTSetFunctor<CLASS,TYPE,TYPE > \
@@ -341,14 +342,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-	bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+	bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			    <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends a template UserBlackBox of template param T description block
 #define BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(CLASS)	\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   template <class T>					\
@@ -363,7 +364,7 @@
 /// Describes a template UserBlackBox input (to be put inside the template UBB description block)
 #define BBTK_TEMPLATE_INPUT(CLASS,NAME,DESCR,TYPE)			\
   AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor		\
-		     (#NAME,DESCR,					\
+		     (typeid(CLASS ## Descriptor),#NAME,DESCR,					\
 		      new bbtk::UserBlackBoxTGetFunctor<CLASS<T>,TYPE,TYPE > \
 		      (&CLASS<T>::bbGetInput##NAME),			\
 		      new bbtk::UserBlackBoxTSetFunctor<CLASS<T>,TYPE,TYPE > \
@@ -374,7 +375,7 @@
 /// Describes a template UserBlackBox output (to be put inside the template UBB description block)
 #define BBTK_TEMPLATE_OUTPUT(CLASS,NAME,DESCR,TYPE)			\
   AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor		\
-		      (#NAME,DESCR,					\
+		      (typeid(CLASS ## Descriptor),#NAME,DESCR,				\
 		       new bbtk::UserBlackBoxTGetFunctor<CLASS<T>,TYPE,TYPE > \
 		       (&CLASS<T>::bbGetOutput##NAME),			\
 		       new bbtk::UserBlackBoxTSetFunctor<CLASS<T>,TYPE,TYPE > \
@@ -425,14 +426,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-      bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+      bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			  <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends a template UserBlackBox description block of template param T1 and T2
 #define BBTK_END_DESCRIBE_TEMPLATE2_BLACK_BOX(CLASS)		\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   template <class T1, class T2>						\
@@ -458,14 +459,14 @@
     }									\
     CLASS ## Descriptor()						\
       {									\
-      bbtkDebugMessageInc("Core",9,#CLASS<<"Descriptor::"<<#CLASS	\
+      bbtkDebugMessageInc("Kernel",9,#CLASS<<"Descriptor::"<<#CLASS	\
 			  <<"Descriptor()"<<std::endl)
 //============================================================================
 
 //============================================================================
 /// Ends a template UserBlackBox description block of template param T1 and T2
 #define BBTK_END_DESCRIBE_TEMPLATE2_WITH_TYPES_BLACK_BOX(CLASS,TYPE1,TYPE2)	\
-  bbtkDecTab("Core",9);							\
+  bbtkDecTab("Kernel",9);							\
   }									\
   };									\
   template <TYPE1 T1, TYPE2 T2>						\
@@ -482,7 +483,7 @@
 /// Describes a 2 template params UserBlackBox input (to be put inside the UBB description block)
 #define BBTK_TEMPLATE2_INPUT(CLASS,NAME,DESCR,TYPE)			\
   AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor		\
-		     (#NAME,DESCR,					\
+		     (typeid(CLASS ## Descriptor),#NAME,DESCR,					\
 		      new bbtk::UserBlackBoxTGetFunctor<CLASS<T1,T2>,TYPE,TYPE >	\
 		      (&CLASS<T1,T2>::bbGetInput##NAME),		\
 		      new bbtk::UserBlackBoxTSetFunctor<CLASS<T1,T2>,TYPE,TYPE >	\
@@ -493,7 +494,7 @@
 /// Describes a 2 template params UserBlackBox output (to be put inside the UBB description block)
 #define BBTK_TEMPLATE2_OUTPUT(CLASS,NAME,DESCR,TYPE)			\
   AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor		\
-		      (#NAME,DESCR,					\
+		      (typeid(CLASS ## Descriptor),#NAME,DESCR,				\
 		       new bbtk::UserBlackBoxTGetFunctor<CLASS<T1,T2>,TYPE,TYPE > \
 		       (&CLASS<T1,T2>::bbGetOutput##NAME),		\
 		       new bbtk::UserBlackBoxTSetFunctor<CLASS<T1,T2>,TYPE,TYPE > \