*** empty log message ***

diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp
index d5a62730e520254bd47e9f397fb8dd9ab0c813f9..320bc1d6287a3e9d001a2cbea0b4150c2f9cbeb9 100644 (file)
--- 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<BB.nChildNode("category"); i++) 
+    {
+      std::string val;
+      GetTextOrClear(BB.getChildNode("category",&j),val);
+      mCategory += val;
+    }
+
   // Namespace
   mIsInNamespace = false;
   if (BB.nChildNode("namespace"))
@@ -671,6 +680,9 @@ void bbfy::CreateHeader()
   // Description
   mFile << "BBTK_DESCRIPTION(\""<<mDescription<< "\");\n"; 
   
+  // Category
+  mFile << "BBTK_CATEGORY(\""<<mCategory<< "\");\n"; 
+  
   // Inputs
   for (ioi=mInput.begin(); ioi!=mInput.end(); ++ioi) 
     {

diff --git a/packages/BoxCategories.txt b/packages/BoxCategories.txt
index 291e6706927f511f511fc87a3a6f9c488d9fded1..66b38a2d0bc61f0b6103a68557ef9e58f01e6bba 100644 (file)
--- a/packages/BoxCategories.txt
+++ b/packages/BoxCategories.txt
@@ -1,4 +1,5 @@
 adaptor
+application ? cf. itk/appli/ImageCrop.bbs
 demo
 filter
 image

diff --git a/packages/itk/src/bbitkAnyImageToTypedImage.h b/packages/itk/src/bbitkAnyImageToTypedImage.h
index a4f3696ef4254373b4d3077cb256869367e4b3ae..5fad5fc4682cf731bfcc5e9e0d3bff07ec5f10d7 100644 (file)
--- a/packages/itk/src/bbitkAnyImageToTypedImage.h
+++ b/packages/itk/src/bbitkAnyImageToTypedImage.h
@@ -33,7 +33,7 @@ namespace bbitk
                   ") into a typed itk image ("+
                   bbtk::HumanTypeName<T>()+"*)");
   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<anyImagePointer>()+
                   ") into a typed itk image ("+
                   bbtk::TypeName<T2>()+"*)");
+  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 6d3015b22d432ec99091fab954bb2fbf25a54458..7c98f8facf8dc40e444823d182631007f78c084b 100644 (file)
--- 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<anyImageRegion>()+") from two vectors providing the index and size of the region. The dimension D of the actual itk::ImageRegion<D> created is the max of the sizes of Index and Size (the smallest vector is padded by zeros).");
+  BBTK_CATEGORY("image");
        typedef std::vector<long> 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 312b0a2c85d1629f334bf0a750827971693d86d2..4d870f15df08fdbc8b1b46efe2c68a91b85a0a12 100644 (file)
--- 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<T>()+
                   ") into a generic itk image ("+
                   bbtk::HumanTypeName<anyImagePointer>()+")");
-  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 ee5d57a135d1840fa645a35abced4cd961adc0d2..e60b8a50c19def97aa8cea8250b80da60e8561b7 100755 (executable)
--- 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 f2cc3c9cece838493e2b351b8f94803f20a827ab..fc8440caacaf434c63221c180c29f63c0c1482ab 100644 (file)
--- a/packages/std/src/bbstdMultipleInputs.xml
+++ b/packages/std/src/bbstdMultipleInputs.xml
@@ -4,6 +4,7 @@
 
   <author>laurent.guigues@creatis.insa-lyon.fr</author>
   <description>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.</description>
+  <category>misc</category>
 
   <parentblackbox>bbtk::UserBlackBox</parentblackbox>
   <package>std</package>

diff --git a/packages/std/src/bbstdRelay.h b/packages/std/src/bbstdRelay.h
index b44cb25a0846c8ab1a2ee8c4a15a028c23f6d5e0..92b848c021aec818c9248bb6208074c618175e16 100644 (file)
--- 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<T>());
-     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 8078c5189f7155ed9247bfcf084526f1f2c0cf50..85526b7e3b3398fb5aab66684b1e7c3a6ef5b69b 100644 (file)
--- 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 0c76ccf919f782ada4b5a13a62157dec55dae6b0..3f47aabd64da78cc316329f8fa2e3c829828a1a5 100644 (file)
--- 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 ed6226b70daede2804dab97c4cb60d14ed48dd78..9b96219716d43e78092ee79d1f2e15cd4e34e9af 100644 (file)
--- 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 3e004d4f713933507591dc1548b25024b65aab95..c4875ac86133034d9e05309e51a44d7bebfbc243 100644 (file)
--- 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 a4eba459437599862e189e04e789bde359e86f95..a2e756d8c516ce39b7b570ff11503fb003ac2680 100644 (file)
--- 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);
   //=================================================================
-
+  
 
 
 }