Clean Code

diff --git a/kernel/appli/bbs2cpp/bbs2.cxx b/kernel/appli/bbs2cpp/bbs2.cxx
index 305efbf691cf2989ddf126cfb181da5ae3e60dd2..180e8dae6959f357f6bdc654ed410f9b18c39d58 100644 (file)
--- a/kernel/appli/bbs2cpp/bbs2.cxx
+++ b/kernel/appli/bbs2cpp/bbs2.cxx
@@ -92,7 +92,7 @@ int main(int argc, char* argv[])
              fprintf(ff,"class %s:\n",fileBase.c_str() );
              fprintf(ff,"\n" );
              fprintf(ff,"    def __init__(self):\n" );
-             fprintf(ff,"        self.mCBpy  =  ComplexBlackBox('appliTest03')\n" );
+             fprintf(ff,"        self.mCBpy  =  ComplexBlackBox('%s')\n",file.c_str() );
              fprintf(ff,"\n" );
              fprintf(ff,"    def Run(self):\n" );
              int i,size=pythonBBTK.size();

diff --git a/packages/std/src/bbstdConcatStrings.h b/packages/std/src/bbstdConcatStrings.h
index ad0ac839c85b554230430c192aec03efa1fa7390..df510f3b2da447d49757a30da70597e28f80c640 100644 (file)
--- a/packages/std/src/bbstdConcatStrings.h
+++ b/packages/std/src/bbstdConcatStrings.h
@@ -67,7 +67,7 @@ namespace bbstd
   BBTK_NAME("ConcatStrings");
   BBTK_AUTHOR("jean-pierre.roux@creatis.insa-lyon.fr");
   BBTK_CATEGORY("misc");
-  BBTK_DESCRIPTION("String concatenation (C++,Python,JavaScript)");
+  BBTK_DESCRIPTION("(C++,Python,JavaScript) 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,"");  

diff --git a/packages/std/src/bbstdDiv.xml b/packages/std/src/bbstdDiv.xml
index ab02f2ce53044ae13bb2dbb48d868c9cdf497e6a..6bc651c2e557f6fe9e7e12138fb9e4ec0a9903bf 100644 (file)
--- a/packages/std/src/bbstdDiv.xml
+++ b/packages/std/src/bbstdDiv.xml
@@ -3,7 +3,7 @@
 <blackbox name="Div">
 
   <author>laurent.guigues@creatis.insa-lyon.fr</author>
-  <description>Divides its inputs (C++,Python)</description>
+  <description>(C++,Python) Divides its inputs</description>
   <category>math</category>
 
   <input name="In1"  type="double" description="Numerator"/>

diff --git a/packages/std/src/bbstdFilesFromDirectory.h b/packages/std/src/bbstdFilesFromDirectory.h
index 3ba18ead3b8c19c2a21712776e3668d2ed437f0a..6c6baf4d952074de66de0481920c4dd9d87d21be 100644 (file)
--- a/packages/std/src/bbstdFilesFromDirectory.h
+++ b/packages/std/src/bbstdFilesFromDirectory.h
@@ -67,7 +67,7 @@ namespace bbstd
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(FilesFromDirectory,bbtk::AtomicBlackBox);
    BBTK_NAME("FilesFromDirectory");
    BBTK_AUTHOR("jpr@creatis.univ-lyon1.fr");
-   BBTK_DESCRIPTION("returns the fullPathNames of the files in a Directory (C++,Python)");
+   BBTK_DESCRIPTION("(C++,Python) Returns the fullPathNames of the files in a Directory");
    BBTK_CATEGORY("");
 
    BBTK_INPUT(FilesFromDirectory,Active,"(default true) Active true/false ",bool,"");

diff --git a/packages/std/src/bbstdGetVectorElement.h b/packages/std/src/bbstdGetVectorElement.h
index 8cc11ce50716932ea7b379161acd0ef8b72b1776..64353a68d28bca87142c2a67dff74126e6a89c44 100644 (file)
--- a/packages/std/src/bbstdGetVectorElement.h
+++ b/packages/std/src/bbstdGetVectorElement.h
@@ -63,7 +63,7 @@ namespace bbstd
   BBTK_NAME("Get"+bbtk::HumanTypeName<std::vector<T> >()+"Element");
   BBTK_AUTHOR("info-dev@creatis.insa-lyon.fr");
  // BBTK_DEFAULT_ADAPTOR();
-  BBTK_DESCRIPTION("Gets the i-th element from the input vector ("+bbtk::TypeName<std::vector<T> >());
+  BBTK_DESCRIPTION("(C++,Python) Gets the i-th element from the input vector ("+bbtk::TypeName<std::vector<T> >());
   typedef std::vector<T> Tvector;
   BBTK_TEMPLATE_INPUT(GetVectorElement, In,"Input",Tvector);
   BBTK_TEMPLATE_INPUT(GetVectorElement, I, "iElement (default 0)",int);  

diff --git a/packages/vtk/src/bbvtkMarchingCubes.h b/packages/vtk/src/bbvtkMarchingCubes.h
index c94d76ff242f263e797cd11d5692d39bdf9caf5b..2b6ad659b06de556a4f13f59aed154315f4f5b5c 100644 (file)
--- a/packages/vtk/src/bbvtkMarchingCubes.h
+++ b/packages/vtk/src/bbvtkMarchingCubes.h
@@ -111,7 +111,7 @@ namespace bbvtk
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(MarchingCubes,bbtk::AtomicBlackBox);
   BBTK_NAME("MarchingCubes");
   BBTK_AUTHOR("laurent.guigues@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("Extracts an iso-surface of an image using the marching cubes algorithm (bbfication of vtkMarchingCubes) (C++,Python)");
+  BBTK_DESCRIPTION("(C++,Python) Extracts an iso-surface of an image using the marching cubes algorithm (bbfication of vtkMarchingCubes)");
   BBTK_CATEGORY("image;mesh");
 
   BBTK_INPUT(MarchingCubes,Active,"Active true/false (default true)",bool,"");

diff --git a/packages/vtk/src/bbvtkMetaImageReader.h b/packages/vtk/src/bbvtkMetaImageReader.h
index f00867c8aafce6bfbccba544097a3466b1ec52fb..10b81b5f9acf4f102c2d1e4d98a6c103e1616501 100644 (file)
--- a/packages/vtk/src/bbvtkMetaImageReader.h
+++ b/packages/vtk/src/bbvtkMetaImageReader.h
@@ -34,7 +34,7 @@ class bbvtk_EXPORT MetaImageReader
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(MetaImageReader,bbtk::AtomicBlackBox);
   BBTK_NAME("MetaImageReader");
   BBTK_AUTHOR("Info-Dev");
-  BBTK_DESCRIPTION("No Description. (C++,Python)");
+  BBTK_DESCRIPTION("(C++,Python) No Description.");
   BBTK_CATEGORY("empty");
 
   BBTK_INPUT(MetaImageReader,In,"File Name",std::string,"");

diff --git a/packages/vtk/src/bbvtkPolyDataToActor.h b/packages/vtk/src/bbvtkPolyDataToActor.h
index f0c9beb6b5387c35a65439470ac04224294f2661..ee07da7fada3842c6aa29c43f86bf0dd00224a7a 100644 (file)
--- a/packages/vtk/src/bbvtkPolyDataToActor.h
+++ b/packages/vtk/src/bbvtkPolyDataToActor.h
@@ -107,7 +107,7 @@ namespace bbvtk
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(PolyDataToActor,bbtk::AtomicBlackBox);
   BBTK_NAME("PolyDataToActor");
   BBTK_AUTHOR("eduardo.davila at creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("takes a vtkPolyData object to insert into a 3D scene (e.g. a Viewer3D) (C++,Python,JavaScript)");
+  BBTK_DESCRIPTION("(C++,Python,JavaScript) Takes a vtkPolyData object to insert into a 3D scene (e.g. a Viewer3D)");
   typedef std::vector<double> vectorcolour;
   BBTK_CATEGORY("3D object creator");
   BBTK_INPUT(PolyDataToActor,In,"Input image",vtkPolyData*,"");

diff --git a/packages/wx/src/bbwxComboBox.h b/packages/wx/src/bbwxComboBox.h
index 3a02e0539bbd04bf83352eb5d5f512816479264d..68ea71c3a668f7700c1940c70c485ca7682dcb38 100644 (file)
--- a/packages/wx/src/bbwxComboBox.h
+++ b/packages/wx/src/bbwxComboBox.h
@@ -40,7 +40,7 @@ class bbwx_EXPORT ComboBox
 BBTK_BEGIN_DESCRIBE_BLACK_BOX(ComboBox,bbtk::WxBlackBox);
        BBTK_NAME("ComboBox");
        BBTK_AUTHOR("Info-Dev");
-       BBTK_DESCRIPTION("No Description.");
+       BBTK_DESCRIPTION("(C++,Python) wxComboBox");
        BBTK_CATEGORY("__CategoryBlackBox__");
 
        BBTK_INPUT(ComboBox,Title,"Title prepended to the text",std::string,"");

diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h
index 7b602e01925a2997697137106d7c73ab86ae518a..e4889b440f98a221c669547aa5dd13ef391ec274 100644 (file)
--- a/packages/wx/src/bbwxLayoutLine.h
+++ b/packages/wx/src/bbwxLayoutLine.h
@@ -100,7 +100,7 @@ namespace bbwx
   BBTK_BEGIN_DESCRIBE_BLACK_BOX(LayoutLine,bbtk::WxBlackBox);
   BBTK_NAME("LayoutLine");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
-  BBTK_DESCRIPTION("LayoutLine widget (wxBoxSizer)");
+  BBTK_DESCRIPTION("(C++,Python) 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*,"");

diff --git a/packages/wx/src/bbwxOutputText.xml b/packages/wx/src/bbwxOutputText.xml
index ea5e5d9427e02e2f869f6b13642f5006666e33c7..97c47049702bccf07b2d90b6b49cdb74c6a3b0ba 100644 (file)
--- a/packages/wx/src/bbwxOutputText.xml
+++ b/packages/wx/src/bbwxOutputText.xml
@@ -3,7 +3,7 @@
 <blackbox name="OutputText" widget>
 
   <author>laurent.guigues at creatis.insa-lyon.fr</author>
-  <description>Text zone to be inserted into a window (wxStaticText)</description>
+  <description>(C++,Python) Text zone to be inserted into a window (wxStaticText)</description>
   <category></category>
 
   <input name="Title" type="std::string" description="Title prepended to the text"/>

diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h
index 82fdeea1e17f14e2731463e42952b9bff38e9f2c..d5cc04df31489d4c60f88e8c54184a7e53ab8d97 100644 (file)
--- a/packages/wx/src/bbwxSlider.h
+++ b/packages/wx/src/bbwxSlider.h
@@ -99,7 +99,7 @@ namespace bbwx
   BBTK_NAME("Slider");
   BBTK_AUTHOR("eduardo.davila@creatis.insa-lyon.fr");
   // Already inserted for any WxBlackBox  BBTK_CATEGORY("widget");
-  BBTK_DESCRIPTION("Slider widget (wxSlider) (C++,Python)");
+  BBTK_DESCRIPTION("(C++,Python) 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,         "");