]> Creatis software - bbtk.git/commitdiff
no message
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Sun, 12 Sep 2010 14:52:23 +0000 (14:52 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Sun, 12 Sep 2010 14:52:23 +0000 (14:52 +0000)
README.txt
kernel/src/bbtkFactory.cxx
kernel/src/bbtkFactory.h
kernel/src/bbtkPackage.cxx
kernel/src/bbtkPackage.h
kernel/src/bbtkWxGUIPackageBrowser2.cxx
kernel/src/bbtkWxGUIPackageBrowser2.h
packages/vtk/src/bbvtkImageContinuousDilate3D.xml [new file with mode: 0644]
packages/vtk/src/bbvtkImageContinuousErode3D.xml [new file with mode: 0644]

index b5d1459c32d9b1dab7af9a2240e0a8bfb46ddf13..fd5277342948eaabb47aaccc374154fd2b44f233 100644 (file)
@@ -1,2 +1,24 @@
 The Black Box Toolkit
 (c) CREATIS-LRMN 2008
+
+
+
+Note Xcode MacOS:
+- ccmake -G"Xcode" <source>
+
+- LATEX_COMPILER:/opt/local/bin/latex
+
+- QT_QMAKER_EXECUTABLE:/opt/local/libexec/qt4-mac/bin/qmake
+
+- Erase all "-Wno-long-double" from the file
+   BBTK.xcodeproj/project.pbxproj
+   > sed "s/-Wno-long-double/ /g" BBTK.xcodeproj/project.pbxproj > BBTK.xcodeproj/tmp.txt
+   > cp BBTK.xcodeproj/tmp.txt BBTK.xcodeproj/project.pbxproj
+
+- Change compiler version
+  1.open <XXX.xcodeproj>
+  2.Project
+    -> Edit project settings
+    -> Build
+  3.Copiler Version -> C/C++ CompilerVersion
+    GCC 4.2
\ No newline at end of file
index 6746746398a24ed4dcb826b4a101265c474320e8..4dd61cb3461ed0cc08cb8651e94bef84b4869ca8 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/09/05 09:20:49 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2010/09/12 14:52:25 $
+  Version:   $Revision: 1.50 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -533,6 +533,22 @@ namespace bbtk
   //===================================================================
   
 
+//     ups3 EED borrame        
+       std::string Factory::GetPackageNameOfaBlackBox(std::string boxType)
+       {
+               std::string result="<void bbtk package name>";
+               PackageMapType::const_iterator i;
+               for (i = mPackageMap.begin(); i!=mPackageMap.end(); ++i )
+               {
+                       if ( i->second->ifBoxExist( boxType ) == true)
+                       {
+                               result = i->first;
+                       }
+               }
+               return result;
+       }
+       
+       
   //===================================================================
   /// Creates an instance of a black box of type <type> with name <name>
   BlackBox::Pointer Factory::NewBlackBox(const std::string& type, 
index 33d886174ae63564a5bf43dd9fd3d83890fe69da..70e60e3c17c3b84beaf7fab0fe76689b8ee3b0cf 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkFactory.h,v $
   Language:  C++
-  Date:      $Date: 2009/06/08 14:50:03 $
-  Version:   $Revision: 1.17 $
+  Date:      $Date: 2010/09/12 14:52:25 $
+  Version:   $Revision: 1.18 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -154,6 +154,8 @@ namespace bbtk
     /// Gets the executer who created the factory (if any) - const
     //    const Executer::Pointer GetExecuter() const { return mExecuter.lock(); }
 
+         std::string GetPackageNameOfaBlackBox(std::string boxType);
+
 
   private:
 
index b5b15c4cda0e9476a43a5f3c92517ccbea665604..66465e9813e2bb200a50e611848ad8c3d3e2cc88 100644 (file)
@@ -3,8 +3,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/02/08 15:15:24 $
-  Version:   $Revision: 1.34 $
+  Date:      $Date: 2010/09/12 14:52:25 $
+  Version:   $Revision: 1.35 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -677,6 +677,18 @@ namespace bbtk
   }
   //==========================================================================
 
+//ups4 EED borrame
+       bool Package::ifBoxExist( std::string type)     
+    {
+               bool ok=false;
+               DescriptorMapType::const_iterator i = mDescriptorMap.find(type);
+               if (i != mDescriptorMap.end())  
+               {
+                       ok=true;
+               }
+               return ok;
+    }
+       
   //==========================================================================
   /// Creates an instance of a black box of type <type> with name <name>
   BlackBox::Pointer Package::NewBlackBox(const std::string& type, 
index 419f3fea752e3e2b4e6ef6afe055e1e6f3d5810f..b1976977dfcb54bbf7a85ef9f21905866c36a276 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkPackage.h,v $
   Language:  C++
-  Date:      $Date: 2009/06/08 14:50:04 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2010/09/12 14:52:25 $
+  Version:   $Revision: 1.16 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -254,7 +254,9 @@ namespace bbtk
     const FactorySet& GetFactorySet() const { return mFactorySet; }
     
     void Check() const;
+         bool ifBoxExist( std::string boxType );
 
+         
   private:
     /// Default ctor is private : use the static New method
     //    Package() {}
index c7b17ea2f0240242e41b0baa105cd0648bd1696c..7d87a0e31c0d281df6844e05e7e16223baf9cfb1 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser2.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/05/03 12:39:44 $
-  Version:   $Revision: 1.21 $
+  Date:      $Date: 2010/09/12 14:52:25 $
+  Version:   $Revision: 1.22 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -942,6 +942,14 @@ namespace bbtk
   }
   //================================================================
 
+       Factory::Pointer WxGUIPackageBrowser2::GetFactory()
+  {
+    return mFactory;
+  }
+       
+  //================================================================
+
+       
   //================================================================
   void WxGUIPackageBrowser2::OnFilter(wxCommandEvent&)
   {
index 42bbe978b0977d591fb51be827af8e15031c4284..07c6579ed09e94b3328e89898a412a1d32e2bc68 100644 (file)
@@ -2,8 +2,8 @@
   Program:   bbtk
   Module:    $RCSfile: bbtkWxGUIPackageBrowser2.h,v $
   Language:  C++
-  Date:      $Date: 2010/03/25 15:24:50 $
-  Version:   $Revision: 1.7 $
+  Date:      $Date: 2010/09/12 14:52:25 $
+  Version:   $Revision: 1.8 $
 =========================================================================*/
 
 /* ---------------------------------------------------------------------
@@ -213,27 +213,28 @@ private:
        
        //RaC   
        BlackBoxDescriptor* GetActualSelected();
-
+       Factory::Pointer GetFactory();
+         
   private:
-    wxAuiManager m_mgr;
-    WxGUIPackageBrowser2User* mUser;
-    Interpreter::Pointer mInterpreter;
-    Factory::Pointer mFactory;
-    WxGUIBlackBoxList* mBoxList;
-    WxGUIBlackBoxInfo* mBoxInfo;
-
-    wxTextCtrlmPackageFilter;
-    wxTextCtrlmNameFilter;
-    wxTextCtrlmDescriptionFilter;
-    wxTextCtrlmCategoryFilter;
-    wxTextCtrlmInputTypeFilter;
-    wxTextCtrlmOutputTypeFilter;
-    wxTextCtrlmInputNatureFilter;
-    wxTextCtrlmOutputNatureFilter;
-
-    wxCheckBoxmShowWidgetsFilter;
-    wxCheckBoxmShowAdaptorsFilter;
-    wxCheckBoxmShowGUIsFilter;
+    wxAuiManager                               m_mgr;
+    WxGUIPackageBrowser2User*  mUser;
+    Interpreter::Pointer               mInterpreter;
+    Factory::Pointer                   mFactory;
+    WxGUIBlackBoxList*                 mBoxList;
+    WxGUIBlackBoxInfo*                 mBoxInfo;
+
+    wxTextCtrl                                 *mPackageFilter;
+    wxTextCtrl                                 *mNameFilter;
+    wxTextCtrl                                 *mDescriptionFilter;
+    wxTextCtrl                                 *mCategoryFilter;
+    wxTextCtrl                                 *mInputTypeFilter;
+    wxTextCtrl                                 *mOutputTypeFilter;
+    wxTextCtrl                                 *mInputNatureFilter;
+    wxTextCtrl                                 *mOutputNatureFilter;
+
+    wxCheckBox                                 *mShowWidgetsFilter;
+    wxCheckBox                                 *mShowAdaptorsFilter;
+    wxCheckBox                                 *mShowGUIsFilter;
 
        //RaC
        BlackBoxDescriptor *_actualSelected;
diff --git a/packages/vtk/src/bbvtkImageContinuousDilate3D.xml b/packages/vtk/src/bbvtkImageContinuousDilate3D.xml
new file mode 100644 (file)
index 0000000..677e342
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<blackbox name="ImageContinuousDilate3D" type="VTK_ImageAlgorithm">
+
+<author>eduardo.davila at creatis.insa-lyon.fr</author>
+<description><PRE>replaces a pixel with the minimum over an ellipsoidal neighborhood. If KernelSize of an axis is 1, no processing is done on that axis.</PRE></description>
+<category>image;filter</category>
+
+<include>vtkImageContinuousErode3D.h</include> 
+<include>vtkImageData.h</include> 
+
+<vtkobject>vtkImageContinuousErode3D</vtkobject>
+
+<input name="In"          type="vtkImageData*" special="vtk input"     description="Input image"/>
+<output name="Out"        type="vtkImageData*" special="vtk output"    description="Output image"/>
+<input name="KernelSizeX" type="int"                                   description="Size of the kernel in direction X"/>
+<input name="KernelSizeY" type="int"                                   description="Size of the kernel in direction Y"/>
+<input name="KernelSizeZ" type="int"                                   description="Size of the kernel in direction Z"/>
+
+<process>
+<PRE>
+bbGetVtkObject()->SetKernelSize(bbGetInputKernelSizeX(), 
+              bbGetInputKernelSizeY(), 
+              bbGetInputKernelSizeZ());
+bbGetVtkObject()->Update();
+</PRE>
+</process>
+
+
+</blackbox>
+
+
diff --git a/packages/vtk/src/bbvtkImageContinuousErode3D.xml b/packages/vtk/src/bbvtkImageContinuousErode3D.xml
new file mode 100644 (file)
index 0000000..07a98d0
--- /dev/null
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<blackbox name="ImageContinuousErode3D" type="VTK_ImageAlgorithm">
+
+<author>eduardo.davila at creatis.insa-lyon.fr</author>
+<description><PRE>replaces a pixel with the maximum over an ellipsoidal neighborhood. If KernelSize of an axis is 1, no processing is done on that axis..</PRE></description>
+<category>image;filter</category>
+
+<include>vtkImageContinuousErode3D.h</include> 
+<include>vtkImageData.h</include> 
+
+<vtkobject>vtkImageContinuousErode3D</vtkobject>
+
+<input name="In"          type="vtkImageData*" special="vtk input"     description="Input image"/>
+<output name="Out"        type="vtkImageData*" special="vtk output"    description="Output image"/>
+<input name="KernelSizeX" type="int"                                   description="Size of the kernel in direction X"/>
+<input name="KernelSizeY" type="int"                                   description="Size of the kernel in direction Y"/>
+<input name="KernelSizeZ" type="int"                                   description="Size of the kernel in direction Z"/>
+
+<process>
+<PRE>
+bbGetVtkObject()->SetKernelSize(bbGetInputKernelSizeX(), 
+              bbGetInputKernelSizeY(), 
+              bbGetInputKernelSizeZ());
+bbGetVtkObject()->Update();
+</PRE>
+</process>
+
+
+</blackbox>
+
+