From: guigues Date: Tue, 8 Apr 2008 06:59:28 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.1~74 X-Git-Url: http://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=6c5d7746e8e4cb0b5d6e164b917008a7137910fb;p=bbtk.git *** empty log message *** --- diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp index 0d780403..a7b85338 100644 --- a/kernel/appli/bbfy/bbfy.cpp +++ b/kernel/appli/bbfy/bbfy.cpp @@ -87,6 +87,7 @@ private: { std::string name; std::string type; + std::string nature; std::string descr; std::string special; std::string generic_type; @@ -361,6 +362,11 @@ void bbfy::ParseXML() io.special = n.getAttribute("special"); } + if (n.isAttributeSet("nature")) + { + io.nature = n.getAttribute("nature"); + } + if (n.isAttributeSet("generic_type")) { io.generic_type = n.getAttribute("generic_type"); @@ -395,6 +401,11 @@ void bbfy::ParseXML() io.special = n.getAttribute("special"); } + if (n.isAttributeSet("nature")) + { + io.nature = n.getAttribute("nature"); + } + if (n.isAttributeSet("generic_type")) { io.generic_type = n.getAttribute("generic_type"); @@ -755,7 +766,8 @@ void bbfy::CreateHeader() mFile << "BBTK_INPUT("; } mFile << mName << "," << ioi->name << ",\"" - << ioi->descr << "\"," << ioi->type <<");\n"; + << ioi->descr << "\"," << ioi->type << ",\"" + << ioi->nature<<"\");\n"; } // Outputs @@ -770,7 +782,8 @@ void bbfy::CreateHeader() mFile << "BBTK_OUTPUT("; } mFile << mName << "," << ioi->name << ",\"" - << ioi->descr << "\"," << ioi->type <<");\n"; + << ioi->descr << "\"," << ioi->type << ",\"" + << ioi->nature<<"\");\n"; } // EO black box description diff --git a/kernel/src/bbtkAtomicBlackBox.cxx b/kernel/src/bbtkAtomicBlackBox.cxx index 3f46046d..981b16c1 100644 --- a/kernel/src/bbtkAtomicBlackBox.cxx +++ b/kernel/src/bbtkAtomicBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBox.cxx,v $ Language: C++ - Date: $Date: 2008/03/20 15:27:56 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/04/08 06:59:29 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -70,9 +70,17 @@ namespace bbtk IOStatus AtomicBlackBox::bbBackwardUpdate( Connection* caller ) { bbtkDebugMessageInc("Process",1, - "=> AtomicBlackBox::bbBackwardUpdate() [" - < AtomicBlackBox::bbBackwardUpdate(" + <<(caller?caller->GetFullName():"0")<<") [" + <(&BlackBox::bbGetInputBoxProcessMode), new bbtk::AtomicBlackBoxTSetFunctor(&BlackBox::bbSetInputBoxProcessMode) ) ); // Creates the input 'BoxExecute' @@ -56,7 +57,8 @@ namespace bbtk bbtk::AtomicBlackBoxInputDescriptor (typeid(AtomicBlackBoxDescriptor), "BoxExecute", - "Any signal received by this input executes the box", + "Any signal received by this input executes the box", + "", new bbtk::AtomicBlackBoxTGetFunctor(&BlackBox::bbGetInputBoxExecute), new bbtk::AtomicBlackBoxTSetFunctor(&BlackBox::bbSetInputBoxExecute) ) ); // Creates the output 'BoxChange' @@ -66,6 +68,7 @@ namespace bbtk (typeid(AtomicBlackBoxDescriptor), "BoxChange", "Signal modifications of the box", + "", new bbtk::AtomicBlackBoxTGetFunctor(&BlackBox::bbGetOutputBoxChange), new bbtk::AtomicBlackBoxTSetFunctor(&BlackBox::bbSetOutputBoxChange) ) ); // diff --git a/kernel/src/bbtkAtomicBlackBoxInputDescriptor.cxx b/kernel/src/bbtkAtomicBlackBoxInputDescriptor.cxx index b0c6e8c9..2cc605e7 100644 --- a/kernel/src/bbtkAtomicBlackBoxInputDescriptor.cxx +++ b/kernel/src/bbtkAtomicBlackBoxInputDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBoxInputDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/07 11:06:37 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:29 $ + 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 @@ -28,21 +28,26 @@ namespace bbtk AtomicBlackBoxInputDescriptor:: AtomicBlackBoxInputDescriptor( TypeInfo creator_type_info, - const std::string& name, - const std::string& description, - AtomicBlackBoxGetFunctor* getfunctor, - AtomicBlackBoxSetFunctor* setfunctor, - bool copy_construct) + const std::string& name, + const std::string& description, + const std::string& nature, + AtomicBlackBoxGetFunctor* getfunctor, + AtomicBlackBoxSetFunctor* setfunctor, + bool copy_construct) : BlackBoxInputDescriptor(creator_type_info, - name,description,MANDATORY,copy_construct), + name,description, + nature, + copy_construct, + MANDATORY), mGetFunctor(getfunctor), mSetFunctor(setfunctor) { bbtkDebugMessage("Kernel",9, "AtomicBlackBoxInputDescriptor::" <<"AtomicBlackBoxInputDescriptor(\"" - <GetTypeInfo(); } @@ -71,7 +72,7 @@ namespace bbtk private: /// Default ctor is private AtomicBlackBoxInputDescriptor() : - BlackBoxInputDescriptor(typeid(void),"","") {} + BlackBoxInputDescriptor(typeid(void),"","","") {} /// The functor on the Get method AtomicBlackBoxGetFunctor* mGetFunctor; /// The functor on the Set method diff --git a/kernel/src/bbtkAtomicBlackBoxMacros.h b/kernel/src/bbtkAtomicBlackBoxMacros.h index 46a6b954..605c10d0 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/03/03 14:15:52 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/04/08 06:59:29 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -271,12 +271,13 @@ AddToCategory("adaptor") //============================================================================ + //============================================================================ /// Describes a AtomicBlackBox input (to be put inside the UBB description block) -#define BBTK_INPUT(CLASS,NAME,DESCR,TYPE) \ +#define BBTK_INPUT(CLASS,NAME,DESCR,TYPE,NATURE) \ AddInputDescriptor(new bbtk::AtomicBlackBoxInputDescriptor \ (typeid(CLASS ## Descriptor), \ - #NAME,DESCR, \ + #NAME,DESCR,NATURE, \ new bbtk::AtomicBlackBoxTGetFunctor \ (&CLASS::bbGetInput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor \ @@ -285,20 +286,21 @@ //============================================================================ /// Describes a AtomicBlackBox output (to be put inside the UBB description block) -#define BBTK_OUTPUT(CLASS,NAME,DESCR,TYPE) \ +#define BBTK_OUTPUT(CLASS,NAME,DESCR,TYPE,NATURE) \ AddOutputDescriptor(new bbtk::AtomicBlackBoxOutputDescriptor \ - (typeid(CLASS ## Descriptor),#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR,NATURE, \ new bbtk::AtomicBlackBoxTGetFunctor \ (&CLASS::bbGetOutput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor \ (&CLASS::bbSetOutput##NAME) ) ) //============================================================================ + //============================================================================ /// Describes a AtomicBlackBox input (to be put inside the UBB description block) -#define BBTK_INPUT_NOCOPY(CLASS,NAME,DESCR,TYPE) \ +#define BBTK_INPUT_NOCOPY(CLASS,NAME,DESCR,TYPE,NATURE) \ AddInputDescriptor(new bbtk::AtomicBlackBoxInputDescriptor \ - (typeid(CLASS ## Descriptor),#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR,NATURE, \ new bbtk::AtomicBlackBoxTGetFunctor \ (&CLASS::bbGetInput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor \ @@ -308,9 +310,9 @@ //============================================================================ /// Describes a AtomicBlackBox output (to be put inside the UBB description block) -#define BBTK_OUTPUT_NOCOPY(CLASS,NAME,DESCR,TYPE) \ +#define BBTK_OUTPUT_NOCOPY(CLASS,NAME,DESCR,TYPE,NATURE) \ AddOutputDescriptor(new bbtk::AtomicBlackBoxOutputDescriptor \ - (typeid(CLASS ## Descriptor),#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR,NATURE, \ new bbtk::AtomicBlackBoxTGetFunctor \ (&CLASS::bbGetOutput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor \ @@ -368,7 +370,7 @@ /// Describes a template AtomicBlackBox input (to be put inside the template UBB description block) #define BBTK_TEMPLATE_INPUT(CLASS,NAME,DESCR,TYPE) \ AddInputDescriptor(new bbtk::AtomicBlackBoxInputDescriptor \ - (typeid(CLASS ## Descriptor),#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR,"", \ new bbtk::AtomicBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetInput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor,TYPE,TYPE > \ @@ -379,7 +381,7 @@ /// Describes a template AtomicBlackBox output (to be put inside the template UBB description block) #define BBTK_TEMPLATE_OUTPUT(CLASS,NAME,DESCR,TYPE) \ AddOutputDescriptor(new bbtk::AtomicBlackBoxOutputDescriptor \ - (typeid(CLASS ## Descriptor),#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR,"", \ new bbtk::AtomicBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetOutput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor,TYPE,TYPE > \ @@ -487,7 +489,7 @@ /// Describes a 2 template params AtomicBlackBox input (to be put inside the UBB description block) #define BBTK_TEMPLATE2_INPUT(CLASS,NAME,DESCR,TYPE) \ AddInputDescriptor(new bbtk::AtomicBlackBoxInputDescriptor \ - (typeid(CLASS ## Descriptor),#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR,"", \ new bbtk::AtomicBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetInput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor,TYPE,TYPE > \ @@ -498,7 +500,7 @@ /// Describes a 2 template params AtomicBlackBox output (to be put inside the UBB description block) #define BBTK_TEMPLATE2_OUTPUT(CLASS,NAME,DESCR,TYPE) \ AddOutputDescriptor(new bbtk::AtomicBlackBoxOutputDescriptor \ - (typeid(CLASS ## Descriptor),#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR,"", \ new bbtk::AtomicBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetOutput##NAME), \ new bbtk::AtomicBlackBoxTSetFunctor,TYPE,TYPE > \ diff --git a/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx index db79f8ff..ae0aa693 100644 --- a/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx +++ b/kernel/src/bbtkAtomicBlackBoxOutputDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkAtomicBlackBoxOutputDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/07 11:06:37 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:29 $ + 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 @@ -29,14 +29,16 @@ namespace bbtk AtomicBlackBoxOutputDescriptor:: AtomicBlackBoxOutputDescriptor( TypeInfo creator_type_info, - const std::string& name, - const std::string& description, - AtomicBlackBoxGetFunctor* getfunctor, - AtomicBlackBoxSetFunctor* setfunctor, - bool copy_construct ) + const std::string& name, + const std::string& description, + const std::string& nature, + AtomicBlackBoxGetFunctor* getfunctor, + AtomicBlackBoxSetFunctor* setfunctor, + bool copy_construct ) : BlackBoxOutputDescriptor(creator_type_info, - name,description,copy_construct), + name,description,nature, + copy_construct), mGetFunctor(getfunctor), mSetFunctor(setfunctor) { @@ -44,7 +46,8 @@ namespace bbtk bbtkDebugMessage("Kernel",9, "AtomicBlackBoxOutputDescriptor::AtomicBlackBoxOutputDescriptor(\"" < BlackBox::bbExecute() [" < bbmgExecutionList; -*/ + }; // Class BlackBox diff --git a/kernel/src/bbtkBlackBoxDescriptor.h b/kernel/src/bbtkBlackBoxDescriptor.h index 6443d50a..0b70d946 100644 --- a/kernel/src/bbtkBlackBoxDescriptor.h +++ b/kernel/src/bbtkBlackBoxDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxDescriptor.h,v $ Language: C++ - Date: $Date: 2008/03/07 08:40:14 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/04/08 06:59:29 $ + 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 @@ -54,9 +54,11 @@ namespace bbtk /// The kinds of black box typedef enum { - STANDARD, - ADAPTOR, - DEFAULT_ADAPTOR + STANDARD=0, + ADAPTOR=1, + DEFAULT_ADAPTOR=2, + WIDGET_ADAPTOR=3, + DEFAULT_WIDGET_ADAPTOR=4 } Kind; diff --git a/kernel/src/bbtkBlackBoxInputDescriptor.h b/kernel/src/bbtkBlackBoxInputDescriptor.h index 9481722b..c67c2e4b 100644 --- a/kernel/src/bbtkBlackBoxInputDescriptor.h +++ b/kernel/src/bbtkBlackBoxInputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxInputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/04/04 08:04:05 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:29 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -46,10 +46,13 @@ namespace bbtk BlackBoxInputDescriptor(TypeInfo creator_type_info, const std::string& name, const std::string& description, - OptionType option = MANDATORY, - bool copy_construct = true) + const std::string& nature, + bool copy_construct = true, + OptionType option = MANDATORY + ) : BlackBoxInputOutputDescriptor(creator_type_info,name, - description,copy_construct), + description,nature, + copy_construct), mOption(option) {} /// Returns the option of the input diff --git a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h index 4560950c..fc2f97e9 100644 --- a/kernel/src/bbtkBlackBoxInputOutputDescriptor.h +++ b/kernel/src/bbtkBlackBoxInputOutputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxInputOutputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/04/04 08:04:05 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:29 $ + 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 @@ -18,11 +18,11 @@ /** * \file - * \brief Class bbtk::BlackBoxInputOutputDescriptor : abstract descriptor of an input or an output of a black box (has a name, a description and type) + * \brief Class bbtk::BlackBoxInputOutputDescriptor : abstract descriptor of an input or an output of a black box (has a name, description, type and nature) */ /** * \class bbtk::BlackBoxInputOutputDescriptor - * \brief Abstract descriptor of an input or an output of a black box (has a name, a description and type) + * \brief Abstract descriptor of an input or an output of a black box (has a name, description, type and nature) */ #ifndef __bbtkBlackBoxInputOutputDescriptor_h__ @@ -42,23 +42,31 @@ namespace bbtk BlackBoxInputOutputDescriptor(TypeInfo creator_type_info, const std::string& name, const std::string& description, - bool copy_construct = true) + const std::string& nature, + bool copy_construct = true + ) : mCreatorTypeInfo(creator_type_info), mName(name), mDescription(description), + mNature(nature), mCopyConstruct(copy_construct) {} /// Returns the TypeInfo of the BlackBoxDescriptor which created this descriptor - TypeInfo GetCreatorTypeInfo() { return mCreatorTypeInfo; } + TypeInfo GetCreatorTypeInfo() const { return mCreatorTypeInfo; } /// Returns the name of the in/output const std::string& GetName() const { return mName; } /// Returns the description of the in/output const std::string& GetDescription() const { return mDescription; } + /// Returns the nature of the in/output + const std::string& GetNature() const { return mNature; } /// Returns the type of the in/output virtual TypeInfo GetTypeInfo() const = 0; /// Returns the name of the type of the in/output virtual std::string GetTypeName() const = 0; + /// Returns the DataInfo of the input (Type+Nature) + virtual DataInfo GetDataInfo() const + { return DataInfo(this->GetTypeInfo(),mNature); } /// Returns the name of the type of the in/output virtual std::string GetHumanTypeName() const = 0; /// Returns true iff the type is a pointer to class @@ -71,6 +79,7 @@ namespace bbtk /// Default ctor is reserved to children BlackBoxInputOutputDescriptor() : mCreatorTypeInfo(typeid(void)), mName(""), mDescription(""), + mNature(""), mCopyConstruct(true) {} private: @@ -81,6 +90,8 @@ namespace bbtk std::string mName; /// The description of the input/output std::string mDescription; + /// The nature of the input/output + std::string mNature; /// Does the in/output has to be copied by copy constructor /// default = true. Must be set to false if it is /// initialized by the user in bbUserCopyConstructor diff --git a/kernel/src/bbtkBlackBoxOutputDescriptor.h b/kernel/src/bbtkBlackBoxOutputDescriptor.h index cba3a638..8c799799 100644 --- a/kernel/src/bbtkBlackBoxOutputDescriptor.h +++ b/kernel/src/bbtkBlackBoxOutputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxOutputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/04/04 08:04:05 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:29 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -41,9 +41,11 @@ namespace bbtk BlackBoxOutputDescriptor( TypeInfo creator_type_info, const std::string& name, const std::string& description, + const std::string& nature, bool copy_construct = true) : BlackBoxInputOutputDescriptor(creator_type_info,name, description, + nature, copy_construct) {} diff --git a/kernel/src/bbtkComplexBlackBox.cxx b/kernel/src/bbtkComplexBlackBox.cxx index 8c54bc9d..012a03f2 100644 --- a/kernel/src/bbtkComplexBlackBox.cxx +++ b/kernel/src/bbtkComplexBlackBox.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBox.cxx,v $ Language: C++ -Date: $Date: 2008/03/07 10:21:30 $ -Version: $Revision: 1.7 $ +Date: $Date: 2008/04/08 06:59:29 $ +Version: $Revision: 1.8 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -231,6 +231,7 @@ namespace bbtk "ComplexBlackBox::bbExecute() [" <GetFullName()<<") [" + "ComplexBlackBox::bbBackwardUpdate(" + <<(caller?caller->GetFullName():"0")<<") [" <GetOutputDescriptorMap(); @@ -312,7 +327,22 @@ namespace bbtk BlackBox* b = bbUnsafeGetBlackBox ( d->GetTarget() ); // Calls BackwardUpdate on it bbtkDebugMessageInc("Process",2,"Internal box connected to output : "<GetTarget()<bbBackwardUpdate(caller); + // Because internal box can also be a complex box we have to + // temporarily change the connection BlackBoxFromOutput to the + // mapped one + + // std::string oldout = caller->GetBlackBoxFromOutput(); + // std::cout << "oldout = "<GetFullName()<<"' does not point to a valid output of the complex box !"); } bbtkDebugDecTab("Process",1); - return s; - } - //================================================================== - - /* - //================================================================== - void ComplexBlackBox::bbForwardUpdate(Connection* caller) - { - bbtkDebugMessageInc("Process",1, - "ComplexBlackBox::bbForwardUpdate("<GetFullName()<<") [" - <GetInputDescriptorMap(); - BlackBoxDescriptor::InputDescriptorMapType::const_iterator i - = imap.find(caller->GetBlackBoxToInput()); - if (i!=imap.end()) - { - // Cast the BBOutputDescriptor into a ComplexBBOutputDescriptor - ComplexBlackBoxInputDescriptor* d = - (ComplexBlackBoxInputDescriptor*)i->second; - // Get the internal box - BlackBox* b = bbUnsafeGetBlackBox ( d->GetTarget() ); - // Calls ForwardUpdate on it - bbtkDebugMessage("Process",2,"-> Internal box connected to input : "<GetTarget()<bbForwardUpdate(caller); - } - else - { - bbtkError("Connection '"<GetFullName()<<"' does not point to a valid input of the complex box !"); - } - bbtkDebugDecTab("Process",1); + bbSetExecuting(false); + + return s; } //================================================================== - */ //================================================================== @@ -955,10 +956,12 @@ namespace bbtk } // if parentblackbox } //========================================================================= + - /* + /* + //======================================================================= /// Generates the list of the packages of which its depends /// (cause an internal box belongs to it) diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index d9e8da14..e421055a 100644 --- a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/03/07 10:21:30 $ - Version: $Revision: 1.12 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.13 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -195,13 +195,16 @@ namespace bbtk <bbGetDescriptor()->GetInputDescriptor(input); AddInputDescriptor ( new ComplexBlackBoxInputDescriptor ( typeid(ComplexBlackBoxDescriptor), name, help, + d->GetNature(), box, input, - bb->bbGetInputType(input))); + d->GetTypeInfo())); bbtkDebugDecTab("Kernel",5); @@ -234,13 +237,16 @@ namespace bbtk <bbGetDescriptor()->GetOutputDescriptor(output); AddOutputDescriptor ( new ComplexBlackBoxOutputDescriptor ( typeid(ComplexBlackBoxDescriptor), name, help, + d->GetNature(), box, output, - bb->bbGetOutputType(output))); + d->GetTypeInfo())); bbtkDebugDecTab("Kernel",5); @@ -538,4 +544,5 @@ namespace bbtk + } diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.h b/kernel/src/bbtkComplexBlackBoxDescriptor.h index 27dcd4dd..4b76df5c 100644 --- a/kernel/src/bbtkComplexBlackBoxDescriptor.h +++ b/kernel/src/bbtkComplexBlackBoxDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxDescriptor.h,v $ Language: C++ - Date: $Date: 2008/03/07 10:21:30 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,7 +43,7 @@ namespace bbtk class BBTK_EXPORT ComplexBlackBoxDescriptor : public bbtk::BlackBoxDescriptor { public: - + friend class ComplexBlackBox; /// Default ctor with name ComplexBlackBoxDescriptor(const std::string& name); /// Default dtor @@ -82,6 +82,7 @@ namespace bbtk const std::string& output, const std::string& help); + /// Sets the name of the script file from which it is defined void SetScriptFileName(const std::string& n) { mScriptFileName = n; } /// Gets the name of the script file from which it is defined diff --git a/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx index f32344f3..11220aa7 100644 --- a/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx +++ b/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxInputDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/06 14:14:22 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,11 +31,12 @@ namespace bbtk ComplexBlackBoxInputDescriptor( TypeInfo creator_type_info, const std::string& name, const std::string& description, + const std::string& nature, const std::string& target, const std::string& input, TypeInfo type) : - BlackBoxInputDescriptor(creator_type_info,name,description), + BlackBoxInputDescriptor(creator_type_info,name,description,nature), mTarget(target), mInput(input), mType(type) diff --git a/kernel/src/bbtkComplexBlackBoxInputDescriptor.h b/kernel/src/bbtkComplexBlackBoxInputDescriptor.h index 99d029ce..80f409a5 100644 --- a/kernel/src/bbtkComplexBlackBoxInputDescriptor.h +++ b/kernel/src/bbtkComplexBlackBoxInputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxInputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/02/06 14:14:22 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -43,6 +43,7 @@ namespace bbtk ComplexBlackBoxInputDescriptor( TypeInfo creator_type_info, const std::string& name, const std::string& description, + const std::string& nature, const std::string& target, const std::string& input, TypeInfo type); @@ -66,7 +67,7 @@ namespace bbtk private: /// Default ctor is private ComplexBlackBoxInputDescriptor() : - BlackBoxInputDescriptor(typeid(void),"",""), + BlackBoxInputDescriptor(typeid(void),"","",""), mType(typeid(void)) {} std::string mTarget; std::string mInput; diff --git a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx index 504199a3..743fbeef 100644 --- a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx +++ b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxOutputDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/06 14:14:22 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -31,11 +31,12 @@ namespace bbtk ComplexBlackBoxOutputDescriptor( TypeInfo creator_type_info, const std::string& name, const std::string& description, + const std::string& nature, const std::string& target, const std::string& output, TypeInfo type) : - BlackBoxOutputDescriptor(creator_type_info,name,description), + BlackBoxOutputDescriptor(creator_type_info,name,description,nature), mTarget(target), mOutput(output), mType(type) diff --git a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.h b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.h index 62f2a9dc..0403a541 100644 --- a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.h +++ b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkComplexBlackBoxOutputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/02/06 14:14:22 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.3 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -44,6 +44,7 @@ namespace bbtk ComplexBlackBoxOutputDescriptor( TypeInfo creator_type_info, const std::string& name, const std::string& description, + const std::string& nature, const std::string& target, const std::string& output, TypeInfo type); @@ -68,7 +69,7 @@ namespace bbtk private: /// Default ctor is private ComplexBlackBoxOutputDescriptor() : - BlackBoxOutputDescriptor(typeid(void),"",""), + BlackBoxOutputDescriptor(typeid(void),"","",""), mType(typeid(void)) {} std::string mTarget; std::string mOutput; diff --git a/kernel/src/bbtkConnection.cxx b/kernel/src/bbtkConnection.cxx index 8d60b386..2c99b6e2 100644 --- a/kernel/src/bbtkConnection.cxx +++ b/kernel/src/bbtkConnection.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkConnection.cxx,v $ Language: C++ - Date: $Date: 2008/03/18 12:51:26 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -122,7 +122,13 @@ namespace bbtk //================================================================== - + void Connection::Clear() + { + mFrom = 0; + mTo = 0; + mAdaptor = 0; + } + //================================================================== /// Dtor Connection::~Connection() @@ -131,8 +137,8 @@ namespace bbtk "Connection::~Connection() [" <bbDisconnectOutput(mOutput,this); - mTo->bbDisconnectInput(mInput,this); + if (mFrom) mFrom->bbDisconnectOutput(mOutput,this); + if (mTo) mTo->bbDisconnectInput(mInput,this); if (mAdaptor) mAdaptor->bbDelete(); bbtkDebugDecTab("Kernel",7); diff --git a/kernel/src/bbtkConnection.h b/kernel/src/bbtkConnection.h index b75cb20d..47c8e92a 100644 --- a/kernel/src/bbtkConnection.h +++ b/kernel/src/bbtkConnection.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkConnection.h,v $ Language: C++ - Date: $Date: 2008/03/07 10:21:30 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -56,10 +56,12 @@ namespace bbtk /// Ctor Connection(BlackBox* from, const std::string& output, BlackBox* to, const std::string& input, - const Factory* f ); + const Factory* f); /// Dtor ~Connection(); + void Clear(); + /// Amont direction pipeline processing /// 1) call bbBackwardUpdate(this) on the upstream box /// 2) copies the upstream box output to the downstream box input adapting it if needed @@ -82,6 +84,8 @@ namespace bbtk /// Returns the input of the final black box of the connection const std::string& GetBlackBoxToInput() const { return mInput; } + /// Sets the output of the initial black box of the connection + void SetBlackBoxFromOutput(const std::string& o) { mOutput = o; } protected: /// Black box origin of the connection BlackBox* mFrom; diff --git a/kernel/src/bbtkData.h b/kernel/src/bbtkData.h index f473a027..9b93b57b 100644 --- a/kernel/src/bbtkData.h +++ b/kernel/src/bbtkData.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkData.h,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:30 $ + 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 @@ -17,260 +17,70 @@ =========================================================================*/ /** *\file - *\brief Defines Data and TypeInfo + *\brief Defines Data and DataInfo * * Data is bbtk general type exchanged between black boxes (adapted from boost::any). - * TypeInfo is the bbtk type of object storing informations on a data type (typedef on std::type_info). + * DataInfo is the bbtk type of object storing informations on a data type : includes C++ type info (std::type_info) and a string describing the "nature" of the data (what is the content of the structure). */ #ifndef __bbtkData_h__ #define __bbtkData_h__ -//#include "bbtkSystem.h" -//#include "bbtkMessageManager.h" -//#include -//#include - -//#include "bbtkany.h" - -//#include "bbtkReferenceCountedObject.h" #include "bbtkAny.h" +#include "bbtkRTTI.h" namespace bbtk { + /// The generic type of "data" exchanged between black boxes typedef any Data; - /* - - /// Can transport any kind of data (adaptation of boost::any) - class Data - { - public: // structors - - Data() - : content(0) - { - } - - template - Data(const ValueType & value) - : content(new holder(value)) - { - } - - Data(const Data & other) - : content(other.content ? other.content->clone() : 0) - { - } - - ~Data() - { - delete content; - } - - public: // modifiers - - Data & swap(Data & rhs) - { - std::swap(content, rhs.content); - return *this; - } - - template - Data & operator=(const ValueType & rhs) - { - Data(rhs).swap(*this); - return *this; - } - - Data & operator=(const Data & rhs) - { - Data(rhs).swap(*this); - return *this; - } - - public: // queries - - bool empty() const - { - return !content; - } - - const std::type_info & type() const - { - return content ? content->type() : typeid(void); - } - -#ifndef BBTK_NO_MEMBER_TEMPLATE_FRIENDS - private: // types -#else - public: // types (public so Data_cast can be non-friend) -#endif - - class placeholder - { - public: // structors - - virtual ~placeholder() - { - } - - public: // queries - - virtual const std::type_info & type() const = 0; - - virtual placeholder * clone() const = 0; - - }; - - template - class holder : public placeholder - { - public: // structors - - holder(const ValueType & value) - : held(value) - { - } - - public: // queries + /// Object storing informations on a data type : includes C++ type info (std::type_info) and a string describing the "nature" of the data (what is the content of the structure) + class DataInfo + { + public: + DataInfo( TypeInfo type, const std::string& nature="") + : mType(type), mNature(nature) + {} - virtual const std::type_info & type() const - { - return typeid(ValueType); - } + ~DataInfo() {} - virtual placeholder * clone() const - { - return new holder(held); - } + TypeInfo GetType() const { return mType; } + const std::string& GetNature() const { return mNature; } - public: // representation - - ValueType held; - - }; - -#ifndef BBTK_NO_MEMBER_TEMPLATE_FRIENDS - - private: // representation - - // template - // friend ValueType * Data_cast(Data *); - - template - friend ValueType * unsafe_Data_cast(Data *); - template - friend ValueType unsafe_Data_cast(Data &); - -#else - - public: // representation (public so Data_cast can be non-friend) - -#endif - - placeholder * content; - - }; + /// Equality + bool operator== ( const DataInfo& k ) const + { + return ( (mType == k.mType) && + (mNature == k.mNature) ); + } + /// Comparison + bool operator< ( const DataInfo& k ) const + { + return ( ( mType.before(k.mType) ) || + ( ( mType == k.mType ) && + ( mNature.compare(k.mNature) < 0 ) ) ); + } + + + private: + DataInfo() : mType(typeid(void)), mNature("") {} + TypeInfo mType; + std::string mNature; + + }; - class bad_Data_cast : public std::bad_cast - { - public: - virtual const char * what() const throw() - { - return "bbtk::bad_Data_cast: " - "failed conversion using bbtk::Data_cast"; - } - }; - */ - /* - template - ValueType * Data_cast(Data * operand) - { - return operand && operand->type() == typeid(ValueType) - ? &static_cast *>(operand->content)->held - : 0; - } - - template - const ValueType * Data_cast(const Data * operand) - { - return Data_cast(const_cast(operand)); - } - -// Removed Data_cast - template - ValueType Data_cast(const Data & operand) - { - typedef BBTK_DEDUCED_TYPENAME remove_reference::type nonref; - -#ifdef BBTK_NO_TEMPLATE_PARTIAL_SPECIALIZATION - // If 'nonref' is still reference type, it means the user has not - // specialized 'remove_reference'. - - // Please use BBTK_BROKEN_COMPILER_TYPE_TRAITS_SPECIALIZATION macro - // to generate specialization of remove_reference for your class - // See type traits library documentation for details - BBTK_STATIC_ASSERT(!is_reference::value); -#endif - - const nonref * result = Data_cast(&operand); - if(!result) - bbtk::throw_exception(bad_Data_cast()); - return *result; - } - - template - ValueType Data_cast(Data & operand) - { - typedef BBTK_DEDUCED_TYPENAME remove_reference::type nonref; - -#ifdef BBTK_NO_TEMPLATE_PARTIAL_SPECIALIZATION - // The comment in the above version of 'Data_cast' explains when this - // assert is fired and what to do. - BBTK_STATIC_ASSERT(!is_reference::value); -#endif - - nonref * result = Data_cast(&operand); - if(!result) - bbtk::throw_exception(bad_Data_cast()); - return *result; - } - */ - // Note: The "unsafe" versions of Data_cast are not part of the - // public interface and may be removed at Data time. They are - // required where we know what type is stored in the Data and can't - // use typeid() comparison, e.g., when our types may travel across - // different shared libraries. - // LG : This is precisely our case ! - /* - template - inline ValueType * unsafe_Data_cast(Data * operand) - { - return &static_cast *>(operand->content)->held; - } - - template - inline const ValueType * unsafe_Data_cast(const Data * operand) - { - return unsafe_Data_cast(const_cast(operand)); - } + + /// dump in a stream + inline std::ostream& operator<<(std::ostream& s, const DataInfo& d) + { + s << "<" << TypeName(d.GetType()) << "("<< d.GetNature()<<")>"; + return s; + } - template - inline ValueType unsafe_Data_cast(Data & operand) - { - return static_cast *>(operand.content)->held; - } - template - inline ValueType unsafe_Data_cast(const Data & operand) - { - return *unsafe_Data_cast(const_cast(&operand)); - } - */ }// namespace bbtk diff --git a/kernel/src/bbtkExecuter.cxx b/kernel/src/bbtkExecuter.cxx index 9be94bf1..3c7b04cf 100644 --- a/kernel/src/bbtkExecuter.cxx +++ b/kernel/src/bbtkExecuter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkExecuter.cxx,v $ $ Language: C++ - Date: $Date: 2008/03/26 08:27:19 $ - Version: $Revision: 1.15 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.16 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -232,6 +232,38 @@ namespace bbtk } //======================================================================= + //======================================================================= + void Executer::Kind(const std::string& kind) + { + if (kind=="ADAPTOR") + { + Current()->AddToCategory("adaptor"); + Current()->SetKind(bbtk::BlackBoxDescriptor::ADAPTOR); + } + else if (kind=="DEFAULT_ADAPTOR") + { + Current()->AddToCategory("adaptor"); + Current()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_ADAPTOR); + } + if (kind=="WIDGET_ADAPTOR") + { + Current()->AddToCategory("adaptor"); + Current()->SetKind(bbtk::BlackBoxDescriptor::WIDGET_ADAPTOR); + } + else if (kind=="DEFAULT_WIDGET_ADAPTOR") + { + Current()->AddToCategory("adaptor"); + Current()->SetKind(bbtk::BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR); + } + else + { + bbtkError("Unknown box kind : '"< with name - BlackBox* Factory::NewAdaptor(TypeInfo typein, - TypeInfo typeout, - const std::string& name) const + BlackBox* Factory::NewAdaptor(const DataInfo& typein, + const DataInfo& typeout, + const std::string& name) const { - bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor(<" - <,<" - <,\"" + bbtkDebugMessageInc("Kernel",8,"Factory::NewAdaptor(" + < to <" - < adaptor available"); + bbtkError("no "< with name + BlackBox* Factory::NewWidgetAdaptor(const DataInfo& typein, + const DataInfo& typeout, + const std::string& name) const + { + bbtkDebugMessageInc("Kernel",8,"Factory::NewWidgetAdaptor(<" + <,<" + <,\"" + <second.mPackage->NewWidgetAdaptor(typein, + typeout, + name); + if (b) break; + } + if (!b) + { + bbtkError("no "< widget adaptor available"); + } + + bbtkDebugDecTab("Kernel",7); + return b; + } + //=================================================================== + + //=================================================================== + /// Creates an instance of a black box of type with name + bool Factory::FindAdaptor(const DataInfo& typein, + const DataInfo& typeout, + std::string& adaptor) const + { + bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<" + <,<" + <)"<second.mPackage->FindAdaptor(typein, + typeout, + adaptor); + if (b) break; + } + /* + if (!b) + { + bbtkError("no "< widget adaptor available"); } + */ + + bbtkDebugDecTab("Kernel",7); + return b; + } + //=================================================================== + + //=================================================================== + /// Creates an instance of a black box of type with name + bool Factory::FindWidgetAdaptor(const DataInfo& typein, + const DataInfo& typeout, + std::string& adaptor) const + { + bbtkDebugMessageInc("Kernel",8,"Factory::FindWidgetAdaptor(<" + <,<" + <)"<second.mPackage->FindWidgetAdaptor(typein, + typeout, + adaptor); + if (b) break; + } + /* + if (!b) + { + bbtkError("no "< widget adaptor available"); + } + */ + bbtkDebugDecTab("Kernel",7); return b; } diff --git a/kernel/src/bbtkFactory.h b/kernel/src/bbtkFactory.h index 3150e6ea..34e435d3 100644 --- a/kernel/src/bbtkFactory.h +++ b/kernel/src/bbtkFactory.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkFactory.h,v $ Language: C++ - Date: $Date: 2008/03/28 13:42:17 $ - Version: $Revision: 1.11 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.12 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -46,6 +46,7 @@ namespace bbtk Factory(); ~Factory(); + void GetPackagesList(std::vector&); void LoadPackage( const std::string& name ); void UnLoadPackage( const std::string& name ); void PrintPackages(bool details = true, bool adaptors = false) const; @@ -62,9 +63,21 @@ namespace bbtk BlackBox* NewBlackBox(const std::string& type, const std::string& name) const; - BlackBox* NewAdaptor(TypeInfo typein, - TypeInfo typeout, + BlackBox* NewAdaptor(const DataInfo& typein, + const DataInfo& typeout, const std::string& name) const; + + BlackBox* NewWidgetAdaptor(const DataInfo& typein, + const DataInfo& typeout, + const std::string& name) const; + + bool FindAdaptor(const DataInfo& typein, + const DataInfo& typeout, + std::string& adaptor) const; + + bool FindWidgetAdaptor(const DataInfo& typein, + const DataInfo& typeout, + std::string& adaptor) const; Connection* NewConnection(BlackBox* from, const std::string& output, diff --git a/kernel/src/bbtkInterpreter.cxx b/kernel/src/bbtkInterpreter.cxx index d112dba1..c925050a 100644 --- a/kernel/src/bbtkInterpreter.cxx +++ b/kernel/src/bbtkInterpreter.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.cxx,v $ $ Language: C++ - Date: $Date: 2008/03/26 14:47:36 $ - Version: $Revision: 1.57 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.58 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -26,6 +26,7 @@ #include "bbtkMessageManager.h" #include "bbtkConfigurationFile.h" #include "bbtkUtilities.h" +#include "bbtkWxBlackBox.h" #include #include #ifdef CMAKE_HAVE_TERMIOS_H @@ -73,215 +74,231 @@ bufferNb =0; // Builds the commands dict CommandInfoType info; - info.category = "new"; + info.keyword = "new"; info.argmin = 2; info.argmax = 2; info.code = cNew; info.syntax = "new "; info.help = "Creates a new black box of type with name "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "delete"; + info.keyword = "delete"; info.argmin = 1; info.argmax = 1; info.code = cDelete; info.syntax = "delete "; info.help = "Deletes the black box of name "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "connect"; + info.keyword = "newgui"; + info.argmin = 2; + info.argmax = 2; + info.code = cNewGUI; + info.syntax = "newgui "; + info.help = "Automatically creates a graphical user interface with name for the black box and connects it to the box inputs"; + mCommandDict[info.keyword] = info; + + info.keyword = "connect"; info.argmin = 2; info.argmax = 2; info.code = cConnect; info.syntax = "connect "; info.help = "Connects the ouput of black box to the input of black box "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "print"; + info.keyword = "print"; info.argmin = 1; info.argmax = 1; info.code = cPrint; info.syntax = "print "; info.help = "Prints the string. Substitutes any token of the form '$box.output$' by the string adaptation of the output of the box (requires the right adaptor). No carriage return is issued at the end, use '\\n' to add carriage returns. The level of 'Echo' messages must be greater than 1 (see the command 'message')."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "exec"; + info.keyword = "exec"; info.argmin = 1; info.argmax = 2; info.code = cExec; info.syntax = "exec "; - info.help = "Executes the black box of name (and connected boxes if needed). If the special category 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode."; - mCommandDict[info.category] = info; + info.help = "Executes the black box of name (and connected boxes if needed). If the special keyword 'freeze' is given then freezes any further execution command. 'unfreeze' reverts to normal execution mode."; + mCommandDict[info.keyword] = info; - info.category = "package"; + info.keyword = "package"; info.argmin = 1; info.argmax = 1; info.code = cPackage; info.syntax = "package "; info.help = "Begins the definition of a package."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "endpackage"; + info.keyword = "endpackage"; info.argmin = 0; info.argmax = 0; info.code = cEndPackage; info.syntax = "endpackage"; info.help = "Ends the definition of a package."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "define"; + info.keyword = "define"; info.argmin = 1; info.argmax = 2; info.code = cDefine; info.syntax = "define []"; info.help = "Begins the definition of a new type of complex black box called . If if provided will create it in the given package."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "endefine"; + info.keyword = "endefine"; info.argmin = 0; info.argmax = 0; info.code = cEndDefine; info.syntax = "endefine"; info.help = "Ends the definition of a new type of complex black box"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "input"; + info.keyword = "kind"; + info.argmin = 1; + info.argmax = 1; + info.code = cKind; + info.syntax = "kind "; + info.help = "Sets the kind of the currently defined complex black box"; + mCommandDict[info.keyword] = info; + + info.keyword = "input"; info.argmin = 3; info.argmax = 3; info.code = cInput; info.syntax = "input "; info.help = "Defines the input of the current working black box as being an alias for the input of the black box . defines the help string for the newly created input"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "output"; + info.keyword = "output"; info.argmin = 3; info.argmax = 3; info.code = cOutput; info.syntax = "output "; info.help = "Defines the output of the current working black box as being an alias for the output of the black box . defines the help string for the newly created output"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "set"; + info.keyword = "set"; info.argmin = 2; info.argmax = 2; info.code = cSet; info.syntax = "set "; info.help = "Sets the value of the input of the black box to . There must exist a string to the value type adaptor"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "config"; // JPR + info.keyword = "config"; // JPR info.argmin = 0; info.argmax = 0; info.code = cConfig; info.syntax = "config"; info.help = "Prints the value of all configuration parameters"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "index"; // LG + info.keyword = "index"; // LG info.argmin = 0; info.argmax = 2; info.code = cIndex; info.syntax = "index [ ['Initials'(default)|'Packages'|'Categories'|'Adaptors']]"; info.help = "Creates an html index of known boxes. If filename is provided then save it to the file 'filename'. The default index entries are the initial letters of the names of the boxes. If 'Packages' or 'Categories' is provided then the entries are either the packages names or the categories. If 'Adaptors' is provided then an alphabetical index of all adaptors is created."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "reset"; + info.keyword = "reset"; info.argmin = 0; info.argmax = 0; info.code = cReset; info.syntax = "reset"; info.help = "Deletes all boxes and unloads all packages (bbi is reset to its start state)"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "author"; + info.keyword = "author"; info.argmin = 1; info.argmax = 1; info.code = cAuthor; info.syntax = "author "; info.help = "Adds the string to the author information of the black box being defined"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "category"; //JP + info.keyword = "category"; //JP info.argmin = 1; info.argmax = 1; info.code = cCategory; info.syntax = "category "; info.help = "Adds the string to the category information of the black box being defined"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "description"; + info.keyword = "description"; info.argmin = 1; info.argmax = 1; info.code = cDescription; info.syntax = "description "; info.help = "Adds the string to the descriptive information of the black box being defined"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "help"; + info.keyword = "help"; info.argmin = 0; info.argmax = 2; info.code = cHelp; info.syntax = "help"; info.syntax = "\n (1) help \n (2) help \n (3) help packages [all]\n (4) help [all]\n (5) help \n (6) help "; info.help = "Effect :\n (1) Lists all available commands;\n (2) Prints help on a particular command; \n (3) Lists the packages loaded and their black boxes.\n Add 'all' to list adaptors; \n (4) Prints short help on the black boxes of a package.\n Add 'all' to include adaptors; \n (5) Prints full help on a black box type; \n (6) Prints information on the inputs, outputs and connections of a black box instance."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "message"; + info.keyword = "message"; info.argmin = 0; info.argmax = 2; info.code = cMessage; info.syntax = "message "; - info.help = "Sets the level of the kind of messages to .\n If kind='All' then sets the level for all kinds. If no kind nor level is passed then prints info on available kinds of messages and their current level."; mCommandDict[info.category] = info; + info.help = "Sets the level of the kind of messages to .\n If kind='All' then sets the level for all kinds. If no kind nor level is passed then prints info on available kinds of messages and their current level."; mCommandDict[info.keyword] = info; - info.category = "include"; + info.keyword = "include"; info.argmin = 1; info.argmax = 2; info.code = cInclude; info.syntax = "include [source]"; info.help = "Includes the file .\n 'source' : If the keyword 'source' is provided then informs bbi that the included file is the source of the current box definition (Advanced; used to get the right 'Include' field in html doc of packages 'appli' scripts)."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "quit"; + info.keyword = "quit"; info.argmin = 0; info.argmax = 0; info.code = cQuit; info.syntax = "quit"; info.help = "Quits the program (during script execution it stops the complete execution)"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "load"; + info.keyword = "load"; info.argmin = 1; info.argmax = 1; info.code = cLoad; info.syntax = "load "; info.help = "Loads the black box package "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "unload"; + info.keyword = "unload"; info.argmin = 1; info.argmax = 1; info.code = cUnload; info.syntax = "unload "; info.help = "Unloads the black box package "; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; - info.category = "graph"; + info.keyword = "graph"; info.argmin = 0; info.argmax = 6; info.code = cGraph; info.syntax = "graph [ BlackBoxName [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]] \n graph [ BlackBoxNameType [ Detail 0..1 [ Level 0..99999 [ Output html file [ Custom header [ Custom title ]]]]]]"; info.help = "Shows a graphical view of a bbtk pipeline.\n- BlackBoxName : name of the box to view. Default '.' : current box.\n- BlackBoxNameType : name of the type of box to view, ex : 'workspace')"; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; /* - info.category = "workspace"; + info.keyword = "workspace"; info.argmin = 1; info.argmax = 2; info.code = cWorkspace; info.syntax = "workspace < ( freeze | unfreeze ) | ( rename ) >"; info.help = "Configures the workspace.\n 'freeze' allow to block execution commands while keeping definition commands active. 'unfreeze' turns back the worspace in 'normal' mode.\n 'rename' allow to set a new name to the workspace."; - mCommandDict[info.category] = info; + mCommandDict[info.keyword] = info; */ bbtkDebugDecTab("Interpreter",9); @@ -652,7 +669,7 @@ void Interpreter::InterpretLine( const std::string& line, bool &insideComment ) InterpretCommand(words,command); bbtkDebugMessage("Interpreter",9, - "Command='"< in; + Factory* F = mExecuter->GetFactory(); + if (F==0) + { + delete s; + bbtkError("Interpreter::CreateGUI : could not access the executer factory"); + } + Package* user = F->GetPackage("user"); + ComplexBlackBoxDescriptor* workspace + = (ComplexBlackBoxDescriptor*)user->GetBlackBoxMap().find("workspace")->second; + + BlackBox* box = workspace->GetPrototype()->bbGetBlackBox(boxname); + // BlackBox::InputConnectorMapType incm = box->bbGetInputConnectorMap(); + int nb = 0; + BlackBox::InputConnectorMapType::iterator i; + for (i=box->bbGetInputConnectorMap().begin(); + i!=box->bbGetInputConnectorMap().end(); + ++i) + { + // If the input is connected : continue + if (i->second->IsConnected()) continue; + // Get the input descriptor + const BlackBoxInputDescriptor* d = box->bbGetDescriptor()->GetInputDescriptor(i->first); + // If it is a "system" input : skip it + if ( ( d->GetCreatorTypeInfo() == typeid(AtomicBlackBoxDescriptor)) || + ( d->GetCreatorTypeInfo() == typeid(WxBlackBoxDescriptor)) ) + continue; + // try to find a widget adaptor + std::string adaptor; + if (F->FindWidgetAdaptor(DataInfo(typeid(Void),""), + d->GetDataInfo(), + adaptor)) + { + // store the input name + in.push_back(i->first); + // command to create the adaptor + (*s) << " new "<first<first<<" " + <first<<".Out "<first<first<<"'"<first<<".Label "<first<first<<".Widget layout.Widget"<first<<".BoxChange change.In"<FindAdaptor(DataInfo(typeid(std::string),""), + d->GetDataInfo(), + adaptor)) + { + // store the input name + in.push_back(i->first); + // command to create the adaptor + (*s) << " new InputText "<first<first<<" " + <first<<".Out "<first<first<<"'"<first<<".Title "<first<first<<".Widget layout.Widget"<first<<".BoxChange change.In"<::iterator j; + for (j=in.begin();j!=in.end();++j) + { + // connect + (*s) << "connect "<& commands ); - + /// Creates and connects the piece of pipeline which defines a GUI + /// for the box box. + /// Define it as a complex box type with name instanceName+"Type" + /// The instance is called instanceName + /// and connected to the existing pipeline + void NewGUI(const std::string& box, + const std::string& instanceName); private: diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx index cdc19203..c50abbd2 100644 --- a/kernel/src/bbtkPackage.cxx +++ b/kernel/src/bbtkPackage.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkPackage.cxx,v $ Language: C++ - Date: $Date: 2008/03/07 08:40:14 $ - Version: $Revision: 1.10 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See doc/license.txt or @@ -121,17 +121,18 @@ namespace bbtk //========================================================================== /// Creates an instance of an adaptor of input type and /// output type with name - BlackBox* Package::NewAdaptor(TypeInfo typein, - TypeInfo typeout, - const std::string& name) const + BlackBox* Package::NewAdaptor(const DataInfo& typein, + const DataInfo& typeout, + const std::string& name) const { bbtkDebugMessageInc("Kernel",8,"Package<"<::NewAdaptor(<" - <,<" - <,\"" + ">::NewAdaptor(" + < and + /// output type with name + BlackBox* Package::NewWidgetAdaptor(const DataInfo& typein, + const DataInfo& typeout, + const std::string& name) const + { + bbtkDebugMessageInc("Kernel",8,"Package<"<::NewWidgetAdaptor(" + <second->CreateInstance(name); + bbtkDebugDecTab("Kernel",8); + return bb; + + } + //========================================================================== + + //========================================================================== + /// Returns true is the package contains + /// an adaptor of input type and + /// output type + /// If successfull then adaptor contains the black box type name + bool Package::FindWidgetAdaptor(const DataInfo& typein, + const DataInfo& typeout, + std::string& adaptor) const + { + bbtkDebugMessageInc("Kernel",8,"Package<"<::FindWidgetAdaptor(" + <second->GetTypeName(); + bbtkDebugDecTab("Kernel",8); + return true; + + } + //========================================================================== + + + + //========================================================================== + /// Returns true is the package contains + /// an adaptor of input type and + /// output type + /// If successfull then adaptor contains the black box type name + bool Package::FindAdaptor(const DataInfo& typein, + const DataInfo& typeout, + std::string& adaptor) const + { + bbtkDebugMessageInc("Kernel",8,"Package<"<::FindAdaptor(" + <second->GetTypeName(); + bbtkDebugDecTab("Kernel",8); + return true; + + } + //========================================================================== //========================================================================== @@ -158,15 +245,22 @@ namespace bbtk d->SetPackage(this); // If it is a default adaptor, also register it in the adaptors map - if ( d->GetKind() == BlackBoxDescriptor::DEFAULT_ADAPTOR) + if ( (d->GetKind() == BlackBoxDescriptor::DEFAULT_ADAPTOR) || + (d->GetKind() == BlackBoxDescriptor::DEFAULT_WIDGET_ADAPTOR) ) { + bbtkDebugMessage("Kernel",8,"Package<"<::RegisterBlackBox(\""<GetTypeName()<<"\") : The box is an adaptor, inserting it in adaptors map ..."<GetInputDescriptor("In")->GetTypeInfo(); TypeInfo typeout = d->GetOutputDescriptor("Out")->GetTypeInfo(); - AdaptorKey key(typein,typeout); + DataInfo infoin(typein,d->GetInputDescriptor("In")->GetNature()); + DataInfo infoout(typeout,d->GetOutputDescriptor("Out")->GetNature()); + bbtkDebugMessage("Kernel",8,"LG Adaptor "<EndDefine( );" << std::endl; } + void Transcriptor::Kind(const std::string& kind) + { + m_Fp << " e->Kind( \""< WxBlackBox::bbBackwardUpdate(" + <<(caller?caller->GetFullName():"0")<<") [" + <GetBlackBoxFromOutput()!="Widget")) + ) + { + BlackBox::OutputConnectorMapType::const_iterator i + = bbGetOutputConnectorMap().find("Widget") ; + if ( + i->second->GetConnectionVector().size() != 0 ) + { + bbtkDebugMessage("Process",2, + "-> Output 'Widget' connected : transfering execution to parent" + <second->GetConnectionVector().front() + ->GetBlackBoxTo()->bbExecute(false); + done = true; + } + } + // call 'standard' BlackBox execution method + if (!done) + { + bbSetExecuting(false); + AtomicBlackBox::bbBackwardUpdate(caller); + } + + bbtkDebugMessageDec("Process",1, + "<= WxBlackBox::bbBackwardUpdate() [" + <InsertColumn( 1, _("Type"), wxLIST_FORMAT_LEFT, 100 ); - mInputList->InsertColumn( 2, _("Description"), + mInputList->InsertColumn( 2, _("Nature"), + wxLIST_FORMAT_LEFT, 100 ); + mInputList->InsertColumn( 3, _("Description"), wxLIST_FORMAT_LEFT, 500 ); mOutputList->ClearAll(); @@ -625,7 +627,9 @@ namespace bbtk wxLIST_FORMAT_LEFT, 80 ); mOutputList->InsertColumn( 1, _("Type"), wxLIST_FORMAT_LEFT, 100 ); - mOutputList->InsertColumn( 2, _("Description"), + mOutputList->InsertColumn( 2, _("Nature"), + wxLIST_FORMAT_LEFT, 100 ); + mOutputList->InsertColumn( 3, _("Description"), wxLIST_FORMAT_LEFT, 500 ); @@ -725,7 +729,8 @@ namespace bbtk l->InsertItem(kNewItem); l->SetItem(nID, 0, std2wx(d->GetName()) ); l->SetItem(nID, 1, std2wx(d->GetTypeName()) ); - l->SetItem(nID, 2, std2wx(d->GetDescription()) ); + l->SetItem(nID, 2, std2wx(d->GetNature()) ); + l->SetItem(nID, 3, std2wx(d->GetDescription()) ); } //================================================================ diff --git a/packages/itk/src/bbitkBinaryThresholdImageFilter.h b/packages/itk/src/bbitkBinaryThresholdImageFilter.h index 0ea322d3..d734f862 100644 --- a/packages/itk/src/bbitkBinaryThresholdImageFilter.h +++ b/packages/itk/src/bbitkBinaryThresholdImageFilter.h @@ -80,18 +80,18 @@ namespace bbitk BBTK_CATEGORY("filter;image"); BBTK_DESCRIPTION("Binarizes an image by thresholding (generic bbification of itk::BinaryThresholdImageFilter)"); BBTK_INPUT(BinaryThresholdImageFilterGeneric,In, - "Input image. Can be any itk::Image*",anyImagePointer); + "Input image. Can be any itk::Image*",anyImagePointer,""); BBTK_INPUT(BinaryThresholdImageFilterGeneric,LowerThreshold, - "Lower threshold",double); + "Lower threshold",double,""); BBTK_INPUT(BinaryThresholdImageFilterGeneric,UpperThreshold, - "Upper threshold",double); + "Upper threshold",double,""); BBTK_INPUT(BinaryThresholdImageFilterGeneric,InsideValue, - "Output value for pixels inside thresholds",double); + "Output value for pixels inside thresholds",double,""); BBTK_INPUT(BinaryThresholdImageFilterGeneric,OutsideValue, - "Output value for pixels outside thresholds",double); + "Output value for pixels outside thresholds",double,""); BBTK_OUTPUT(BinaryThresholdImageFilterGeneric,Out, "Output image. Of the same type and dimension than the input image", - anyImagePointer); + anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(BinaryThresholdImageFilterGeneric); diff --git a/packages/itk/src/bbitkExtractImageFilter.h b/packages/itk/src/bbitkExtractImageFilter.h index e6597613..b6de2d11 100644 --- a/packages/itk/src/bbitkExtractImageFilter.h +++ b/packages/itk/src/bbitkExtractImageFilter.h @@ -59,9 +59,9 @@ namespace bbitk BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr"); BBTK_CATEGORY("image;filter"); BBTK_DESCRIPTION("Decrease the image size by cropping the image to the selected region bounds (bbification of itk::ExtractImageFilter)"); - BBTK_INPUT(ExtractImageFilterGeneric,In,"Input image",anyImagePointer); - BBTK_INPUT(ExtractImageFilterGeneric,Region,"Extraction region",anyImageRegion); - BBTK_OUTPUT(ExtractImageFilterGeneric,Out,"Output image",anyImagePointer); + BBTK_INPUT(ExtractImageFilterGeneric,In,"Input image",anyImagePointer,""); + BBTK_INPUT(ExtractImageFilterGeneric,Region,"Extraction region",anyImageRegion,""); + BBTK_OUTPUT(ExtractImageFilterGeneric,Out,"Output image",anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(ExtractImageFilterGeneric); void ExtractImageFilterGeneric::ProcessSwitch() { diff --git a/packages/itk/src/bbitkImageProperties.h b/packages/itk/src/bbitkImageProperties.h index 786fa536..e2987999 100644 --- a/packages/itk/src/bbitkImageProperties.h +++ b/packages/itk/src/bbitkImageProperties.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkImageProperties.h,v $ Language: C++ - Date: $Date: 2008/02/07 07:58:54 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -67,13 +67,13 @@ namespace bbitk BBTK_AUTHOR("laurent.guigues at creatis.insa-lyon.fr"); BBTK_CATEGORY("image"); BBTK_DESCRIPTION("Outputs different properties of an image (type, dimension, size, spacing, ...)"); - BBTK_INPUT(ImageProperties,In,"Input image",anyImagePointer); - BBTK_OUTPUT(ImageProperties,TypeName,"Pixel type name",std::string); - BBTK_OUTPUT(ImageProperties,Dimension,"Dimension",unsigned int); - BBTK_OUTPUT(ImageProperties,LargestPossibleRegion,"Global extent of the image",anyImageRegion); - BBTK_OUTPUT(ImageProperties,Index,"Origin of the image",std::vector); - BBTK_OUTPUT(ImageProperties,Size,"Size in each dimension",std::vector); - BBTK_OUTPUT(ImageProperties,Spacing,"Size of the voxels",std::vector); + BBTK_INPUT(ImageProperties,In,"Input image",anyImagePointer,""); + BBTK_OUTPUT(ImageProperties,TypeName,"Pixel type name",std::string,"pixel type"); + BBTK_OUTPUT(ImageProperties,Dimension,"Dimension",unsigned int,"image dimension"); + BBTK_OUTPUT(ImageProperties,LargestPossibleRegion,"Global extent of the image",anyImageRegion,""); + BBTK_OUTPUT(ImageProperties,Index,"Origin of the image",std::vector,"image index"); + BBTK_OUTPUT(ImageProperties,Size,"Size in each dimension",std::vector,"image size"); + BBTK_OUTPUT(ImageProperties,Spacing,"Size of the voxels",std::vector,"voxel size"); BBTK_END_DESCRIBE_BLACK_BOX(ImageProperties); //================================================================= diff --git a/packages/itk/src/bbitkImageReader.h b/packages/itk/src/bbitkImageReader.h index 2ad0f06c..4a171525 100644 --- a/packages/itk/src/bbitkImageReader.h +++ b/packages/itk/src/bbitkImageReader.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkImageReader.h,v $ Language: C++ - Date: $Date: 2008/02/07 07:58:54 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -61,8 +61,8 @@ namespace bbitk BBTK_CATEGORY("image;read/write"); BBTK_DESCRIPTION("Generic itk image reader"); BBTK_INPUT(ImageReader,Filename, - "filename with complete path",std::string); - BBTK_OUTPUT(ImageReader,Out,"Output image",anyImagePointer); + "filename with complete path",std::string,"file name"); + BBTK_OUTPUT(ImageReader,Out,"Output image",anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(ImageReader); //================================================================= diff --git a/packages/itk/src/bbitkImageRegion.h b/packages/itk/src/bbitkImageRegion.h index 189067b9..fdcf5890 100644 --- a/packages/itk/src/bbitkImageRegion.h +++ b/packages/itk/src/bbitkImageRegion.h @@ -64,10 +64,10 @@ namespace bbitk BBTK_CATEGORY("image"); typedef std::vector vectoroflong; BBTK_INPUT(ImageRegionCreator,Index,"Vector of region indices", - vectoroflong); + vectoroflong,"image index"); BBTK_INPUT(ImageRegionCreator,Size,"Vector of region sizes", - vectoroflong); - BBTK_OUTPUT(ImageRegionCreator,Out,"Output generic region",anyImageRegion); + vectoroflong,"image size"); + BBTK_OUTPUT(ImageRegionCreator,Out,"Output generic region",anyImageRegion,""); BBTK_END_DESCRIBE_BLACK_BOX(ImageRegionCreator); } // namespace bbitk diff --git a/packages/itk/src/bbitkImageSeriesReader.h b/packages/itk/src/bbitkImageSeriesReader.h index 34a1b7a2..5798b7a7 100644 --- a/packages/itk/src/bbitkImageSeriesReader.h +++ b/packages/itk/src/bbitkImageSeriesReader.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkImageSeriesReader.h,v $ Language: C++ - Date: $Date: 2008/02/07 07:58:55 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:30 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -63,8 +63,8 @@ namespace bbitk BBTK_CATEGORY("image;read/write"); typedef std::vector vectorofstring; BBTK_INPUT(ImageSeriesReader,FileNames, - "vector of file names with complete paths",vectorofstring); - BBTK_OUTPUT(ImageSeriesReader,Out,"Output itk::image with type T and dimension D determined by the content of the files",anyImagePointer); + "vector of file names with complete paths",vectorofstring,"file names list"); + BBTK_OUTPUT(ImageSeriesReader,Out,"Output itk::image with type T and dimension D determined by the content of the files",anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(ImageSeriesReader); //================================================================= diff --git a/packages/itk/src/bbitkImageWriter.h b/packages/itk/src/bbitkImageWriter.h index 64577605..d4fa74b1 100644 --- a/packages/itk/src/bbitkImageWriter.h +++ b/packages/itk/src/bbitkImageWriter.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkImageWriter.h,v $ Language: C++ - Date: $Date: 2008/02/07 07:58:55 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:31 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -61,8 +61,8 @@ namespace bbitk BBTK_DESCRIPTION("Generic itk image writer"); BBTK_CATEGORY("image;read/write"); BBTK_INPUT(ImageWriter,Filename, - "filename with complete path",std::string); - BBTK_INPUT(ImageWriter,In,"Image to write",anyImagePointer); + "filename with complete path",std::string,"file name"); + BBTK_INPUT(ImageWriter,In,"Image to write",anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(ImageWriter); //================================================================= diff --git a/packages/itk/src/bbitkResampleImageFilter.h b/packages/itk/src/bbitkResampleImageFilter.h index 5d87c97b..8c9ed215 100644 --- a/packages/itk/src/bbitkResampleImageFilter.h +++ b/packages/itk/src/bbitkResampleImageFilter.h @@ -39,14 +39,14 @@ namespace bbitk BBTK_DESCRIPTION("Resamples an image"); BBTK_CATEGORY("image;filter"); BBTK_INPUT(ResampleImageFilter,In, - "Input image. Can be any itk::Image*",anyImagePointer); + "Input image. Can be any itk::Image*",anyImagePointer,""); BBTK_INPUT(ResampleImageFilter,Spacing, - "Spacing",std::vector); + "Spacing",std::vector,"spacing"); BBTK_INPUT(ResampleImageFilter,Interpolation, - "Interpolation",std::string); + "Interpolation",std::string,""); BBTK_OUTPUT(ResampleImageFilter,Out, "Output image. Of the same type and dimension than the input image", - anyImagePointer); + anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(ResampleImageFilter); diff --git a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h index 35238a5b..e0a21c3b 100644 --- a/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h +++ b/packages/itkvtk/src/bbitkvtkitkImage2vtkImageData.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkitkImage2vtkImageData.h,v $ Language: C++ - Date: $Date: 2008/03/03 11:49:17 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:31 $ + 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 @@ -64,10 +64,10 @@ namespace bbitkvtk BBTK_DESCRIPTION("Converts a generic itkImage to a vtkImageData"); BBTK_DEFAULT_ADAPTOR(); BBTK_INPUT(itkImage2vtkImageData,In, - "Input itkImage",bbitk::anyImagePointer); + "Input itkImage",bbitk::anyImagePointer,""); BBTK_OUTPUT(itkImage2vtkImageData,Out, "Output vtkImageData", - vtkImageData*); + vtkImageData*,""); BBTK_END_DESCRIBE_BLACK_BOX(itkImage2vtkImageData); //================================================================= diff --git a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h index 9467881b..94fc7ce2 100644 --- a/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h +++ b/packages/itkvtk/src/bbitkvtkvtkImageData2itkImage.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbitkvtkvtkImageData2itkImage.h,v $ Language: C++ - Date: $Date: 2008/03/03 11:49:18 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:31 $ + 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 @@ -61,10 +61,10 @@ namespace bbitkvtk BBTK_DESCRIPTION("Converts a vtkImageData* to a generic itkImage pointer"); BBTK_DEFAULT_ADAPTOR(); BBTK_INPUT(vtkImageData2itkImage,In, - "Input vtkImageData",vtkImageData*); + "Input vtkImageData",vtkImageData*,""); BBTK_OUTPUT(vtkImageData2itkImage,Out, "Output itkImage", - bbitk::anyImagePointer); + bbitk::anyImagePointer,""); BBTK_END_DESCRIBE_BLACK_BOX(vtkImageData2itkImage); //================================================================= diff --git a/packages/std/src/bbstdASCII.h b/packages/std/src/bbstdASCII.h index 1144e71b..13cee0e3 100644 --- a/packages/std/src/bbstdASCII.h +++ b/packages/std/src/bbstdASCII.h @@ -29,11 +29,11 @@ virtual void bbUserDestructor(); BBTK_BEGIN_DESCRIBE_BLACK_BOX(ASCII,bbtk::AtomicBlackBox); BBTK_NAME("ASCII"); BBTK_AUTHOR("eduardo.davila [at] creatis.insa-lyon.fr"); - BBTK_DESCRIPTION("ascii to string - string to ascii"); - BBTK_CATEGORY("__CATEGORY__"); - BBTK_INPUT(ASCII,In,"Input Ascii number or Ascii",std::string); - BBTK_INPUT(ASCII,type,"type (default 0) 0=AsciiNum_To_String, 1=String_To_AsciiNum",int); - BBTK_OUTPUT(ASCII,Out,"Ascii number or Ascii",std::string); + BBTK_DESCRIPTION("ascii codes sequence to string - string to ascii codes sequence"); + BBTK_CATEGORY("misc"); + BBTK_INPUT(ASCII,In,"Input Ascii code or Ascii character",std::string,""); + BBTK_INPUT(ASCII,type,"type (default 0) 0=Ascii codes to string, 1=String to ascii codes",int,""); + BBTK_OUTPUT(ASCII,Out,"Ascii codes sequence or characters sequence",std::string,""); BBTK_END_DESCRIBE_BLACK_BOX(ASCII); } // EO namespace bbstd diff --git a/packages/std/src/bbstdConcatStrings.h b/packages/std/src/bbstdConcatStrings.h index 78e55d44..38a27588 100644 --- a/packages/std/src/bbstdConcatStrings.h +++ b/packages/std/src/bbstdConcatStrings.h @@ -33,17 +33,17 @@ namespace bbstd BBTK_AUTHOR("jean-pierre.roux@creatis.insa-lyon.fr"); BBTK_CATEGORY("misc"); BBTK_DESCRIPTION("String concatenation"); - BBTK_INPUT(ConcatStrings,In1, "String 1", std::string); - BBTK_INPUT(ConcatStrings,In2, "String 2", std::string); - BBTK_INPUT(ConcatStrings,In3, "String 3", std::string); - BBTK_INPUT(ConcatStrings,In4, "String 4", std::string); - BBTK_INPUT(ConcatStrings,In5, "String 5", std::string); - BBTK_INPUT(ConcatStrings,In6, "String 6", std::string); - BBTK_INPUT(ConcatStrings,In7, "String 7", std::string); - BBTK_INPUT(ConcatStrings,In8, "String 8", std::string); - BBTK_INPUT(ConcatStrings,In9, "String 9", std::string); - BBTK_INPUT(ConcatStrings,In10,"String 10",std::string); - BBTK_OUTPUT(ConcatStrings,Out,"Concatenated string",std::string); + BBTK_INPUT(ConcatStrings,In1, "String 1", std::string,""); + BBTK_INPUT(ConcatStrings,In2, "String 2", std::string,""); + BBTK_INPUT(ConcatStrings,In3, "String 3", std::string,""); + BBTK_INPUT(ConcatStrings,In4, "String 4", std::string,""); + BBTK_INPUT(ConcatStrings,In5, "String 5", std::string,""); + BBTK_INPUT(ConcatStrings,In6, "String 6", std::string,""); + BBTK_INPUT(ConcatStrings,In7, "String 7", std::string,""); + BBTK_INPUT(ConcatStrings,In8, "String 8", std::string,""); + BBTK_INPUT(ConcatStrings,In9, "String 9", std::string,""); + BBTK_INPUT(ConcatStrings,In10,"String 10",std::string,""); + BBTK_OUTPUT(ConcatStrings,Out,"Concatenated string",std::string,""); BBTK_END_DESCRIBE_BLACK_BOX(ConcatStrings); } diff --git a/packages/std/src/bbstdConfiguration.h b/packages/std/src/bbstdConfiguration.h index 00c89964..c85ff384 100644 --- a/packages/std/src/bbstdConfiguration.h +++ b/packages/std/src/bbstdConfiguration.h @@ -28,11 +28,11 @@ namespace bbstd BBTK_AUTHOR("jpr@creatis.insa-lyon.fr"); BBTK_CATEGORY("misc"); BBTK_DESCRIPTION("Gets configuration informations"); - BBTK_OUTPUT(Configuration,BinPath,"Binaries path",std::string); - BBTK_OUTPUT(Configuration,DataPath,"Data path",std::string); - BBTK_OUTPUT(Configuration,DocPath,"Documentation path",std::string); - BBTK_OUTPUT(Configuration,FileSeparator,"/ or \\",std::string); - BBTK_OUTPUT(Configuration,SystemType,"0=Linux 1=Windows",int); + BBTK_OUTPUT(Configuration,BinPath,"Binaries path",std::string,"directory name"); + BBTK_OUTPUT(Configuration,DataPath,"Data path",std::string,"directory name"); + BBTK_OUTPUT(Configuration,DocPath,"Documentation path",std::string,"directory name"); + BBTK_OUTPUT(Configuration,FileSeparator,"/ or \\",std::string,""); + BBTK_OUTPUT(Configuration,SystemType,"0=Linux 1=Windows",int,""); BBTK_END_DESCRIBE_BLACK_BOX(Configuration); } // EO namespace bbstd diff --git a/packages/std/src/bbstdExecBbiCommand.h b/packages/std/src/bbstdExecBbiCommand.h index 40b6da56..27188484 100755 --- a/packages/std/src/bbstdExecBbiCommand.h +++ b/packages/std/src/bbstdExecBbiCommand.h @@ -25,7 +25,7 @@ namespace bbstd BBTK_NAME("ExecBbiCommand"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Executes bbi commands"); - BBTK_INPUT(ExecBbiCommand,In,"bbi commands separated by ';' , use '' to indicate strings ex. help 'graph' ",std::string); + BBTK_INPUT(ExecBbiCommand,In,"bbi commands separated by ';' , use '' to indicate strings ex. help 'graph' ",std::string,""); // BBTK_OUTPUT(ExecBbiCommand,Out,"Concatenated string",std::string); BBTK_END_DESCRIBE_BLACK_BOX(ExecBbiCommand); diff --git a/packages/std/src/bbstdExecSystemCommand.h b/packages/std/src/bbstdExecSystemCommand.h index cc7f72a1..e3b6ba1e 100755 --- a/packages/std/src/bbstdExecSystemCommand.h +++ b/packages/std/src/bbstdExecSystemCommand.h @@ -25,7 +25,7 @@ namespace bbstd BBTK_NAME("ExecSystemCommand"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Execute bbi commands"); - BBTK_INPUT(ExecSystemCommand,In,"bbi commands separated by ';' , use '' to indicate strings ex. help 'graph' ",std::string); + BBTK_INPUT(ExecSystemCommand,In,"bbi commands separated by ';' , use '' to indicate strings ex. help 'graph' ",std::string,""); // BBTK_OUTPUT(ExecSystemCommand,Out,"Concatenated string",std::string); BBTK_END_DESCRIBE_BLACK_BOX(ExecSystemCommand); diff --git a/packages/std/src/bbstdMagicBox.h b/packages/std/src/bbstdMagicBox.h index 79f575e3..561e37b4 100644 --- a/packages/std/src/bbstdMagicBox.h +++ b/packages/std/src/bbstdMagicBox.h @@ -71,14 +71,14 @@ namespace bbstd AddInputDescriptor (new bbtk::AtomicBlackBoxInputDescriptor (typeid(MagicBoxDescriptor), - "In","Input data", + "In","Input data","", new bbtk::AtomicBlackBoxTGetFunctor (&MagicBox::bbGetInputIn), new MagicBoxSetFunctor (&MagicBox::bbSetInputIn) ) ); AddOutputDescriptor (new bbtk::AtomicBlackBoxOutputDescriptor (typeid(MagicBoxDescriptor), - "Out","Output data", + "Out","Output data","", new bbtk::AtomicBlackBoxTGetFunctor (&MagicBox::bbGetOutputOut), new MagicBoxSetFunctor (&MagicBox::bbSetOutputOut) ) ); diff --git a/packages/std/src/bbstdMakeFileName.h b/packages/std/src/bbstdMakeFileName.h index c370742a..af944629 100644 --- a/packages/std/src/bbstdMakeFileName.h +++ b/packages/std/src/bbstdMakeFileName.h @@ -27,11 +27,11 @@ namespace bbstd BBTK_AUTHOR("jpr@creatis.insa-lyon.fr"); BBTK_CATEGORY("misc"); BBTK_DESCRIPTION("Makes a kosher file name"); - BBTK_INPUT(MakeFileName,Directory,"Directory Name",std::string); - BBTK_INPUT(MakeFileName,File,"File Name",std::string); - BBTK_INPUT(MakeFileName,Extent,"Extention",std::string); + BBTK_INPUT(MakeFileName,Directory,"Directory Name",std::string,"directory name"); + BBTK_INPUT(MakeFileName,File,"File Name",std::string,"file name"); + BBTK_INPUT(MakeFileName,Extent,"Extention",std::string,"file extension"); - BBTK_OUTPUT(MakeFileName,Out,"Full File Name",std::string); + BBTK_OUTPUT(MakeFileName,Out,"Full File Name",std::string,"file name"); BBTK_END_DESCRIBE_BLACK_BOX(MakeFileName); } diff --git a/packages/std/src/bbstdStringSelect.h b/packages/std/src/bbstdStringSelect.h index fe088519..8bafeba5 100644 --- a/packages/std/src/bbstdStringSelect.h +++ b/packages/std/src/bbstdStringSelect.h @@ -38,18 +38,18 @@ namespace bbstd BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); BBTK_CATEGORY("misc"); BBTK_DESCRIPTION("Outputs the string set to the ith input Ini (In0 ... In9) according to the value of the input In, hence selects a string according to an index."); - BBTK_INPUT(StringSelect,In,"Index of the string to select",int); - BBTK_INPUT(StringSelect,In0,"String of index 0",std::string); - BBTK_INPUT(StringSelect,In1,"String of index 1",std::string); - BBTK_INPUT(StringSelect,In2,"String of index 2",std::string); - BBTK_INPUT(StringSelect,In3,"String of index 3",std::string); - BBTK_INPUT(StringSelect,In4,"String of index 4",std::string); - BBTK_INPUT(StringSelect,In5,"String of index 4",std::string); - BBTK_INPUT(StringSelect,In6,"String of index 6",std::string); - BBTK_INPUT(StringSelect,In7,"String of index 7",std::string); - BBTK_INPUT(StringSelect,In8,"String of index 8",std::string); - BBTK_INPUT(StringSelect,In9,"String of index 9",std::string); - BBTK_OUTPUT(StringSelect,Out,"Selected string",std::string); + BBTK_INPUT(StringSelect,In,"Index of the string to select",int,""); + BBTK_INPUT(StringSelect,In0,"String of index 0",std::string,""); + BBTK_INPUT(StringSelect,In1,"String of index 1",std::string,""); + BBTK_INPUT(StringSelect,In2,"String of index 2",std::string,""); + BBTK_INPUT(StringSelect,In3,"String of index 3",std::string,""); + BBTK_INPUT(StringSelect,In4,"String of index 4",std::string,""); + BBTK_INPUT(StringSelect,In5,"String of index 4",std::string,""); + BBTK_INPUT(StringSelect,In6,"String of index 6",std::string,""); + BBTK_INPUT(StringSelect,In7,"String of index 7",std::string,""); + BBTK_INPUT(StringSelect,In8,"String of index 8",std::string,""); + BBTK_INPUT(StringSelect,In9,"String of index 9",std::string,""); + BBTK_OUTPUT(StringSelect,Out,"Selected string",std::string,""); BBTK_END_DESCRIBE_BLACK_BOX(StringSelect); //======================================================================= diff --git a/packages/vtk/src/bbvtkImagePlanes.h b/packages/vtk/src/bbvtkImagePlanes.h index a4f12a2e..863ca66a 100644 --- a/packages/vtk/src/bbvtkImagePlanes.h +++ b/packages/vtk/src/bbvtkImagePlanes.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbvtkImagePlanes.h,v $ Language: C++ - Date: $Date: 2008/04/01 14:26:22 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:32 $ + 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 @@ -84,10 +84,10 @@ namespace bbvtk BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Creates three 3D planes with the input image mapped onto with which the user can interact. The output vtkImagePlaneWidget objects are to be inserted into a 3D scene (e.g. a Viewer3D)"); BBTK_CATEGORY("3D object creator"); - BBTK_INPUT(ImagePlanes,In,"Input Image",vtkImageData *); - BBTK_OUTPUT(ImagePlanes,PlaneX,"The image plane in X direction",vtkImagePlaneWidget*); - BBTK_OUTPUT(ImagePlanes,PlaneY,"The image plane in Y direction",vtkImagePlaneWidget*); - BBTK_OUTPUT(ImagePlanes,PlaneZ,"The image plane in Z direction",vtkImagePlaneWidget*); + BBTK_INPUT(ImagePlanes,In,"Input Image",vtkImageData *,""); + BBTK_OUTPUT(ImagePlanes,PlaneX,"The image plane in X direction",vtkImagePlaneWidget*,""); + BBTK_OUTPUT(ImagePlanes,PlaneY,"The image plane in Y direction",vtkImagePlaneWidget*,""); + BBTK_OUTPUT(ImagePlanes,PlaneZ,"The image plane in Z direction",vtkImagePlaneWidget*,""); BBTK_END_DESCRIBE_BLACK_BOX(ImagePlanes); //================================================================= diff --git a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h index 71b8f1a2..5cebfec8 100644 --- a/packages/vtk/src/bbvtkIsoSurfaceExtractor.h +++ b/packages/vtk/src/bbvtkIsoSurfaceExtractor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbvtkIsoSurfaceExtractor.h,v $ Language: C++ - Date: $Date: 2008/03/19 13:30:18 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/04/08 06:59:32 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -84,13 +84,13 @@ namespace bbvtk BBTK_DESCRIPTION("Extracts an iso-surface of a 3D image and creates a vtkProp3D object to insert into a 3D scene (e.g. a Viewer3D)"); typedef std::vector vectorcolour; BBTK_CATEGORY("3D object creator"); - BBTK_INPUT(IsoSurfaceExtractor,In,"Input image",vtkImageData*); + BBTK_INPUT(IsoSurfaceExtractor,In,"Input image",vtkImageData*,""); // BBTK_INPUT(IsoSurfaceExtractor,InVtkObject,"Image vtkObject",vtkObject*); - BBTK_INPUT(IsoSurfaceExtractor,Isovalue,"Isovalue",double); - BBTK_INPUT(IsoSurfaceExtractor,Opacity,"Opacity",double); - BBTK_INPUT(IsoSurfaceExtractor,Colour,"r g b",vectorcolour); + BBTK_INPUT(IsoSurfaceExtractor,Isovalue,"Isovalue",double,""); + BBTK_INPUT(IsoSurfaceExtractor,Opacity,"Opacity",double,""); + BBTK_INPUT(IsoSurfaceExtractor,Colour,"r g b",vectorcolour,"color"); // BBTK_INPUT(IsoSurfaceExtractor,Renderer,"3D scene in which to insert the surface",vtkRenderer*); - BBTK_OUTPUT(IsoSurfaceExtractor,Out,"Extracted iso-surface",vtkProp3D *); + BBTK_OUTPUT(IsoSurfaceExtractor,Out,"Extracted iso-surface",vtkProp3D *,""); BBTK_END_DESCRIBE_BLACK_BOX(IsoSurfaceExtractor); diff --git a/packages/vtk/src/bbvtkMIPCreator.h b/packages/vtk/src/bbvtkMIPCreator.h index 3d1bd4af..cf04d795 100644 --- a/packages/vtk/src/bbvtkMIPCreator.h +++ b/packages/vtk/src/bbvtkMIPCreator.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbvtkMIPCreator.h,v $ Language: C++ - Date: $Date: 2008/03/19 13:30:18 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:32 $ + 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 @@ -81,10 +81,10 @@ namespace bbvtk BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Creates a Maximum Intensity Projection (MIP) view of a 3D image. Creates a vtkProp3D object to insert into a 3D scene (e.g. a Viewer3D)"); BBTK_CATEGORY("3D object creator"); - BBTK_INPUT(MIPCreator,Shift,"Gray scale shift",int); - BBTK_INPUT(MIPCreator,Scale,"Gray scale scaling",float); - BBTK_INPUT(MIPCreator,In,"Input Image",vtkImageData *); - BBTK_OUTPUT(MIPCreator,Out,"MIP object to plug into a 3D viewer",vtkProp3D*); + BBTK_INPUT(MIPCreator,Shift,"Gray scale shift",int,""); + BBTK_INPUT(MIPCreator,Scale,"Gray scale scaling",float,""); + BBTK_INPUT(MIPCreator,In,"Input Image",vtkImageData *,""); + BBTK_OUTPUT(MIPCreator,Out,"MIP object to plug into a 3D viewer",vtkProp3D*,""); BBTK_END_DESCRIBE_BLACK_BOX(MIPCreator); //================================================================= diff --git a/packages/vtk/src/bbvtkMarchingCubes.h b/packages/vtk/src/bbvtkMarchingCubes.h index fd1041bd..b281f7ef 100644 --- a/packages/vtk/src/bbvtkMarchingCubes.h +++ b/packages/vtk/src/bbvtkMarchingCubes.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbvtkMarchingCubes.h,v $ Language: C++ - Date: $Date: 2008/02/13 08:21:38 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/04/08 06:59:32 $ + 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 @@ -79,9 +79,9 @@ namespace bbvtk BBTK_DESCRIPTION("Extracts an iso-surface of an image using the marching cubes algorithm (bbfication of vtkMarchingCubes)"); BBTK_CATEGORY("image;mesh"); - BBTK_INPUT(MarchingCubes,In,"Image",vtkImageData*); - BBTK_INPUT(MarchingCubes,Value,"Value of the iso-surface",double); - BBTK_OUTPUT(MarchingCubes,Out,"Output iso-surface",vtkPolyData*); + BBTK_INPUT(MarchingCubes,In,"Image",vtkImageData*,""); + BBTK_INPUT(MarchingCubes,Value,"Value of the iso-surface",double,""); + BBTK_OUTPUT(MarchingCubes,Out,"Output iso-surface",vtkPolyData*,""); BBTK_END_DESCRIBE_BLACK_BOX(MarchingCubes); //======================================================================= diff --git a/packages/vtk/src/bbvtkMetaImageReader.xml b/packages/vtk/src/bbvtkMetaImageReader.xml index d254bc42..a35231da 100644 --- a/packages/vtk/src/bbvtkMetaImageReader.xml +++ b/packages/vtk/src/bbvtkMetaImageReader.xml @@ -10,7 +10,7 @@ vtkImageData.h vtkMetaImageReader - + 
diff --git a/packages/wx/src/bbwxColourSelector.h b/packages/wx/src/bbwxColourSelector.h
index cae667b3..885951d9 100644
--- a/packages/wx/src/bbwxColourSelector.h
+++ b/packages/wx/src/bbwxColourSelector.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelector.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/20 11:51:59 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -67,7 +67,7 @@ namespace bbwx
   BBTK_NAME("ColourSelector");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Colour Selector dialog (bbfication of wxColourSelector)");
-  BBTK_OUTPUT(ColourSelector,Out,"The colour selected by the user",std::string);
+  BBTK_OUTPUT(ColourSelector,Out,"The colour selected by the user",std::string,"color");
   BBTK_END_DESCRIBE_BLACK_BOX(ColourSelector);
   //=================================================================
 
diff --git a/packages/wx/src/bbwxColourSelectorButton.h b/packages/wx/src/bbwxColourSelectorButton.h
index 0ffeb1db..4d51d1a8 100644
--- a/packages/wx/src/bbwxColourSelectorButton.h
+++ b/packages/wx/src/bbwxColourSelectorButton.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxColourSelectorButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/20 11:36:29 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -102,8 +102,8 @@ private:
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("A button which displays a colour picker dialog when clicked");
-  BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string);
-  BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string);
+  BBTK_INPUT(ColourSelectorButton,In,"Initial colour",std::string,"color");
+  BBTK_OUTPUT(ColourSelectorButton,Out,"Colour choosen in format '[0,1] [0,1] [0,1]'",std::string,"color");
   BBTK_END_DESCRIBE_BLACK_BOX(ColourSelectorButton);
   //=================================================================
   
diff --git a/packages/wx/src/bbwxCommandButton.h b/packages/wx/src/bbwxCommandButton.h
index 1c4374d9..9e58b1af 100644
--- a/packages/wx/src/bbwxCommandButton.h
+++ b/packages/wx/src/bbwxCommandButton.h
@@ -3,8 +3,8 @@
   Program:   bbtk 
   Module:    $RCSfile: bbwxCommandButton.h,v $ 
   Language:  C++ 
-  Date:      $Date: 2008/02/15 12:47:18 $ 
-  Version:   $Revision: 1.1 $ 
+  Date:      $Date: 2008/04/08 06:59:32 $ 
+  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 
@@ -94,9 +94,9 @@ namespace bbwx
 
   typedef std::vector vectorcolour;
   
-  BBTK_INPUT(CommandButton,In,"Commands to be executed separated by commas (;). Each single quote (') is replaced by a double quote (\").",std::string);   
-  BBTK_INPUT(CommandButton,Label,"Label of the button",std::string); 
-  BBTK_INPUT(CommandButton,Colour,"Colour of the button (-1 -1 -1  Background)",vectorcolour); 
+  BBTK_INPUT(CommandButton,In,"Commands to be executed separated by commas (;). Each single quote (') is replaced by a double quote (\").",std::string,"");   
+  BBTK_INPUT(CommandButton,Label,"Label of the button",std::string,""); 
+  BBTK_INPUT(CommandButton,Colour,"Colour of the button (-1 -1 -1  Background)",vectorcolour,"color"); 
   //	BBTK_OUTPUT(CommandButton,Out,"..Out..",int); 
   BBTK_END_DESCRIBE_BLACK_BOX(CommandButton); 
   //================================================================= 
diff --git a/packages/wx/src/bbwxDirectorySelector.h b/packages/wx/src/bbwxDirectorySelector.h
index f30f63da..b4f17532 100644
--- a/packages/wx/src/bbwxDirectorySelector.h
+++ b/packages/wx/src/bbwxDirectorySelector.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxDirectorySelector.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:47:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -70,10 +70,10 @@ namespace bbwx
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("Pops up a directory selection dialog (wxDirDialog)");
-  BBTK_INPUT(DirectorySelector,Title,"Title of the dialog",std::string);
-  BBTK_INPUT(DirectorySelector,Message,"Message to show on the dialog",std::string);
-  BBTK_INPUT(DirectorySelector,DefaultDir,"The default directory",std::string);
-  BBTK_OUTPUT(DirectorySelector,Out,"The directory selected by the user",std::string);
+  BBTK_INPUT(DirectorySelector,Title,"Title of the dialog",std::string,"directory name");
+  BBTK_INPUT(DirectorySelector,Message,"Message to show on the dialog",std::string,"");
+  BBTK_INPUT(DirectorySelector,DefaultDir,"The default directory",std::string,"directory name");
+  BBTK_OUTPUT(DirectorySelector,Out,"The directory selected by the user",std::string,"directory name");
   BBTK_END_DESCRIBE_BLACK_BOX(DirectorySelector);
   //=================================================================
 
diff --git a/packages/wx/src/bbwxFileSelector.h b/packages/wx/src/bbwxFileSelector.h
index b0a90376..836bf44b 100644
--- a/packages/wx/src/bbwxFileSelector.h
+++ b/packages/wx/src/bbwxFileSelector.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxFileSelector.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:47:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -70,13 +70,14 @@ namespace bbwx
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("Pops up a file selection dialog for reading or saving (wxFileDialog)");
-  BBTK_INPUT(FileSelector,Title,"Title of the dialog",std::string);
-  BBTK_INPUT(FileSelector,Message,"Message to show on the dialog",std::string);
-  BBTK_INPUT(FileSelector,DefaultDir,"The default directory",std::string);
-  BBTK_INPUT(FileSelector,DefaultFile,"The default filename",std::string);
-  BBTK_INPUT(FileSelector,Wildcard,"A wildcard, such as \"*.*\" or \"BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif\"",std::string);
-  BBTK_INPUT(FileSelector,OpenSave,"Open for an open dialog (default) / Save for a save dialog",std::string);
-  BBTK_OUTPUT(FileSelector,Out,"The file selected by the user",std::string);
+  BBTK_INPUT(FileSelector,Title,"Title of the dialog",std::string,"");
+  BBTK_INPUT(FileSelector,Message,"Message to show on the dialog",
+	     std::string,"");
+  BBTK_INPUT(FileSelector,DefaultDir,"The default directory",std::string,"");
+  BBTK_INPUT(FileSelector,DefaultFile,"The default filename",std::string,"file name");
+  BBTK_INPUT(FileSelector,Wildcard,"A wildcard, such as \"*.*\" or \"BMP files (*.bmp)|*.bmp|GIF files (*.gif)|*.gif\"",std::string,"wildcard");
+  BBTK_INPUT(FileSelector,OpenSave,"Open for an open dialog (default) / Save for a save dialog",std::string,"");
+  BBTK_OUTPUT(FileSelector,Out,"The file selected by the user",std::string,"file name");
   BBTK_END_DESCRIBE_BLACK_BOX(FileSelector);
   //=================================================================
 
diff --git a/packages/wx/src/bbwxInputText.h b/packages/wx/src/bbwxInputText.h
index 6cdb27e0..0db6f4e3 100644
--- a/packages/wx/src/bbwxInputText.h
+++ b/packages/wx/src/bbwxInputText.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxInputText.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:47:18 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -98,11 +98,12 @@ namespace bbwx
   BBTK_NAME("InputText");
   BBTK_AUTHOR("laurent guigues at creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("A zone in which the user can enter a text (wxTextCtrl)");
-  BBTK_INPUT(InputText,In,"Initial text (default '')",std::string);
+  BBTK_INPUT(InputText,In,"Initial text (default '')",std::string,"");
 
-  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ",std::string);
+  BBTK_INPUT(InputText,Title,"Title of the input zone (default '') ",
+	     std::string,"");
 
-  BBTK_OUTPUT(InputText,Out,"Current text",std::string);
+  BBTK_OUTPUT(InputText,Out,"Current text",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(InputText);
   //=================================================================
 
diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h
index 069811e9..a9e99097 100644
--- a/packages/wx/src/bbwxLayoutLine.h
+++ b/packages/wx/src/bbwxLayoutLine.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutLine.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:19:58 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -81,16 +81,16 @@ namespace bbwx
   BBTK_DESCRIPTION("LayoutLine widget (wxBoxSizer)");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   
-  BBTK_INPUT(LayoutLine,Widget1,"widget 1",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget2,"widget 2",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget3,"widget 3",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget4,"widget 4",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget5,"widget 5",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget6,"widget 6",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget7,"widget 7",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget8,"widget 8",wxWindow*);
-  BBTK_INPUT(LayoutLine,Widget9,"widget 9",wxWindow*);
-  BBTK_INPUT(LayoutLine,Orientation,"Orientation (default V), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string);
+  BBTK_INPUT(LayoutLine,Widget1,"widget 1",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget2,"widget 2",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget3,"widget 3",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget4,"widget 4",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget5,"widget 5",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget6,"widget 6",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget7,"widget 7",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget8,"widget 8",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Widget9,"widget 9",wxWindow*,"");
+  BBTK_INPUT(LayoutLine,Orientation,"Orientation (default V), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutLine);
   //=================================================================
   
diff --git a/packages/wx/src/bbwxLayoutSplit.h b/packages/wx/src/bbwxLayoutSplit.h
index a1656c17..32424b36 100644
--- a/packages/wx/src/bbwxLayoutSplit.h
+++ b/packages/wx/src/bbwxLayoutSplit.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutSplit.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/15 12:24:43 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -70,10 +70,10 @@ namespace bbwx
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Widget which splits a window in two fixed size parts (wxSplitterWindow)");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
-  BBTK_INPUT(LayoutSplit,Widget1,"Upper or left widget",wxWindow*);
-  BBTK_INPUT(LayoutSplit,Widget2,"Lower or right widget",wxWindow*);
-  BBTK_INPUT(LayoutSplit,Orientation,"Orientation (default H), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string);
-   BBTK_INPUT(LayoutSplit,Proportion,"Proportion (in percent) of the first children in the window",int);
+  BBTK_INPUT(LayoutSplit,Widget1,"Upper or left widget",wxWindow*,"");
+  BBTK_INPUT(LayoutSplit,Widget2,"Lower or right widget",wxWindow*,"");
+  BBTK_INPUT(LayoutSplit,Orientation,"Orientation (default H), 0=H=HORIZONTAL , 1=V=VERTICAL",std::string,"");
+   BBTK_INPUT(LayoutSplit,Proportion,"Proportion (in percent) of the first children in the window",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutSplit);
   //=================================================================
 }
diff --git a/packages/wx/src/bbwxLayoutTab.h b/packages/wx/src/bbwxLayoutTab.h
index ed3cd476..68278531 100644
--- a/packages/wx/src/bbwxLayoutTab.h
+++ b/packages/wx/src/bbwxLayoutTab.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxLayoutTab.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/19 18:31:36 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -80,16 +80,18 @@ namespace bbwx
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("LayoutTab widget (wxNotebook)");
     // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
-    BBTK_INPUT(LayoutTab,Widget1,"widget 1",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget2,"widget 2",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget3,"widget 3",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget4,"widget 4",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget5,"widget 5",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget6,"widget 6",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget7,"widget 7",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget8,"widget 8",wxWindow*);
-    BBTK_INPUT(LayoutTab,Widget9,"widget 9",wxWindow*);
-    BBTK_INPUT(LayoutTab,Orientation,"Orientation (default T), 0=T=TOP , 1=R=RIGHT , 2=B=BOTTON , 3=L=LEFT " ,std::string);
+    BBTK_INPUT(LayoutTab,Widget1,"widget 1",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget2,"widget 2",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget3,"widget 3",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget4,"widget 4",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget5,"widget 5",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget6,"widget 6",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget7,"widget 7",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget8,"widget 8",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Widget9,"widget 9",wxWindow*,"");
+    BBTK_INPUT(LayoutTab,Orientation,
+	       "Orientation (default T), 0=T=TOP , 1=R=RIGHT , 2=B=BOTTON , 3=L=LEFT " 
+	       ,std::string,"");
   BBTK_END_DESCRIBE_BLACK_BOX(LayoutTab);
   //=================================================================
 
diff --git a/packages/wx/src/bbwxRadioButton.h b/packages/wx/src/bbwxRadioButton.h
index 71a0d109..f6764e49 100644
--- a/packages/wx/src/bbwxRadioButton.h
+++ b/packages/wx/src/bbwxRadioButton.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxRadioButton.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/11 14:47:12 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  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
@@ -109,22 +109,23 @@ namespace bbwx
   BBTK_NAME("RadioButton");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("RadioButton group widget 0-9 entries");
-  BBTK_INPUT(RadioButton,In,"Set initial item",int);
-
-  BBTK_INPUT(RadioButton,In0,"option 0",std::string);
-  BBTK_INPUT(RadioButton,In1,"option 1",std::string);
-  BBTK_INPUT(RadioButton,In2,"option 2",std::string);
-  BBTK_INPUT(RadioButton,In3,"option 3",std::string);
-  BBTK_INPUT(RadioButton,In4,"option 4",std::string);
-  BBTK_INPUT(RadioButton,In5,"option 5",std::string);
-  BBTK_INPUT(RadioButton,In6,"option 6",std::string);
-  BBTK_INPUT(RadioButton,In7,"option 7",std::string);
-  BBTK_INPUT(RadioButton,In8,"option 8",std::string);
-  BBTK_INPUT(RadioButton,In9,"option 9",std::string);
-
-  BBTK_INPUT(RadioButton,Title,"Title of the widget (default '') ",std::string);
-
-  BBTK_OUTPUT(RadioButton,Out,"Item selected",int);
+  BBTK_INPUT(RadioButton,In,"Set initial item",int,"");
+
+  BBTK_INPUT(RadioButton,In0,"option 0",std::string,"");
+  BBTK_INPUT(RadioButton,In1,"option 1",std::string,"");
+  BBTK_INPUT(RadioButton,In2,"option 2",std::string,"");
+  BBTK_INPUT(RadioButton,In3,"option 3",std::string,"");
+  BBTK_INPUT(RadioButton,In4,"option 4",std::string,"");
+  BBTK_INPUT(RadioButton,In5,"option 5",std::string,"");
+  BBTK_INPUT(RadioButton,In6,"option 6",std::string,"");
+  BBTK_INPUT(RadioButton,In7,"option 7",std::string,"");
+  BBTK_INPUT(RadioButton,In8,"option 8",std::string,"");
+  BBTK_INPUT(RadioButton,In9,"option 9",std::string,"");
+
+  BBTK_INPUT(RadioButton,Title,"Title of the widget (default '') ",
+	     std::string,"");
+
+  BBTK_OUTPUT(RadioButton,Out,"Item selected",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(RadioButton);
   //=================================================================
 
diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h
index 5d4d4458..33c44baf 100644
--- a/packages/wx/src/bbwxSlider.h
+++ b/packages/wx/src/bbwxSlider.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxSlider.h,v $
   Language:  C++
-  Date:      $Date: 2008/02/13 15:09:38 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2008/04/08 06:59:32 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -138,15 +138,15 @@ namespace bbwx
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
   BBTK_DESCRIPTION("Slider widget (wxSlider)");
-  BBTK_INPUT(Slider,In,"Initial position of the slider (default 0)",int);
-  BBTK_INPUT(Slider,Min,"Minimum value of the slider (default 0)",int);
-  BBTK_INPUT(Slider,Max,"Maximum value of the slider (default 500)",int);
-  BBTK_INPUT(Slider,Label,"Show slider labels ? (default FALSE) ",bool);
-  BBTK_INPUT(Slider,Title,"Title shown above the slider (default '') ", std::string);
-  BBTK_INPUT(Slider,Orientation, "Orientation : (default H)  0=H=HORIZONTAL, 1=V=VERTICAL ",std::string);
-  BBTK_INPUT(Slider,ChangeResolution, "Can the user change the resolution of the slider ? (default FALSE) ",bool);
-  BBTK_INPUT(Slider,ReactiveOnTrack, "Slider sends info when track moves (default 0 = no)",int);  
-  BBTK_OUTPUT(Slider,Out,"Current position of the slider",int);
+  BBTK_INPUT(Slider,In,"Initial position of the slider (default 0)",int,"");
+  BBTK_INPUT(Slider,Min,"Minimum value of the slider (default 0)",int,"");
+  BBTK_INPUT(Slider,Max,"Maximum value of the slider (default 500)",int,"");
+  BBTK_INPUT(Slider,Label,"Show slider labels ? (default FALSE) ",bool,"");
+  BBTK_INPUT(Slider,Title,"Title shown above the slider (default '') ", std::string,"");
+  BBTK_INPUT(Slider,Orientation, "Orientation : (default H)  0=H=HORIZONTAL, 1=V=VERTICAL ",std::string,"");
+  BBTK_INPUT(Slider,ChangeResolution, "Can the user change the resolution of the slider ? (default FALSE) ",bool,"");
+  BBTK_INPUT(Slider,ReactiveOnTrack, "Slider sends info when track moves (default 0 = no)",int,"");  
+  BBTK_OUTPUT(Slider,Out,"Current position of the slider",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Slider);
   //=================================================================
   
diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h
index d24947c7..34d5d550 100644
--- a/packages/wxvtk/src/bbwxvtkViewer2D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer2D.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer2D.h,v $
   Language:  C++
-  Date:      $Date: 2008/03/10 12:28:44 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2008/04/08 06:59:33 $
+  Version:   $Revision: 1.3 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -93,10 +93,10 @@ namespace bbwxvtk
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("Viewer2D widget (vtk)");
   BBTK_CATEGORY("viewer");
-  BBTK_INPUT(Viewer2D,Slice,"Position of the slider",int);
-  BBTK_INPUT(Viewer2D,Orientation,"Slicing orientation : 0:yz / 1:xz / 2:xy",int);
-  BBTK_INPUT(Viewer2D,In,"Input Image",vtkImageData *);
-  BBTK_OUTPUT(Viewer2D,Out,"Position of the slider",int);
+  BBTK_INPUT(Viewer2D,Slice,"Position of the slider",int,"");
+  BBTK_INPUT(Viewer2D,Orientation,"Slicing orientation : 0:yz / 1:xz / 2:xy",int,"");
+  BBTK_INPUT(Viewer2D,In,"Input Image",vtkImageData *,"");
+  BBTK_OUTPUT(Viewer2D,Out,"Position of the slider",int,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Viewer2D);
   //=================================================================
 
diff --git a/packages/wxvtk/src/bbwxvtkViewer3D.h b/packages/wxvtk/src/bbwxvtkViewer3D.h
index af59ce97..24a0a3c8 100644
--- a/packages/wxvtk/src/bbwxvtkViewer3D.h
+++ b/packages/wxvtk/src/bbwxvtkViewer3D.h
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbwxvtkViewer3D.h,v $
   Language:  C++
-  Date:      $Date: 2008/04/01 14:26:23 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/04/08 06:59:33 $
+  Version:   $Revision: 1.4 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -100,18 +100,18 @@ namespace bbwxvtk
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   BBTK_DESCRIPTION("3D Viewer (vtk)");
   BBTK_CATEGORY("viewer");
-  BBTK_INPUT(Viewer3D,In1,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In2,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In3,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In4,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,In5,"Input actor",vtkProp3D *);
-  BBTK_INPUT(Viewer3D,Obs1,"Input observer",vtkInteractorObserver *);
-  BBTK_INPUT(Viewer3D,Obs2,"Input observer",vtkInteractorObserver *);
-  BBTK_INPUT(Viewer3D,Obs3,"Input observer",vtkInteractorObserver *);
-  BBTK_INPUT(Viewer3D,Obs4,"Input observer",vtkInteractorObserver *);
-  BBTK_INPUT(Viewer3D,Obs5,"Input observer",vtkInteractorObserver *);
-  BBTK_OUTPUT(Viewer3D,Renderer,"Renderer to which actors can be added.",vtkRenderer*);
-  BBTK_OUTPUT(Viewer3D,Interactor,"Interactor with which vtk widgets can interact",wxVTKRenderWindowInteractor*);
+  BBTK_INPUT(Viewer3D,In1,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In2,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In3,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In4,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,In5,"Input actor",vtkProp3D *,"");
+  BBTK_INPUT(Viewer3D,Obs1,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs2,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs3,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs4,"Input observer",vtkInteractorObserver *,"");
+  BBTK_INPUT(Viewer3D,Obs5,"Input observer",vtkInteractorObserver *,"");
+  BBTK_OUTPUT(Viewer3D,Renderer,"Renderer to which actors can be added.",vtkRenderer*,"");
+  BBTK_OUTPUT(Viewer3D,Interactor,"Interactor with which vtk widgets can interact",wxVTKRenderWindowInteractor*,"");
   BBTK_END_DESCRIBE_BLACK_BOX(Viewer3D);
   //=================================================================