From e4de8cde07118f7b9059aaf5460645c61491bb0d Mon Sep 17 00:00:00 2001 From: guigues Date: Wed, 6 Feb 2008 07:30:07 +0000 Subject: [PATCH] *** empty log message *** --- kernel/appli/bbfy/bbfy.cpp | 12 ++++++++ packages/BoxCategories.txt | 1 + packages/itk/src/bbitkAnyImageToTypedImage.h | 3 +- packages/itk/src/bbitkImageRegion.h | 1 + packages/itk/src/bbitkTypedImageToAnyImage.h | 2 +- packages/std/bbs/boxes/bbPrependDataPath.bbs | 1 + packages/std/src/bbstdMultipleInputs.xml | 1 + packages/std/src/bbstdRelay.h | 4 +-- packages/wx/bbs/appli/testSlider.bbs | 2 +- packages/wx/bbs/appli/testSplit.bbs | 2 +- packages/wx/bbs/boxes/bbDoubleSlider.bbs | 17 ++++++----- packages/wx/src/bbwxNotebook.h | 28 +++++++++--------- packages/wx/src/bbwxSizer.h | 31 ++++++++++---------- 13 files changed, 62 insertions(+), 43 deletions(-) diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp index d5a6273..320bc1d 100644 --- a/kernel/appli/bbfy/bbfy.cpp +++ b/kernel/appli/bbfy/bbfy.cpp @@ -59,6 +59,7 @@ private: bool mGeneric; std::string mAuthor; std::string mDescription; + std::string mCategory; std::string mPackage; bool mIsInNamespace; std::string mNamespace; @@ -245,6 +246,14 @@ void bbfy::ParseXML() mDescription += val; } + // Category + for (i=0,j=0; i()+"*)"); BBTK_DEFAULT_ADAPTOR(); - BBTK_CATEGORY("adaptor;image"); + BBTK_CATEGORY("adaptor"); BBTK_TEMPLATE_INPUT(AnyImageToTypedImage,In, "Input generic image",anyImagePointer); BBTK_TEMPLATE_OUTPUT(AnyImageToTypedImage,Out, @@ -82,6 +82,7 @@ namespace bbitk bbtk::TypeName()+ ") into a typed itk image ("+ bbtk::TypeName()+"*)"); + BBTK_CATEGORY("adaptor"); BBTK_DEFAULT_ADAPTOR(); BBTK_TEMPLATE2_INPUT(AnyImageToConstTypedImage,In, "Input generic image",anyImagePointer); diff --git a/packages/itk/src/bbitkImageRegion.h b/packages/itk/src/bbitkImageRegion.h index 6d3015b..7c98f8f 100644 --- a/packages/itk/src/bbitkImageRegion.h +++ b/packages/itk/src/bbitkImageRegion.h @@ -61,6 +61,7 @@ namespace bbitk BBTK_NAME("ImageRegion"); BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); BBTK_DESCRIPTION("Creates a generic ImageRegion ("+bbtk::TypeName()+") from two vectors providing the index and size of the region. The dimension D of the actual itk::ImageRegion created is the max of the sizes of Index and Size (the smallest vector is padded by zeros)."); + BBTK_CATEGORY("image"); typedef std::vector vectoroflong; BBTK_INPUT(ImageRegionCreator,Index,"Vector of region indices", vectoroflong); diff --git a/packages/itk/src/bbitkTypedImageToAnyImage.h b/packages/itk/src/bbitkTypedImageToAnyImage.h index 312b0a2..4d870f1 100644 --- a/packages/itk/src/bbitkTypedImageToAnyImage.h +++ b/packages/itk/src/bbitkTypedImageToAnyImage.h @@ -33,7 +33,7 @@ namespace bbitk BBTK_DESCRIPTION("Transforms a typed itk image ("+bbtk::HumanTypeName()+ ") into a generic itk image ("+ bbtk::HumanTypeName()+")"); - BBTK_CATEGORY("adaptor;image"); + BBTK_CATEGORY("adaptor"); BBTK_DEFAULT_ADAPTOR(); BBTK_TEMPLATE_INPUT(TypedImageToAnyImage,In, "Input typed image",T); diff --git a/packages/std/bbs/boxes/bbPrependDataPath.bbs b/packages/std/bbs/boxes/bbPrependDataPath.bbs index ee5d57a..e60b8a5 100755 --- a/packages/std/bbs/boxes/bbPrependDataPath.bbs +++ b/packages/std/bbs/boxes/bbPrependDataPath.bbs @@ -2,6 +2,7 @@ load std define PrependDataPath author "jpr@creatis.insa-lyon.fr" description "Prepends the input string file 'last name' with the default DataPath found in bbtk_config_xml" + category "misc" # For getting default Data Path new Configuration c diff --git a/packages/std/src/bbstdMultipleInputs.xml b/packages/std/src/bbstdMultipleInputs.xml index f2cc3c9..fc8440c 100644 --- a/packages/std/src/bbstdMultipleInputs.xml +++ b/packages/std/src/bbstdMultipleInputs.xml @@ -4,6 +4,7 @@ laurent.guigues@creatis.insa-lyon.fr This box has multiple Void inputs and one Void output. Hence it relays any input modification to its output. It is usefull to plug different BoxChange outputs into the same BoxExecute. + misc bbtk::UserBlackBox std diff --git a/packages/std/src/bbstdRelay.h b/packages/std/src/bbstdRelay.h index b44cb25..92b848c 100644 --- a/packages/std/src/bbstdRelay.h +++ b/packages/std/src/bbstdRelay.h @@ -23,8 +23,8 @@ namespace bbstd BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr"); BBTK_CATEGORY("misc"); BBTK_DESCRIPTION("Relays a "+bbtk::TypeName()); - BBTK_TEMPLATE_INPUT(Relay,In,"Input",T); - BBTK_TEMPLATE_OUTPUT(Relay,Out,"Output",T); + BBTK_TEMPLATE_INPUT(Relay,In,"Input",T); + BBTK_TEMPLATE_OUTPUT(Relay,Out,"Output",T); BBTK_END_DESCRIBE_TEMPLATE_BLACK_BOX(Relay); } // namespace bbstd diff --git a/packages/wx/bbs/appli/testSlider.bbs b/packages/wx/bbs/appli/testSlider.bbs index 8078c51..85526b7 100644 --- a/packages/wx/bbs/appli/testSlider.bbs +++ b/packages/wx/bbs/appli/testSlider.bbs @@ -1,6 +1,6 @@ description "Simple test of wx::Slider widget" author "laurent.guigues@creatis.insa-lyon.fr" -category "test;wx" +category "test;widget" load wx new Slider slider diff --git a/packages/wx/bbs/appli/testSplit.bbs b/packages/wx/bbs/appli/testSplit.bbs index 0c76ccf..3f47aab 100644 --- a/packages/wx/bbs/appli/testSplit.bbs +++ b/packages/wx/bbs/appli/testSplit.bbs @@ -1,6 +1,6 @@ description "Simple test of wx::Split widget" author "laurent.guigues@creatis.insa-lyon.fr" -category "test" +category "test;widget" load wx diff --git a/packages/wx/bbs/boxes/bbDoubleSlider.bbs b/packages/wx/bbs/boxes/bbDoubleSlider.bbs index ed6226b..9b96219 100644 --- a/packages/wx/bbs/boxes/bbDoubleSlider.bbs +++ b/packages/wx/bbs/boxes/bbDoubleSlider.bbs @@ -1,14 +1,15 @@ define DoubleSlider description "test object" - category "box;wx;slider" + category "widget" author "laurent.guigues at creatis.insa-lyon.fr" -new Slider slider1 -new Slider slider2 -new Split main + + new Slider slider1 + new Slider slider2 + new Split main -connect slider1.Widget main.Widget1 -connect slider2.Widget main.Widget2 + connect slider1.Widget main.Widget1 + connect slider2.Widget main.Widget2 -exec main -output Widget main.Widget "Widget" + exec main + output Widget main.Widget "Widget" endefine diff --git a/packages/wx/src/bbwxNotebook.h b/packages/wx/src/bbwxNotebook.h index 3e004d4..c4875ac 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/05 18:05:32 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 07:30:09 $ + 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,19 +79,19 @@ namespace bbwx BBTK_BEGIN_DESCRIBE_BLACK_BOX(Notebook,bbtk::WxBlackBox); BBTK_NAME("Notebook"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); - BBTK_DESCRIPTION("Notebook widget (wxNotebook)"); - BBTK_INPUT(Notebook,Widget1,"widget 1",wxWindow*); - BBTK_INPUT(Notebook,Widget2,"widget 2",wxWindow*); - BBTK_INPUT(Notebook,Widget3,"widget 3",wxWindow*); - BBTK_INPUT(Notebook,Widget4,"widget 4",wxWindow*); - BBTK_INPUT(Notebook,Widget5,"widget 5",wxWindow*); - BBTK_INPUT(Notebook,Widget6,"widget 6",wxWindow*); - BBTK_INPUT(Notebook,Widget7,"widget 7",wxWindow*); - BBTK_INPUT(Notebook,Widget8,"widget 8",wxWindow*); - BBTK_INPUT(Notebook,Widget9,"widget 9",wxWindow*); - BBTK_INPUT(Notebook,Widget10,"widget 10",wxWindow*); - BBTK_INPUT(Notebook,Orientation,"Orientation (default 0), 0=Top , 1=Left , 2=Right , 3=Botton",int); + BBTK_CATEGORY("widget"); + BBTK_INPUT(Notebook,Widget1,"widget 1",wxWindow*); + BBTK_INPUT(Notebook,Widget2,"widget 2",wxWindow*); + BBTK_INPUT(Notebook,Widget3,"widget 3",wxWindow*); + BBTK_INPUT(Notebook,Widget4,"widget 4",wxWindow*); + BBTK_INPUT(Notebook,Widget5,"widget 5",wxWindow*); + BBTK_INPUT(Notebook,Widget6,"widget 6",wxWindow*); + BBTK_INPUT(Notebook,Widget7,"widget 7",wxWindow*); + BBTK_INPUT(Notebook,Widget8,"widget 8",wxWindow*); + BBTK_INPUT(Notebook,Widget9,"widget 9",wxWindow*); + BBTK_INPUT(Notebook,Widget10,"widget 10",wxWindow*); + BBTK_INPUT(Notebook,Orientation,"Orientation (default 0), 0=Top , 1=Left , 2=Right , 3=Botton",int); BBTK_END_DESCRIBE_BLACK_BOX(Notebook); //================================================================= diff --git a/packages/wx/src/bbwxSizer.h b/packages/wx/src/bbwxSizer.h index a4eba45..a2e756d 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/04 16:42:10 $ - Version: $Revision: 1.1 $ + Date: $Date: 2008/02/06 07:30:09 $ + 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,22 +79,23 @@ namespace bbwx BBTK_BEGIN_DESCRIBE_BLACK_BOX(Sizer,bbtk::WxBlackBox); BBTK_NAME("Sizer"); BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr"); - BBTK_DESCRIPTION("Sizer widget (wxSizer)"); - BBTK_INPUT(Sizer,Widget1,"widget 1",wxWindow*); - BBTK_INPUT(Sizer,Widget2,"widget 2",wxWindow*); - BBTK_INPUT(Sizer,Widget3,"widget 3",wxWindow*); - BBTK_INPUT(Sizer,Widget4,"widget 4",wxWindow*); - BBTK_INPUT(Sizer,Widget5,"widget 5",wxWindow*); - BBTK_INPUT(Sizer,Widget6,"widget 6",wxWindow*); - BBTK_INPUT(Sizer,Widget7,"widget 7",wxWindow*); - BBTK_INPUT(Sizer,Widget8,"widget 8",wxWindow*); - BBTK_INPUT(Sizer,Widget9,"widget 9",wxWindow*); - BBTK_INPUT(Sizer,Widget10,"widget 10",wxWindow*); - BBTK_INPUT(Sizer,Orientation,"Orientation (default 1), 0=Horizontal , 1=Vertical",int); + BBTK_CATEGORY("widget"); + + BBTK_INPUT(Sizer,Widget1,"widget 1",wxWindow*); + BBTK_INPUT(Sizer,Widget2,"widget 2",wxWindow*); + BBTK_INPUT(Sizer,Widget3,"widget 3",wxWindow*); + BBTK_INPUT(Sizer,Widget4,"widget 4",wxWindow*); + BBTK_INPUT(Sizer,Widget5,"widget 5",wxWindow*); + BBTK_INPUT(Sizer,Widget6,"widget 6",wxWindow*); + BBTK_INPUT(Sizer,Widget7,"widget 7",wxWindow*); + BBTK_INPUT(Sizer,Widget8,"widget 8",wxWindow*); + BBTK_INPUT(Sizer,Widget9,"widget 9",wxWindow*); + BBTK_INPUT(Sizer,Widget10,"widget 10",wxWindow*); + BBTK_INPUT(Sizer,Orientation,"Orientation (default 1), 0=Horizontal , 1=Vertical",int); BBTK_END_DESCRIBE_BLACK_BOX(Sizer); //================================================================= - + } -- 2.45.1