From 6a1240601ac3d174fb14d4f3760db4325710e63f Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Sun, 12 Sep 2010 14:52:23 +0000 Subject: [PATCH] no message --- README.txt | 22 +++++++++ kernel/src/bbtkFactory.cxx | 20 ++++++++- kernel/src/bbtkFactory.h | 6 ++- kernel/src/bbtkPackage.cxx | 16 ++++++- kernel/src/bbtkPackage.h | 6 ++- kernel/src/bbtkWxGUIPackageBrowser2.cxx | 12 ++++- kernel/src/bbtkWxGUIPackageBrowser2.h | 45 ++++++++++--------- .../vtk/src/bbvtkImageContinuousDilate3D.xml | 32 +++++++++++++ .../vtk/src/bbvtkImageContinuousErode3D.xml | 32 +++++++++++++ 9 files changed, 159 insertions(+), 32 deletions(-) create mode 100644 packages/vtk/src/bbvtkImageContinuousDilate3D.xml create mode 100644 packages/vtk/src/bbvtkImageContinuousErode3D.xml diff --git a/README.txt b/README.txt index b5d1459..fd52773 100644 --- a/README.txt +++ b/README.txt @@ -1,2 +1,24 @@ The Black Box Toolkit (c) CREATIS-LRMN 2008 + + + +Note Xcode MacOS: +- ccmake -G"Xcode" + +- 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 + 2.Project + -> Edit project settings + -> Build + 3.Copiler Version -> C/C++ CompilerVersion + GCC 4.2 \ No newline at end of file diff --git a/kernel/src/bbtkFactory.cxx b/kernel/src/bbtkFactory.cxx index 6746746..4dd61cb 100644 --- a/kernel/src/bbtkFactory.cxx +++ b/kernel/src/bbtkFactory.cxx @@ -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=""; + 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 with name BlackBox::Pointer Factory::NewBlackBox(const std::string& type, diff --git a/kernel/src/bbtkFactory.h b/kernel/src/bbtkFactory.h index 33d8861..70e60e3 100644 --- a/kernel/src/bbtkFactory.h +++ b/kernel/src/bbtkFactory.h @@ -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: diff --git a/kernel/src/bbtkPackage.cxx b/kernel/src/bbtkPackage.cxx index b5b15c4..66465e9 100644 --- a/kernel/src/bbtkPackage.cxx +++ b/kernel/src/bbtkPackage.cxx @@ -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 with name BlackBox::Pointer Package::NewBlackBox(const std::string& type, diff --git a/kernel/src/bbtkPackage.h b/kernel/src/bbtkPackage.h index 419f3fe..b197697 100644 --- a/kernel/src/bbtkPackage.h +++ b/kernel/src/bbtkPackage.h @@ -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() {} diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.cxx b/kernel/src/bbtkWxGUIPackageBrowser2.cxx index c7b17ea..7d87a0e 100644 --- a/kernel/src/bbtkWxGUIPackageBrowser2.cxx +++ b/kernel/src/bbtkWxGUIPackageBrowser2.cxx @@ -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&) { diff --git a/kernel/src/bbtkWxGUIPackageBrowser2.h b/kernel/src/bbtkWxGUIPackageBrowser2.h index 42bbe97..07c6579 100644 --- a/kernel/src/bbtkWxGUIPackageBrowser2.h +++ b/kernel/src/bbtkWxGUIPackageBrowser2.h @@ -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; - - wxTextCtrl* mPackageFilter; - wxTextCtrl* mNameFilter; - wxTextCtrl* mDescriptionFilter; - wxTextCtrl* mCategoryFilter; - wxTextCtrl* mInputTypeFilter; - wxTextCtrl* mOutputTypeFilter; - wxTextCtrl* mInputNatureFilter; - wxTextCtrl* mOutputNatureFilter; - - wxCheckBox* mShowWidgetsFilter; - wxCheckBox* mShowAdaptorsFilter; - wxCheckBox* mShowGUIsFilter; + 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 index 0000000..677e342 --- /dev/null +++ b/packages/vtk/src/bbvtkImageContinuousDilate3D.xml @@ -0,0 +1,32 @@ + + + + +eduardo.davila at creatis.insa-lyon.fr +
replaces a pixel with the minimum over an ellipsoidal neighborhood. If KernelSize of an axis is 1, no processing is done on that axis.
 +image;filter + +vtkImageContinuousErode3D.h +vtkImageData.h + +vtkImageContinuousErode3D + + + + + + + + +
+bbGetVtkObject()->SetKernelSize(bbGetInputKernelSizeX(), 
+              bbGetInputKernelSizeY(), 
+              bbGetInputKernelSizeZ());
+bbGetVtkObject()->Update();
+
+ + + + + + diff --git a/packages/vtk/src/bbvtkImageContinuousErode3D.xml b/packages/vtk/src/bbvtkImageContinuousErode3D.xml new file mode 100644 index 0000000..07a98d0 --- /dev/null +++ b/packages/vtk/src/bbvtkImageContinuousErode3D.xml @@ -0,0 +1,32 @@ + + + + +eduardo.davila at creatis.insa-lyon.fr +
replaces a pixel with the maximum over an ellipsoidal neighborhood. If KernelSize of an axis is 1, no processing is done on that axis..
 +image;filter + +vtkImageContinuousErode3D.h +vtkImageData.h + +vtkImageContinuousErode3D + + + + + + + + +
+bbGetVtkObject()->SetKernelSize(bbGetInputKernelSizeX(), 
+              bbGetInputKernelSizeY(), 
+              bbGetInputKernelSizeZ());
+bbGetVtkObject()->Update();
+
+ + + + + + -- 2.45.1