From: guigues Date: Wed, 6 Feb 2008 14:14:22 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: r0.6.1~258 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7eba604321498f7ed6333b7cbe9bf2aceb4ec30e;hp=4925f2a1f40f97ab30cec57dd1edbd95b7a0e29c;p=bbtk.git *** empty log message *** --- diff --git a/kernel/src/bbtkBlackBoxDescriptor.cxx b/kernel/src/bbtkBlackBoxDescriptor.cxx index 15f88d8..c81206d 100644 --- a/kernel/src/bbtkBlackBoxDescriptor.cxx +++ b/kernel/src/bbtkBlackBoxDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkBlackBoxDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/06 09:27:52 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/02/06 14:14:22 $ + Version: $Revision: 1.9 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -24,6 +24,8 @@ #include "bbtkMessageManager.h" #include "bbtkPackage.h" #include "bbtkUtilities.h" +#include "bbtkUserBlackBoxDescriptor.h" +#include "bbtkWxBlackBox.h" namespace bbtk { @@ -244,7 +246,7 @@ namespace bbtk << author << "\n"; (s) << " Category(s) : " << category << "\n"; - (s) << " Include : " + (s) << " To use it : include " << GetPackage()->GetName() << "\n"; (s) << "\n"; @@ -254,43 +256,81 @@ namespace bbtk //------------- // Inputs - std::string col("#CCCCFF"); - + std::string titlecol("#BBBBFF"); + std::string usercol("#FFFFFF"); + std::string ubbcol("#DDFFFF"); + std::string wxbbcol("#EEFFFF"); + + // (s) << "

Inputs

\n"; (s) << "

\n"; - (s) << "\n"; + + std::vector user_defined; + std::vector ubb_defined; + std::vector wxbb_defined; + const BlackBoxDescriptor::InputDescriptorMapType& imap = GetInputDescriptorMap(); - InputDescriptorMapType::const_iterator in; - for ( in = imap.begin(); in != imap.end(); ++in ) { - std::string name(in->second->GetName()); - Utilities::html_format(name); - - std::string type("<"); - type += in->second->GetTypeName(); - type += ">"; - Utilities::html_format(type); + // Skips system-defined inputs + std::string col(usercol); + int iotype = 0; + if (in->second->GetCreatorTypeInfo() == + typeid(UserBlackBoxDescriptor)) + { + col = ubbcol; + iotype = 1; + } + else if (in->second->GetCreatorTypeInfo() == + typeid(WxBlackBoxDescriptor)) + { + col = wxbbcol; + iotype = 2; + } - std::string descr(in->second->GetDescription()); - //Utilities::html_format(descr); - - (s) << "" - << "" - << "\n"; - + std::string name(in->second->GetName()); + Utilities::html_format(name); + + std::string type("<"); + type += in->second->GetTypeName(); + type += ">"; + Utilities::html_format(type); + + std::string descr(in->second->GetDescription()); + //Utilities::html_format(descr); + + std::string out = + "" + + "" + + "\n"; + + if (iotype==0) user_defined.push_back(out); + else if (iotype==1) ubb_defined.push_back(out); + else if (iotype==2) wxbb_defined.push_back(out); + } - // (s) << "
Inputs
 "<
 "<
"<
 "+name+" 
 "+type+"
"+descr+"
\n"; - - + + std::vector::iterator hi; + for (hi=user_defined.begin();hi!=user_defined.end();++hi) s << *hi; + for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) s << *hi; + for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) s << *hi; + + user_defined.clear(); + ubb_defined.clear(); + wxbb_defined.clear(); + //------------- // Outputs // (s) << "

Outputs

\n"; // (s) << "\n"; - (s) << "\n"; const BlackBoxDescriptor::OutputDescriptorMapType& omap = @@ -299,26 +339,53 @@ namespace bbtk BlackBoxDescriptor::OutputDescriptorMapType::const_iterator o; for ( o = omap.begin(); o != omap.end(); ++o ) - { - std::string name(o->second->GetName()); - Utilities::html_format(name); - - std::string type("<"); - type += o->second->GetTypeName(); - type += ">"; - Utilities::html_format(type); + { + std::string col(usercol); + int iotype = 0; + if (o->second->GetCreatorTypeInfo() == + typeid(UserBlackBoxDescriptor)) + { + col = ubbcol; + iotype = 1; + } + else if (o->second->GetCreatorTypeInfo() == + typeid(WxBlackBoxDescriptor)) + { + col = wxbbcol; + iotype = 2; + } - std::string descr(o->second->GetDescription()); - //Utilities::html_format(descr); + std::string name(o->second->GetName()); + Utilities::html_format(name); + std::string type("<"); + type += o->second->GetTypeName(); + type += ">"; + Utilities::html_format(type); - (s) << "" - << "" - << "\n"; + std::string descr(o->second->GetDescription()); + //Utilities::html_format(descr); - } - (s) << "
Outputs
 "<
 "<
"<
\n"; + std::string out = + "
 "+name+"
" + + "
 "+type+"
" + + ""+descr+"\n"; + + if (iotype==0) user_defined.push_back(out); + else if (iotype==1) ubb_defined.push_back(out); + else if (iotype==2) wxbb_defined.push_back(out); + + } + + for (hi=user_defined.begin();hi!=user_defined.end();++hi) s << *hi; + for (hi=wxbb_defined.begin();hi!=wxbb_defined.end();++hi) s << *hi; + for (hi=ubb_defined.begin();hi!=ubb_defined.end();++hi) s << *hi; + (s) << "\n"; + //------------ // End diff --git a/kernel/src/bbtkBlackBoxDescriptor.h b/kernel/src/bbtkBlackBoxDescriptor.h index 1c15241..1d0ee5d 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/02/05 12:16:55 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -155,7 +155,7 @@ namespace bbtk std::string mAuthor; /// The category of the black box std::string mCategory; - /// The kind of box + /// The kind of box (standard / adaptor) Kind mKind; /// The Package to which the box belongs Package *mPackage; diff --git a/kernel/src/bbtkBlackBoxInputDescriptor.h b/kernel/src/bbtkBlackBoxInputDescriptor.h index 0462c0c..19c578f 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/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -34,8 +34,6 @@ namespace bbtk { - - class BBTK_EXPORT BlackBoxInputDescriptor { public: @@ -46,14 +44,18 @@ namespace bbtk /// Ctor with name and description - BlackBoxInputDescriptor( const std::string& name, - const std::string& description, - OptionType option = MANDATORY, - bool copy_construct = true) - : mName(name), mDescription(description), + BlackBoxInputDescriptor(TypeInfo creator_type_info, + const std::string& name, + const std::string& description, + OptionType option = MANDATORY, + bool copy_construct = true) + : mCreatorTypeInfo(creator_type_info), + mName(name), mDescription(description), mOption(option), mCopyConstruct(copy_construct) {} + /// Returns the TypeInfo of the BlackBoxDescriptor which created this descriptor + TypeInfo GetCreatorTypeInfo() { return mCreatorTypeInfo; } /// Returns the name of the input const std::string& GetName() const { return mName; } /// Returns the description of the input @@ -74,8 +76,12 @@ namespace bbtk private: /// Default ctor is private - BlackBoxInputDescriptor() : mName(""), mDescription(""), + BlackBoxInputDescriptor() : mCreatorTypeInfo(typeid(void)), + mName(""), mDescription(""), mOption(OPTIONAL) {} + + /// The TypeInfo of the BlackBoxDescriptor which created this descriptor + TypeInfo mCreatorTypeInfo; /// The name of the input std::string mName; /// The description of the input diff --git a/kernel/src/bbtkBlackBoxOutputDescriptor.h b/kernel/src/bbtkBlackBoxOutputDescriptor.h index eb1164f..c419671 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/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -36,18 +36,21 @@ namespace bbtk { - class BBTK_EXPORT BlackBoxOutputDescriptor { public: /// Ctor with name and description - BlackBoxOutputDescriptor( const std::string& name, + BlackBoxOutputDescriptor( TypeInfo creator_type_info, + const std::string& name, const std::string& description, bool copy_construct = true) - : mName(name), mDescription(description), + : mCreatorTypeInfo(creator_type_info), + mName(name), mDescription(description), mCopyConstruct(copy_construct) {} - + + /// Returns the TypeInfo of the BlackBoxDescriptor which created this descriptor + TypeInfo GetCreatorTypeInfo() { return mCreatorTypeInfo; } /// Returns the name of the output const std::string& GetName() const { return mName; } /// Returns the description of the output @@ -67,7 +70,11 @@ namespace bbtk private: /// Default ctor is private - BlackBoxOutputDescriptor() : mName(""), mDescription("") {} + BlackBoxOutputDescriptor() : mCreatorTypeInfo(typeid(void)), + mName(""), mDescription("") {} + + /// The TypeInfo of the BlackBoxDescriptor which created this descriptor + TypeInfo mCreatorTypeInfo; /// The name of the output std::string mName; /// The description of the output diff --git a/kernel/src/bbtkComplexBlackBoxDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxDescriptor.cxx index f6f6f4b..a6b40e6 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/02/05 13:23:46 $ - Version: $Revision: 1.4 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -37,6 +37,7 @@ namespace bbtk { bbtkDebugMessageInc("Kernel",9,"ComplexBlackBoxDescriptor::ComplexBlackBoxDescriptor(\""<bbGetInputType(input))); - + AddInputDescriptor ( new ComplexBlackBoxInputDescriptor + ( typeid(ComplexBlackBoxDescriptor), + name, + help, + box, + input, + bb->bbGetInputType(input))); + bbtkDebugDecTab("Kernel",5); } @@ -219,7 +222,8 @@ namespace bbtk } AddOutputDescriptor ( new ComplexBlackBoxOutputDescriptor - ( name, + ( typeid(ComplexBlackBoxDescriptor), + name, help, box, output, @@ -298,7 +302,7 @@ namespace bbtk std::string inc = GetScriptFileName(); if (inc.size()>0) { - (s) << " Include : " + (s) << " Use command : include " << inc << "\n"; } diff --git a/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxInputDescriptor.cxx index fcec38b..f32344f 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/05 13:23:46 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -27,13 +27,15 @@ namespace bbtk { - ComplexBlackBoxInputDescriptor::ComplexBlackBoxInputDescriptor( const std::string& name, - const std::string& description, - const std::string& target, - const std::string& input, -TypeInfo type) + ComplexBlackBoxInputDescriptor:: + ComplexBlackBoxInputDescriptor( TypeInfo creator_type_info, + const std::string& name, + const std::string& description, + const std::string& target, + const std::string& input, + TypeInfo type) : - BlackBoxInputDescriptor(name,description), + BlackBoxInputDescriptor(creator_type_info,name,description), mTarget(target), mInput(input), mType(type) diff --git a/kernel/src/bbtkComplexBlackBoxInputDescriptor.h b/kernel/src/bbtkComplexBlackBoxInputDescriptor.h index 1cd39a1..99d029c 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/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -35,11 +35,13 @@ namespace bbtk { - class BBTK_EXPORT ComplexBlackBoxInputDescriptor : public bbtk::BlackBoxInputDescriptor + class BBTK_EXPORT ComplexBlackBoxInputDescriptor : + public bbtk::BlackBoxInputDescriptor { public: - ComplexBlackBoxInputDescriptor( const std::string& name, + ComplexBlackBoxInputDescriptor( TypeInfo creator_type_info, + const std::string& name, const std::string& description, const std::string& target, const std::string& input, @@ -63,8 +65,9 @@ namespace bbtk private: /// Default ctor is private - ComplexBlackBoxInputDescriptor() : BlackBoxInputDescriptor("",""), - mType(typeid(void)) {} + ComplexBlackBoxInputDescriptor() : + BlackBoxInputDescriptor(typeid(void),"",""), + mType(typeid(void)) {} std::string mTarget; std::string mInput; TypeInfo mType; diff --git a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.cxx index 8d5c5d8..504199a 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/05 13:23:46 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -27,13 +27,15 @@ namespace bbtk { - ComplexBlackBoxOutputDescriptor::ComplexBlackBoxOutputDescriptor( const std::string& name, - const std::string& description, - const std::string& target, - const std::string& output, - TypeInfo type) + ComplexBlackBoxOutputDescriptor:: + ComplexBlackBoxOutputDescriptor( TypeInfo creator_type_info, + const std::string& name, + const std::string& description, + const std::string& target, + const std::string& output, + TypeInfo type) : - BlackBoxOutputDescriptor(name,description), + BlackBoxOutputDescriptor(creator_type_info,name,description), mTarget(target), mOutput(output), mType(type) diff --git a/kernel/src/bbtkComplexBlackBoxOutputDescriptor.h b/kernel/src/bbtkComplexBlackBoxOutputDescriptor.h index dff0204..62f2a9d 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/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -36,11 +36,13 @@ namespace bbtk { - class BBTK_EXPORT ComplexBlackBoxOutputDescriptor : public bbtk::BlackBoxOutputDescriptor + class BBTK_EXPORT ComplexBlackBoxOutputDescriptor : + public bbtk::BlackBoxOutputDescriptor { public: - ComplexBlackBoxOutputDescriptor( const std::string& name, + ComplexBlackBoxOutputDescriptor( TypeInfo creator_type_info, + const std::string& name, const std::string& description, const std::string& target, const std::string& output, @@ -66,7 +68,8 @@ namespace bbtk private: /// Default ctor is private ComplexBlackBoxOutputDescriptor() : - BlackBoxOutputDescriptor("",""), mType(typeid(void)) {} + BlackBoxOutputDescriptor(typeid(void),"",""), + mType(typeid(void)) {} std::string mTarget; std::string mOutput; TypeInfo mType; diff --git a/kernel/src/bbtkUserBlackBoxDescriptor.h b/kernel/src/bbtkUserBlackBoxDescriptor.h index 7f42a75..5346a28 100644 --- a/kernel/src/bbtkUserBlackBoxDescriptor.h +++ b/kernel/src/bbtkUserBlackBoxDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUserBlackBoxDescriptor.h,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -41,19 +41,33 @@ namespace bbtk public: UserBlackBoxDescriptor() { - AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor("BoxProcessMode", - "Set the process mode of the box (Pipeline | Always | Reactive)", - new bbtk::UserBlackBoxTGetFunctor(&BlackBox::bbGetInputBoxProcessMode), - new bbtk::UserBlackBoxTSetFunctor(&BlackBox::bbSetInputBoxProcessMode) ) ); - AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor("BoxExecute", - "Any change signal received by this input executes the box", - new bbtk::UserBlackBoxTGetFunctor(&BlackBox::bbGetInputBoxExecute), - new bbtk::UserBlackBoxTSetFunctor(&BlackBox::bbSetInputBoxExecute) ) ); - - AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor("BoxChange", - "Propagates modification of the box", - new bbtk::UserBlackBoxTGetFunctor(&BlackBox::bbGetOutputBoxChange), - new bbtk::UserBlackBoxTSetFunctor(&BlackBox::bbSetOutputBoxChange) ) ); + // Creates the input 'BoxProcessMode' + AddInputDescriptor + (new + bbtk::UserBlackBoxInputDescriptor + (typeid(UserBlackBoxDescriptor), + "BoxProcessMode", + "Sets the processing mode of the box (Pipeline | Always | Reactive)", + new bbtk::UserBlackBoxTGetFunctor(&BlackBox::bbGetInputBoxProcessMode), + new bbtk::UserBlackBoxTSetFunctor(&BlackBox::bbSetInputBoxProcessMode) ) ); + // Creates the input 'BoxExecute' + AddInputDescriptor + (new + bbtk::UserBlackBoxInputDescriptor + (typeid(UserBlackBoxDescriptor), + "BoxExecute", + "Any signal received by this input executes the box", + new bbtk::UserBlackBoxTGetFunctor(&BlackBox::bbGetInputBoxExecute), + new bbtk::UserBlackBoxTSetFunctor(&BlackBox::bbSetInputBoxExecute) ) ); + // Creates the output 'BoxChange' + AddOutputDescriptor + (new + bbtk::UserBlackBoxOutputDescriptor + (typeid(UserBlackBoxDescriptor), + "BoxChange", + "Signal modifications of the box", + new bbtk::UserBlackBoxTGetFunctor(&BlackBox::bbGetOutputBoxChange), + new bbtk::UserBlackBoxTSetFunctor(&BlackBox::bbSetOutputBoxChange) ) ); } }; diff --git a/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx b/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx index 38a8077..91d0ed6 100644 --- a/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx +++ b/kernel/src/bbtkUserBlackBoxInputDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUserBlackBoxInputDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/05 13:23:46 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -26,13 +26,16 @@ namespace bbtk { - UserBlackBoxInputDescriptor::UserBlackBoxInputDescriptor( const std::string& name, - const std::string& description, - UserBlackBoxGetFunctor* getfunctor, - UserBlackBoxSetFunctor* setfunctor, - bool copy_construct) + UserBlackBoxInputDescriptor:: + UserBlackBoxInputDescriptor( TypeInfo creator_type_info, + const std::string& name, + const std::string& description, + UserBlackBoxGetFunctor* getfunctor, + UserBlackBoxSetFunctor* setfunctor, + bool copy_construct) : - BlackBoxInputDescriptor(name,description,MANDATORY,copy_construct), + BlackBoxInputDescriptor(creator_type_info, + name,description,MANDATORY,copy_construct), mGetFunctor(getfunctor), mSetFunctor(setfunctor) { diff --git a/kernel/src/bbtkUserBlackBoxInputDescriptor.h b/kernel/src/bbtkUserBlackBoxInputDescriptor.h index a5cce85..2132e94 100644 --- a/kernel/src/bbtkUserBlackBoxInputDescriptor.h +++ b/kernel/src/bbtkUserBlackBoxInputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUserBlackBoxInputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -36,7 +36,8 @@ namespace bbtk { - class BBTK_EXPORT UserBlackBoxInputDescriptor : public bbtk::BlackBoxInputDescriptor + class BBTK_EXPORT UserBlackBoxInputDescriptor : + public bbtk::BlackBoxInputDescriptor { public: //typedef enum { @@ -45,7 +46,8 @@ namespace bbtk //} InputType; - UserBlackBoxInputDescriptor( const std::string& name, + UserBlackBoxInputDescriptor( TypeInfo creator_type_info, + const std::string& name, const std::string& description, UserBlackBoxGetFunctor* getfunctor, UserBlackBoxSetFunctor* setfunctor, @@ -68,7 +70,8 @@ namespace bbtk private: /// Default ctor is private - UserBlackBoxInputDescriptor() : BlackBoxInputDescriptor("","") {} + UserBlackBoxInputDescriptor() : + BlackBoxInputDescriptor(typeid(void),"","") {} /// The functor on the Get method UserBlackBoxGetFunctor* mGetFunctor; /// The functor on the Set method diff --git a/kernel/src/bbtkUserBlackBoxMacros.h b/kernel/src/bbtkUserBlackBoxMacros.h index 660d8b6..10b12ac 100644 --- a/kernel/src/bbtkUserBlackBoxMacros.h +++ b/kernel/src/bbtkUserBlackBoxMacros.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUserBlackBoxMacros.h,v $ Language: C++ - Date: $Date: 2008/02/05 13:23:46 $ - Version: $Revision: 1.6 $ + Date: $Date: 2008/02/06 14:14:22 $ + Version: $Revision: 1.7 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -271,7 +271,8 @@ /// Describes a UserBlackBox input (to be put inside the UBB description block) #define BBTK_INPUT(CLASS,NAME,DESCR,TYPE) \ AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor), \ + #NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor \ (&CLASS::bbGetInput##NAME), \ new bbtk::UserBlackBoxTSetFunctor \ @@ -282,7 +283,7 @@ /// Describes a UserBlackBox output (to be put inside the UBB description block) #define BBTK_OUTPUT(CLASS,NAME,DESCR,TYPE) \ AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor \ (&CLASS::bbGetOutput##NAME), \ new bbtk::UserBlackBoxTSetFunctor \ @@ -293,7 +294,7 @@ /// Describes a UserBlackBox input (to be put inside the UBB description block) #define BBTK_INPUT_NOCOPY(CLASS,NAME,DESCR,TYPE) \ AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor \ (&CLASS::bbGetInput##NAME), \ new bbtk::UserBlackBoxTSetFunctor \ @@ -305,7 +306,7 @@ /// Describes a UserBlackBox output (to be put inside the UBB description block) #define BBTK_OUTPUT_NOCOPY(CLASS,NAME,DESCR,TYPE) \ AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor \ (&CLASS::bbGetOutput##NAME), \ new bbtk::UserBlackBoxTSetFunctor \ @@ -363,7 +364,7 @@ /// Describes a template UserBlackBox input (to be put inside the template UBB description block) #define BBTK_TEMPLATE_INPUT(CLASS,NAME,DESCR,TYPE) \ AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetInput##NAME), \ new bbtk::UserBlackBoxTSetFunctor,TYPE,TYPE > \ @@ -374,7 +375,7 @@ /// Describes a template UserBlackBox output (to be put inside the template UBB description block) #define BBTK_TEMPLATE_OUTPUT(CLASS,NAME,DESCR,TYPE) \ AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetOutput##NAME), \ new bbtk::UserBlackBoxTSetFunctor,TYPE,TYPE > \ @@ -482,7 +483,7 @@ /// Describes a 2 template params UserBlackBox input (to be put inside the UBB description block) #define BBTK_TEMPLATE2_INPUT(CLASS,NAME,DESCR,TYPE) \ AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetInput##NAME), \ new bbtk::UserBlackBoxTSetFunctor,TYPE,TYPE > \ @@ -493,7 +494,7 @@ /// Describes a 2 template params UserBlackBox output (to be put inside the UBB description block) #define BBTK_TEMPLATE2_OUTPUT(CLASS,NAME,DESCR,TYPE) \ AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor \ - (#NAME,DESCR, \ + (typeid(CLASS ## Descriptor),#NAME,DESCR, \ new bbtk::UserBlackBoxTGetFunctor,TYPE,TYPE > \ (&CLASS::bbGetOutput##NAME), \ new bbtk::UserBlackBoxTSetFunctor,TYPE,TYPE > \ diff --git a/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx b/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx index df4d588..484cd1e 100644 --- a/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx +++ b/kernel/src/bbtkUserBlackBoxOutputDescriptor.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUserBlackBoxOutputDescriptor.cxx,v $ Language: C++ - Date: $Date: 2008/02/05 13:23:46 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -27,13 +27,16 @@ namespace bbtk { - UserBlackBoxOutputDescriptor::UserBlackBoxOutputDescriptor( const std::string& name, - const std::string& description, - UserBlackBoxGetFunctor* getfunctor, - UserBlackBoxSetFunctor* setfunctor, - bool copy_construct ) + UserBlackBoxOutputDescriptor:: + UserBlackBoxOutputDescriptor( TypeInfo creator_type_info, + const std::string& name, + const std::string& description, + UserBlackBoxGetFunctor* getfunctor, + UserBlackBoxSetFunctor* setfunctor, + bool copy_construct ) : - BlackBoxOutputDescriptor(name,description,copy_construct), + BlackBoxOutputDescriptor(creator_type_info, + name,description,copy_construct), mGetFunctor(getfunctor), mSetFunctor(setfunctor) { diff --git a/kernel/src/bbtkUserBlackBoxOutputDescriptor.h b/kernel/src/bbtkUserBlackBoxOutputDescriptor.h index 794587c..5dae521 100644 --- a/kernel/src/bbtkUserBlackBoxOutputDescriptor.h +++ b/kernel/src/bbtkUserBlackBoxOutputDescriptor.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkUserBlackBoxOutputDescriptor.h,v $ Language: C++ - Date: $Date: 2008/01/22 15:02:00 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -36,11 +36,13 @@ namespace bbtk { - class BBTK_EXPORT UserBlackBoxOutputDescriptor : public bbtk::BlackBoxOutputDescriptor + class BBTK_EXPORT UserBlackBoxOutputDescriptor : + public bbtk::BlackBoxOutputDescriptor { public: - UserBlackBoxOutputDescriptor( const std::string& name, + UserBlackBoxOutputDescriptor( TypeInfo creator_type_info, + const std::string& name, const std::string& description, UserBlackBoxGetFunctor* getfunctor, UserBlackBoxSetFunctor* setfunctor, @@ -62,7 +64,8 @@ namespace bbtk private: /// Default ctor is private - UserBlackBoxOutputDescriptor() : BlackBoxOutputDescriptor("","") {} + UserBlackBoxOutputDescriptor() : + BlackBoxOutputDescriptor(typeid(void),"","") {} /// The functor on the Get method UserBlackBoxGetFunctor* mGetFunctor; /// The functor on the Set method diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h index fcd35be..8159ba8 100644 --- a/kernel/src/bbtkWxBlackBox.h +++ b/kernel/src/bbtkWxBlackBox.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.h,v $ Language: C++ - Date: $Date: 2008/01/28 14:32:54 $ - Version: $Revision: 1.3 $ + Date: $Date: 2008/02/06 14:14:22 $ + 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 @@ -189,19 +189,19 @@ namespace bbtk // UserBlackBox description BBTK_BEGIN_DESCRIBE_BLACK_BOX(WxBlackBox,bbtk::UserBlackBox); BBTK_NAME("WxBlackBox"); - // BBTK_INPUT_NOCOPY(WxBlackBox,WinParent,"Parent widget box", - // WxParentToChildData*); + BBTK_DESCRIPTION("Widget box. The inputs marked with (*) are only used if the widget is not inserted in another widget.\n"); + BBTK_CATEGORY("widget"); BBTK_INPUT(WxBlackBox,WinTitle, - "Title of the window (only used if the box is the top window of a Parent-Child hierarchy)", + "Title of the window (*)", std::string); BBTK_INPUT(WxBlackBox,WinWidth, - "Width of the window (only used if the box is the top window of a Parent-Child hierarchy)",int); + "Width of the window (*)",int); BBTK_INPUT(WxBlackBox,WinHeight, - "Height of the window (only used if the box is the top window of a Parent-Child hierarchy)",int); + "Height of the window (*)",int); BBTK_INPUT(WxBlackBox,WinDialog, - "Set to 'true' to have a dialog window, i.e. which is modal (steals the focus until closed) (only used if the box is the top window of a Parent-Child hierarchy)",bool); + "Set to 'true' to create a dialog window, i.e. which blocks the pipeline until it is closed (modal) (*)",bool); BBTK_INPUT(WxBlackBox,WinHide, - "Any signal received hides the window (only active if the box is the top window of a Parent-Child hierarchy)",Void); + "Any signal received hides the window (*)",Void); BBTK_OUTPUT(WxBlackBox,Widget,"Output widget",wxWindow*); BBTK_END_DESCRIBE_BLACK_BOX(WxBlackBox); //================================================================= diff --git a/kernel/src/bbtkWxBrowser.cxx b/kernel/src/bbtkWxBrowser.cxx index f0df6cf..3776e1f 100644 --- a/kernel/src/bbtkWxBrowser.cxx +++ b/kernel/src/bbtkWxBrowser.cxx @@ -31,6 +31,7 @@ namespace bbtk bwd_id, fwd_id, home_id, + reload_id, index_id, url_id, html_id @@ -41,6 +42,7 @@ namespace bbtk EVT_BUTTON(bwd_id, WxBrowser::OnBackButton ) EVT_BUTTON(fwd_id, WxBrowser::OnForwardButton ) EVT_BUTTON(home_id, WxBrowser::OnHomeButton ) + EVT_BUTTON(reload_id, WxBrowser::OnReloadButton ) EVT_BUTTON(index_id, WxBrowser::OnMakeIndexButton ) EVT_TEXT_ENTER(url_id, WxBrowser::OnURLEnter ) EVT_HTML_LINK_CLICKED(html_id, WxBrowser::OnLinkClicked) @@ -79,6 +81,11 @@ namespace bbtk bsizer->Add ( mwxHomeButton, 0, wxALIGN_CENTRE | wxLEFT | wxTOP | wxBOTTOM , 10 ); + mwxReloadButton = new wxButton( panel, reload_id,_T("."),wxDefaultPosition, + wxDefaultSize,wxBU_EXACTFIT); + bsizer->Add ( mwxReloadButton, 0, wxALIGN_CENTRE | + wxTOP | wxBOTTOM , 10 ); + mwxMakeIndexButton = new wxButton( panel, index_id, _T("*"),wxDefaultPosition, wxDefaultSize,wxBU_EXACTFIT); @@ -121,6 +128,8 @@ namespace bbtk panel -> SetAutoLayout(true); panel -> Layout(); + GoHome(); + /* Connect( mwxBackButton->GetId(), wxEVT_COMMAND_BUTTON_CLICKED , @@ -181,7 +190,7 @@ namespace bbtk //======================================================================== //======================================================================== - void WxBrowser::OnHomeButton(wxCommandEvent& ) + void WxBrowser::GoHome() { std::string url = ConfigurationFile::GetInstance().Get_url(); url += "/bbtkWebSite/menu.html"; @@ -189,6 +198,21 @@ namespace bbtk } //======================================================================== + //======================================================================== + void WxBrowser::OnHomeButton(wxCommandEvent& ) + { + GoHome(); + } + //======================================================================== + + //======================================================================== + void WxBrowser::OnReloadButton(wxCommandEvent& ) + { + std::string s = wx2std(mwxHtmlWindow->GetOpenedPage()); + GoTo(s); + } + //======================================================================== + //======================================================================== void WxBrowser::OnMakeIndexButton(wxCommandEvent& ) { diff --git a/kernel/src/bbtkWxBrowser.h b/kernel/src/bbtkWxBrowser.h index 2554a17..131b77e 100644 --- a/kernel/src/bbtkWxBrowser.h +++ b/kernel/src/bbtkWxBrowser.h @@ -41,10 +41,12 @@ namespace bbtk WxBrowser ( wxWindow *parent, wxSize size ); bool GoTo(std::string&); + void GoHome(); void OnBackButton(wxCommandEvent& ); void OnForwardButton(wxCommandEvent& ); void OnHomeButton(wxCommandEvent& ); + void OnReloadButton(wxCommandEvent& ); void OnMakeIndexButton(wxCommandEvent& ); void OnLinkClicked(wxHtmlLinkEvent& ); void OnURLEnter( wxCommandEvent&); @@ -59,6 +61,7 @@ namespace bbtk wxButton* mwxBackButton; wxButton* mwxForwardButton; wxButton* mwxHomeButton; + wxButton* mwxReloadButton; wxButton* mwxMakeIndexButton; // any class wishing to process wxWidgets events must use this macro diff --git a/packages/itk/doc/bbdoc/header.html.in b/packages/itk/doc/bbdoc/header.html.in index b0e7b0a..28c72c2 100644 --- a/packages/itk/doc/bbdoc/header.html.in +++ b/packages/itk/doc/bbdoc/header.html.in @@ -4,5 +4,9 @@

Version @BBTK_PACKAGE_MAJOR_VERSION@.@BBTK_PACKAGE_MINOR_VERSION@.@BBTK_PACKAGE_BUILD_VERSION@ - by @BBTK_PACKAGE_AUTHOR@ +

@BBTK_PACKAGE_DESCRIPTION@ + +

+ Doxygen documentation of the source code diff --git a/packages/std/doc/bbdoc/header.html.in b/packages/std/doc/bbdoc/header.html.in index b0e7b0a..28c72c2 100644 --- a/packages/std/doc/bbdoc/header.html.in +++ b/packages/std/doc/bbdoc/header.html.in @@ -4,5 +4,9 @@

Version @BBTK_PACKAGE_MAJOR_VERSION@.@BBTK_PACKAGE_MINOR_VERSION@.@BBTK_PACKAGE_BUILD_VERSION@ - by @BBTK_PACKAGE_AUTHOR@ +

@BBTK_PACKAGE_DESCRIPTION@ + +

+ Doxygen documentation of the source code diff --git a/packages/std/src/bbstdMagicBox.h b/packages/std/src/bbstdMagicBox.h index c4226c9..3b084b3 100644 --- a/packages/std/src/bbstdMagicBox.h +++ b/packages/std/src/bbstdMagicBox.h @@ -67,16 +67,20 @@ namespace bbstd BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); BBTK_CATEGORY("adaptor"); BBTK_DESCRIPTION("MagicBox"); - AddInputDescriptor(new bbtk::UserBlackBoxInputDescriptor - ("In","Input data", - new bbtk::UserBlackBoxTGetFunctor - (&MagicBox::bbGetInputIn), - new MagicBoxSetFunctor (&MagicBox::bbSetInputIn) ) ); - AddOutputDescriptor(new bbtk::UserBlackBoxOutputDescriptor - ("Out","Output data", - new bbtk::UserBlackBoxTGetFunctor - (&MagicBox::bbGetOutputOut), - new MagicBoxSetFunctor (&MagicBox::bbSetOutputOut) ) ); + AddInputDescriptor + (new bbtk::UserBlackBoxInputDescriptor + (typeid(MagicBoxDescriptor), + "In","Input data", + new bbtk::UserBlackBoxTGetFunctor + (&MagicBox::bbGetInputIn), + new MagicBoxSetFunctor (&MagicBox::bbSetInputIn) ) ); + AddOutputDescriptor + (new bbtk::UserBlackBoxOutputDescriptor + (typeid(MagicBoxDescriptor), + "Out","Output data", + new bbtk::UserBlackBoxTGetFunctor + (&MagicBox::bbGetOutputOut), + new MagicBoxSetFunctor (&MagicBox::bbSetOutputOut) ) ); BBTK_END_DESCRIBE_BLACK_BOX(MagicBox); } // namespace bbstd diff --git a/packages/void-bbtk-package.tgz b/packages/void-bbtk-package.tgz index 098e1cf..2049994 100644 Binary files a/packages/void-bbtk-package.tgz and b/packages/void-bbtk-package.tgz differ diff --git a/packages/wx/doc/bbdoc/header.html.in b/packages/wx/doc/bbdoc/header.html.in index b0e7b0a..28c72c2 100644 --- a/packages/wx/doc/bbdoc/header.html.in +++ b/packages/wx/doc/bbdoc/header.html.in @@ -4,5 +4,9 @@

Version @BBTK_PACKAGE_MAJOR_VERSION@.@BBTK_PACKAGE_MINOR_VERSION@.@BBTK_PACKAGE_BUILD_VERSION@ - by @BBTK_PACKAGE_AUTHOR@ +

@BBTK_PACKAGE_DESCRIPTION@ + +

+ Doxygen documentation of the source code diff --git a/packages/wx/src/bbwxNotebook.h b/packages/wx/src/bbwxNotebook.h index c4875ac..bc0ab8a 100644 --- a/packages/wx/src/bbwxNotebook.h +++ b/packages/wx/src/bbwxNotebook.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxNotebook.h,v $ Language: C++ - Date: $Date: 2008/02/06 07:30:09 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/06 14:14:24 $ + 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 @@ -80,7 +80,7 @@ namespace bbwx BBTK_NAME("Notebook"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Notebook widget (wxNotebook)"); - BBTK_CATEGORY("widget"); + // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); BBTK_INPUT(Notebook,Widget1,"widget 1",wxWindow*); BBTK_INPUT(Notebook,Widget2,"widget 2",wxWindow*); BBTK_INPUT(Notebook,Widget3,"widget 3",wxWindow*); diff --git a/packages/wx/src/bbwxSizer.h b/packages/wx/src/bbwxSizer.h index a2e756d..efb9b0d 100644 --- a/packages/wx/src/bbwxSizer.h +++ b/packages/wx/src/bbwxSizer.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxSizer.h,v $ Language: C++ - Date: $Date: 2008/02/06 07:30:09 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/02/06 14:14:24 $ + 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 @@ -80,7 +80,7 @@ namespace bbwx BBTK_NAME("Sizer"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Sizer widget (wxSizer)"); - BBTK_CATEGORY("widget"); + // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); BBTK_INPUT(Sizer,Widget1,"widget 1",wxWindow*); BBTK_INPUT(Sizer,Widget2,"widget 2",wxWindow*); diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h index 3a17e3d..b61f5b9 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/05 12:16:56 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/02/06 14:14:24 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -147,7 +147,7 @@ namespace bbwx BBTK_BEGIN_DESCRIBE_BLACK_BOX(Slider,bbtk::WxBlackBox); BBTK_NAME("Slider"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); - BBTK_CATEGORY("widget"); + // 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); diff --git a/packages/wx/src/bbwxSplit.h b/packages/wx/src/bbwxSplit.h index d402182..56a87f8 100644 --- a/packages/wx/src/bbwxSplit.h +++ b/packages/wx/src/bbwxSplit.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxSplit.h,v $ Language: C++ - Date: $Date: 2008/02/05 12:16:56 $ - Version: $Revision: 1.5 $ + Date: $Date: 2008/02/06 14:14:24 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -99,7 +99,7 @@ namespace bbwx BBTK_NAME("Split"); BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Widget which splits a window in two fixed size parts (wxSplitterWindow)"); - BBTK_CATEGORY("widget"); + // Already inserted for any WxBlackBox BBTK_CATEGORY("widget"); BBTK_INPUT(Split,Widget1,"Upper or left widget",wxWindow*); BBTK_INPUT(Split,Widget2,"Lower or right widget",wxWindow*); BBTK_INPUT(Split,Orientation,"Orientation (default 0), 0=Horizontal , 1=Vertical",int);