From: guigues Date: Thu, 11 Dec 2008 15:29:42 +0000 (+0000) Subject: bbtk now depends on crea ! X-Git-Tag: v0.9.1~39 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=70db75992e0ccf5ad1fab5ccf9cec013877ea3d5;p=bbtk.git bbtk now depends on crea ! --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 895eb29..2d988cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,21 +1,11 @@ -# -# Test CMake version -# +#----------------------------------------------------------------------------- CMAKE_MINIMUM_REQUIRED(VERSION 2.4) -#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY ) - -# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003") -IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) - CMAKE_POLICY(SET CMP0003 NEW) - CMAKE_POLICY(SET CMP0005 NEW) -ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) - +#----------------------------------------------------------------------------- #----------------------------------------------------------------------------- PROJECT(BBTK) #----------------------------------------------------------------------------- - #----------------------------------------------------------------------------- # Set global configuration of the toolkit INCLUDE(kernel/cmake/BBTKRootCMakeLists.cmake) diff --git a/kernel/appli/bbCreatePackage/void-Package/Configure.cmake b/kernel/appli/bbCreatePackage/void-Package/Configure.cmake index 946aaf6..dc44b3b 100644 --- a/kernel/appli/bbCreatePackage/void-Package/Configure.cmake +++ b/kernel/appli/bbCreatePackage/void-Package/Configure.cmake @@ -1,73 +1,35 @@ -#----------------------------------------------------------------------------- +#=========================================================================== # DOES THE USER WANT TO BUILD THE PACKAGE ? OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME} "Build the bbtk package ${BBTK_PACKAGE_NAME} ?" OFF) -#----------------------------------------------------------------------------- +#=========================================================================== -#----------------------------------------------------------------------------- -IF(BBTK_CORE_PACKAGE) - IF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL) - SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) - ENDIF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL) -ENDIF(BBTK_CORE_PACKAGE) -#----------------------------------------------------------------------------- - - -#----------------------------------------------------------------------------- -# IF THE USER HAS CHOSEN TO BUILD THE PACKAGE IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) - #--------------------------------------------------------------------------- - + #=========================================================================== + # THE USER HAS CHOSEN TO BUILD THE PACKAGE + #=========================================================================== + #=========================================================================== # If the package is not a "core" bbtk package (included into the toolkit) - # then we have to find (and use) bbtk + # then we have to find and use bbtk IF(NOT BBTK_CORE_PACKAGE) - #------------------------------------------------------------------------- - # Find and use the Black Box Toolkit - # Search BBTK - FIND_PACKAGE(BBTK) - # If bbtk found - IF(BBTK_FOUND) - INCLUDE(${BBTK_USE_FILE}) - SET(BBTK_PACKAGE_LIBS - ${BBTK_PACKAGE_LIBS} - ${BBTK_LIBRARIES}) - MARK_AS_ADVANCED(BBTK_DIR) - ENDIF(BBTK_FOUND) + FIND_PACKAGE(BBTK REQUIRED) + INCLUDE(${BBTK_USE_FILE}) ENDIF(NOT BBTK_CORE_PACKAGE) - - #=========================================================================== - # Include package configuration cmake script from bbtk dir - INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage.cmake) #=========================================================================== + #=========================================================================== + # Include package configuration cmake script from bbtk cmake dir + INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage.cmake) + #=========================================================================== - #--------------------------------------------------------------------------- ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) - #------------------------------------------------------------------------- - - #----------------------------------------------------------------------- + + #=========================================================================== + # Else if it is a core package we have to reset some things... IF(BBTK_CORE_PACKAGE) - #----------------------------------------------------------------------- - # If package deps in global deps : reset global deps - IF(${BBTK_PACKAGE_NAME}_IN_DEPS) - SET(BBTK_PACKAGES_DEPS "" CACHE INTERNAL - "bbtk packages dependencies" FORCE) - # STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};" - # "" TEMP - # ${BBTK_PACKAGES_DEPS}) - # - # SET(BBTK_PACKAGES_DEPS ${TEMP} - # CACHE INTERNAL "bbtk packages dependencies" FORCE) - ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS) - #----------------------------------------------------------------------- - - #----------------------------------------------------------------------- - # Remove the package include scripts to avoid loading it by include * - FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbs) - FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbs) - #----------------------------------------------------------------------- + INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_BuildOff.cmake) ENDIF(BBTK_CORE_PACKAGE) - - #------------------------------------------------------------------------- + #=========================================================================== + ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) diff --git a/kernel/appli/bbfy/bbfy.cpp b/kernel/appli/bbfy/bbfy.cpp index c22be32..347babc 100644 --- a/kernel/appli/bbfy/bbfy.cpp +++ b/kernel/appli/bbfy/bbfy.cpp @@ -486,7 +486,7 @@ void bbfy::CreateHeader() mFile << "#define " << included <<"\n"; // Includes - // mFile << "#include \"bbtkAtomicBlackBox.h\"\n"; + mFile << "#include \"bb" << mPackage << "_EXPORT.h\"\n"; std::vector::iterator i; for (i=mInclude.begin(); i!=mInclude.end(); ++i) { @@ -516,7 +516,7 @@ void bbfy::CreateHeader() } // Class declaration and parents - mFile << "class /*BBTK_EXPORT*/ "< -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS #include #endif @@ -356,7 +356,7 @@ namespace bbtk std::cin >> ans; Set(box,input,ans); } -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS // If the dialog mode is set to GraphicalDialog // A dialog box is pop up else if (mDialogMode == GraphicalDialog) diff --git a/kernel/src/bbtkInterpreter.h b/kernel/src/bbtkInterpreter.h index 4b6669c..5325e56 100644 --- a/kernel/src/bbtkInterpreter.h +++ b/kernel/src/bbtkInterpreter.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkInterpreter.h,v $ Language: C++ - Date: $Date: 2008/11/26 12:36:43 $ - Version: $Revision: 1.36 $ + Date: $Date: 2008/12/11 15:30:04 $ + Version: $Revision: 1.37 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -49,7 +49,7 @@ namespace bbtk { -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS class WxConsole; #endif @@ -151,7 +151,7 @@ namespace bbtk void SetThrow(bool b) { mThrow = b; } -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS /// Sets the user of the interpreter (if any) void SetUser(InterpreterUser* c) { mUser = c; } /// Gets the InterpreterUser of this diff --git a/kernel/src/bbtkWx.h b/kernel/src/bbtkWx.h index 0a388e5..b2ed350 100644 --- a/kernel/src/bbtkWx.h +++ b/kernel/src/bbtkWx.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWx.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:14 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/12/11 15:30:04 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -57,7 +57,7 @@ //=========================================================================== // Wx headers -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS // For compilers that support precompilation, includes "wx/wx.h". #include "wx/wxprec.h" #include @@ -76,12 +76,12 @@ #endif //__WXGTK__ // EO Wx headers -#else //_USE_WXWIDGETS_ +#else //USE_WXWIDGETS // define wxWindow typedef void wxWindow; -#endif // EO _USE_WXWIDGETS_ +#endif // EO USE_WXWIDGETS //=========================================================================== //=========================================================================== @@ -173,7 +173,7 @@ namespace bbtk -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS //================================================================== /// Conversion std::string to wxString inline wxString std2wx(const std::string& s){ diff --git a/kernel/src/bbtkWxBlackBox.h b/kernel/src/bbtkWxBlackBox.h index be8bdfa..878c83b 100644 --- a/kernel/src/bbtkWxBlackBox.h +++ b/kernel/src/bbtkWxBlackBox.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxBlackBox.h,v $ Language: C++ - Date: $Date: 2008/12/11 09:50:35 $ - Version: $Revision: 1.23 $ + Date: $Date: 2008/12/11 15:30:04 $ + Version: $Revision: 1.24 $ ========================================================================*/ @@ -44,7 +44,7 @@ */ -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS #ifndef __bbtkWxBlackBox_h__ @@ -360,4 +360,4 @@ namespace bbtk #endif //__bbtkWxBlackBox_h__ -#endif //_USE_WXWIDGETS_ +#endif //USE_WXWIDGETS diff --git a/kernel/src/bbtkWxStreamRedirector.h b/kernel/src/bbtkWxStreamRedirector.h index 7bd19f3..34f2858 100644 --- a/kernel/src/bbtkWxStreamRedirector.h +++ b/kernel/src/bbtkWxStreamRedirector.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbtkWxStreamRedirector.h,v $ Language: C++ - Date: $Date: 2008/10/17 08:18:15 $ - Version: $Revision: 1.2 $ + Date: $Date: 2008/12/11 15:30:04 $ + Version: $Revision: 1.3 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -45,7 +45,7 @@ */ -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS #ifndef __bbtkWxStreamRedirector_h__ @@ -178,4 +178,4 @@ namespace bbtk #endif // __bbtkWxStreamRedirector_h__ -#endif //_USE_WXWIDGETS_ +#endif //USE_WXWIDGETS diff --git a/packages/demo/Configure.cmake b/packages/demo/Configure.cmake index 946aaf6..dc44b3b 100644 --- a/packages/demo/Configure.cmake +++ b/packages/demo/Configure.cmake @@ -1,73 +1,35 @@ -#----------------------------------------------------------------------------- +#=========================================================================== # DOES THE USER WANT TO BUILD THE PACKAGE ? OPTION(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME} "Build the bbtk package ${BBTK_PACKAGE_NAME} ?" OFF) -#----------------------------------------------------------------------------- +#=========================================================================== -#----------------------------------------------------------------------------- -IF(BBTK_CORE_PACKAGE) - IF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL) - SWITCH_ON_IF_BUILD_ALL(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) - ENDIF(NOT ${BBTK_PACKAGE_NAME}_EXCLUDE_FROM_BUILD_ALL) -ENDIF(BBTK_CORE_PACKAGE) -#----------------------------------------------------------------------------- - - -#----------------------------------------------------------------------------- -# IF THE USER HAS CHOSEN TO BUILD THE PACKAGE IF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) - #--------------------------------------------------------------------------- - + #=========================================================================== + # THE USER HAS CHOSEN TO BUILD THE PACKAGE + #=========================================================================== + #=========================================================================== # If the package is not a "core" bbtk package (included into the toolkit) - # then we have to find (and use) bbtk + # then we have to find and use bbtk IF(NOT BBTK_CORE_PACKAGE) - #------------------------------------------------------------------------- - # Find and use the Black Box Toolkit - # Search BBTK - FIND_PACKAGE(BBTK) - # If bbtk found - IF(BBTK_FOUND) - INCLUDE(${BBTK_USE_FILE}) - SET(BBTK_PACKAGE_LIBS - ${BBTK_PACKAGE_LIBS} - ${BBTK_LIBRARIES}) - MARK_AS_ADVANCED(BBTK_DIR) - ENDIF(BBTK_FOUND) + FIND_PACKAGE(BBTK REQUIRED) + INCLUDE(${BBTK_USE_FILE}) ENDIF(NOT BBTK_CORE_PACKAGE) - - #=========================================================================== - # Include package configuration cmake script from bbtk dir - INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage.cmake) #=========================================================================== + #=========================================================================== + # Include package configuration cmake script from bbtk cmake dir + INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage.cmake) + #=========================================================================== - #--------------------------------------------------------------------------- ELSE(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) - #------------------------------------------------------------------------- - - #----------------------------------------------------------------------- + + #=========================================================================== + # Else if it is a core package we have to reset some things... IF(BBTK_CORE_PACKAGE) - #----------------------------------------------------------------------- - # If package deps in global deps : reset global deps - IF(${BBTK_PACKAGE_NAME}_IN_DEPS) - SET(BBTK_PACKAGES_DEPS "" CACHE INTERNAL - "bbtk packages dependencies" FORCE) - # STRING(REPLACE "${${BBTK_PACKAGE_NAME}_DEPS};" - # "" TEMP - # ${BBTK_PACKAGES_DEPS}) - # - # SET(BBTK_PACKAGES_DEPS ${TEMP} - # CACHE INTERNAL "bbtk packages dependencies" FORCE) - ENDIF(${BBTK_PACKAGE_NAME}_IN_DEPS) - #----------------------------------------------------------------------- - - #----------------------------------------------------------------------- - # Remove the package include scripts to avoid loading it by include * - FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}.bbs) - FILE(REMOVE ${BBTK_BBS_BUILD_PATH}/${BBTK_PACKAGE_NAME}-appli.bbs) - #----------------------------------------------------------------------- + INCLUDE(${BBTK_CMAKE_DIR}/BBTKConfigurePackage_BuildOff.cmake) ENDIF(BBTK_CORE_PACKAGE) - - #------------------------------------------------------------------------- + #=========================================================================== + ENDIF(BUILD_BBTK_PACKAGE_${BBTK_PACKAGE_NAME}) diff --git a/packages/std/src/bbstdASCII.h b/packages/std/src/bbstdASCII.h index cd28637..5acb022 100644 --- a/packages/std/src/bbstdASCII.h +++ b/packages/std/src/bbstdASCII.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbstdASCII.h,v $ Language: C++ - Date: $Date: 2008/11/25 11:17:20 $ - Version: $Revision: 1.8 $ + Date: $Date: 2008/12/11 15:30:09 $ + Version: $Revision: 1.9 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -32,12 +32,13 @@ #ifndef __bbstdASCII_h_INCLUDED__ #define __bbstdASCII_h_INCLUDED__ #include "bbtkAtomicBlackBox.h" +#include "bbstd_EXPORT.h" #include "iostream" namespace bbstd { - class /*BBTK_EXPORT*/ ASCII + class bbstd_EXPORT ASCII : public bbtk::AtomicBlackBox { diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx index 7c375f0..6473524 100644 --- a/packages/vtk/src/bbvtkTransform.cxx +++ b/packages/vtk/src/bbvtkTransform.cxx @@ -73,11 +73,13 @@ void Transform::bbUserConstructor() result = NULL; } +/* void Transform::bbUserCopyConstructor() { } +*/ void Transform::bbUserDestructor() { diff --git a/packages/vtk/src/bbvtkTransform.h b/packages/vtk/src/bbvtkTransform.h index a9d3d72..92b0220 100644 --- a/packages/vtk/src/bbvtkTransform.h +++ b/packages/vtk/src/bbvtkTransform.h @@ -8,48 +8,48 @@ namespace bbvtk { - -class /*BBTK_EXPORT*/ Transform - : - public bbtk::AtomicBlackBox -{ - BBTK_BLACK_BOX_INTERFACE(Transform,bbtk::AtomicBlackBox); -//================================================================== -/// User callback called in the box contructor -virtual void bbUserConstructor(); -/// User callback called in the box copy constructor -virtual void bbUserCopyConstructor(); -/// User callback called in the box destructor -virtual void bbUserDestructor(); -//================================================================== - BBTK_DECLARE_INPUT(In,vtkLinearTransform *); - BBTK_DECLARE_INPUT(Scale,std::vector); - BBTK_DECLARE_INPUT(RotateWXYZ,std::vector); - BBTK_DECLARE_INPUT(Translate,std::vector); - BBTK_DECLARE_INPUT(Spacing,std::vector); - BBTK_DECLARE_OUTPUT(Out,vtkLinearTransform *); - BBTK_PROCESS(Process); - void Process(); - - std::vector vecScale; - std::vector vecRotateWXYZ; - std::vector vecTranslate; - std::vector vecSpacing; - vtkTransform *result; + + class /*BBTK_EXPORT*/ Transform + : + public bbtk::AtomicBlackBox + { + BBTK_BLACK_BOX_INTERFACE(Transform,bbtk::AtomicBlackBox); + //================================================================== + /// User callback called in the box contructor + virtual void bbUserConstructor(); + /// User callback called in the box copy constructor + //virtual void bbUserCopyConstructor(); + /// User callback called in the box destructor + virtual void bbUserDestructor(); + //================================================================== + BBTK_DECLARE_INPUT(In,vtkLinearTransform *); + BBTK_DECLARE_INPUT(Scale,std::vector); + BBTK_DECLARE_INPUT(RotateWXYZ,std::vector); + BBTK_DECLARE_INPUT(Translate,std::vector); + BBTK_DECLARE_INPUT(Spacing,std::vector); + BBTK_DECLARE_OUTPUT(Out,vtkLinearTransform *); + BBTK_PROCESS(Process); + void Process(); + + std::vector vecScale; + std::vector vecRotateWXYZ; + std::vector vecTranslate; + std::vector vecSpacing; + vtkTransform *result; }; - -BBTK_BEGIN_DESCRIBE_BLACK_BOX(Transform,bbtk::AtomicBlackBox); -BBTK_NAME("Transform"); -BBTK_AUTHOR("InfoTeam CREATIS-LRMN"); -BBTK_DESCRIPTION("vtkTransform"); -BBTK_CATEGORY("math"); -BBTK_INPUT(Transform,In,"vtkTransform to be concatenate",vtkLinearTransform *,""); -BBTK_INPUT(Transform,Scale,"vector with sx sy sz",std::vector,""); -BBTK_INPUT(Transform,Translate,"vector with x y z",std::vector,""); -BBTK_INPUT(Transform,Spacing,"vector with spacingX spacingY spacingZ",std::vector,""); -BBTK_INPUT(Transform,RotateWXYZ,"vector with Angle Vx Vy Vz",std::vector,""); -BBTK_OUTPUT(Transform,Out,"vtkTransform result",vtkLinearTransform *,""); -BBTK_END_DESCRIBE_BLACK_BOX(Transform); + + BBTK_BEGIN_DESCRIBE_BLACK_BOX(Transform,bbtk::AtomicBlackBox); + BBTK_NAME("Transform"); + BBTK_AUTHOR("InfoTeam CREATIS-LRMN"); + BBTK_DESCRIPTION("vtkTransform"); + BBTK_CATEGORY("math"); + BBTK_INPUT(Transform,In,"vtkTransform to be concatenate",vtkLinearTransform *,""); + BBTK_INPUT(Transform,Scale,"vector with sx sy sz",std::vector,""); + BBTK_INPUT(Transform,Translate,"vector with x y z",std::vector,""); + BBTK_INPUT(Transform,Spacing,"vector with spacingX spacingY spacingZ",std::vector,""); + BBTK_INPUT(Transform,RotateWXYZ,"vector with Angle Vx Vy Vz",std::vector,""); + BBTK_OUTPUT(Transform,Out,"vtkTransform result",vtkLinearTransform *,""); + BBTK_END_DESCRIBE_BLACK_BOX(Transform); } // EO namespace bbvtk diff --git a/packages/wx/src/bbwxLayoutLine.h b/packages/wx/src/bbwxLayoutLine.h index e58b2c7..461530f 100644 --- a/packages/wx/src/bbwxLayoutLine.h +++ b/packages/wx/src/bbwxLayoutLine.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxLayoutLine.h,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:51 $ - Version: $Revision: 1.7 $ + Date: $Date: 2008/12/11 15:30:14 $ + Version: $Revision: 1.8 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -52,7 +52,7 @@ #define __bbWxLayoutLine_h__ #include "bbtkWxBlackBox.h" - +#include "bbwx_EXPORT.h" namespace bbwx @@ -61,7 +61,7 @@ namespace bbwx - class /*BBTK_EXPORT*/ LayoutLine : public bbtk::WxBlackBox + class bbwx_EXPORT LayoutLine : public bbtk::WxBlackBox { BBTK_BLACK_BOX_INTERFACE(LayoutLine,bbtk::WxBlackBox); diff --git a/packages/wx/src/bbwxSlider.cxx b/packages/wx/src/bbwxSlider.cxx index 49d0595..71a4b97 100644 --- a/packages/wx/src/bbwxSlider.cxx +++ b/packages/wx/src/bbwxSlider.cxx @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxSlider.cxx,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:51 $ - Version: $Revision: 1.15 $ + Date: $Date: 2008/12/11 15:30:14 $ + Version: $Revision: 1.16 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -45,7 +45,57 @@ namespace bbwx { + //-------------------------------------------------------------------------- + // The widget created by the box + class SliderWidget : public wxPanel + { + public: + /// Ctor with the two first params the parent window and the creator box + /// which must be passed to the WxBlackBoxWidget constructor. + /// The other params initialize the widget + SliderWidget(Slider* box, wxWindow *parent, + int orientation, + bool changeresolution, + bool label, + wxString title, + int vmin, + int vmax, + int value, + int track); + /// Dtor + ~SliderWidget(); + /// Events callbacks + /// Called when the slider is moved + void OnSliderTrack(wxScrollEvent& event); + /// Called when the slider is released + void OnSliderRelease(wxScrollEvent& event); + /// Called when the little slider which controls the resolution + /// of the main slider is moved (if activated) + void OnResolutionOfSlider(wxScrollEvent& event); + + // Accessors + int GetValue() { return mwxSlider->GetValue(); } + void SetRange(int min, int max); + // Update the texts which display the min/max/current values of the slider + void RefreshLabels(); + + private: + Slider* mBox; + wxSlider *mwxSlider; + wxSlider *mResolutionOfSlider; + int min; + int max; + int reactiveOnTrack; + wxStaticText *label_vertical; + wxStaticText *label_min; + wxStaticText *label_max; + }; + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + //------------------------------------------------------------------------ + + //------------------------------------------------------------------------- SliderWidget::SliderWidget(Slider* box, wxWindow *parent, int orientation, diff --git a/packages/wx/src/bbwxSlider.h b/packages/wx/src/bbwxSlider.h index 3bd9fed..e886846 100644 --- a/packages/wx/src/bbwxSlider.h +++ b/packages/wx/src/bbwxSlider.h @@ -2,8 +2,8 @@ Program: bbtk Module: $RCSfile: bbwxSlider.h,v $ Language: C++ - Date: $Date: 2008/11/24 15:45:51 $ - Version: $Revision: 1.14 $ + Date: $Date: 2008/12/11 15:30:14 $ + Version: $Revision: 1.15 $ =========================================================================*/ /* --------------------------------------------------------------------- @@ -55,6 +55,7 @@ // Include wxBlackBox definition #include "bbtkWxBlackBox.h" +#include "bbwx_EXPORT.h" // Namespace of the package "wx" is "bbwx" @@ -63,65 +64,12 @@ namespace bbwx { - //-------------------------------------------------------------------------- - // Forward declaration of the box - class Slider; - - //-------------------------------------------------------------------------- - // The widget created by the box - class SliderWidget : public wxPanel - { - public: - /// Ctor with the two first params the parent window and the creator box - /// which must be passed to the WxBlackBoxWidget constructor. - /// The other params initialize the widget - SliderWidget(Slider* box, wxWindow *parent, - int orientation, - bool changeresolution, - bool label, - wxString title, - int vmin, - int vmax, - int value, - int track); - /// Dtor - ~SliderWidget(); - /// Events callbacks - /// Called when the slider is moved - void OnSliderTrack(wxScrollEvent& event); - /// Called when the slider is released - void OnSliderRelease(wxScrollEvent& event); - /// Called when the little slider which controls the resolution - /// of the main slider is moved (if activated) - void OnResolutionOfSlider(wxScrollEvent& event); - - // Accessors - int GetValue() { return mwxSlider->GetValue(); } - void SetRange(int min, int max); - // Update the texts which display the min/max/current values of the slider - void RefreshLabels(); - - private: - Slider* mBox; - wxSlider *mwxSlider; - wxSlider *mResolutionOfSlider; - int min; - int max; - int reactiveOnTrack; - wxStaticText *label_vertical; - wxStaticText *label_min; - wxStaticText *label_max; - }; - //------------------------------------------------------------------------ - //------------------------------------------------------------------------ - //------------------------------------------------------------------------ + - - //------------------------------------------------------------------------ // The black box - class /*BBTK_EXPORT*/ Slider : public bbtk::WxBlackBox + class bbwx_EXPORT Slider : public bbtk::WxBlackBox { BBTK_BLACK_BOX_INTERFACE(Slider,bbtk::WxBlackBox); diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.cxx b/packages/wxvtk/src/bbwxvtkViewer2D.cxx index 3e284eb..79904f8 100644 --- a/packages/wxvtk/src/bbwxvtkViewer2D.cxx +++ b/packages/wxvtk/src/bbwxvtkViewer2D.cxx @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer2D.cxx,v $ Language: C++ - Date: $Date: 2008/12/11 09:50:38 $ - Version: $Revision: 1.31 $ + Date: $Date: 2008/12/11 15:30:17 $ + Version: $Revision: 1.32 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,7 +21,8 @@ */ -#ifdef _USE_WXWIDGETS_ +#ifdef USE_WXWIDGETS +#ifdef USE_VTK #include "bbwxvtkViewer2D.h" @@ -337,4 +338,5 @@ namespace bbwxvtk }//namespace bbtk #endif +#endif diff --git a/packages/wxvtk/src/bbwxvtkViewer2D.h b/packages/wxvtk/src/bbwxvtkViewer2D.h index fdbdce2..cdb26f1 100644 --- a/packages/wxvtk/src/bbwxvtkViewer2D.h +++ b/packages/wxvtk/src/bbwxvtkViewer2D.h @@ -3,8 +3,8 @@ Program: bbtk Module: $RCSfile: bbwxvtkViewer2D.h,v $ Language: C++ - Date: $Date: 2008/12/11 09:50:38 $ - Version: $Revision: 1.14 $ + Date: $Date: 2008/12/11 15:30:17 $ + Version: $Revision: 1.15 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -30,8 +30,8 @@ */ -#ifdef _USE_WXWIDGETS_ -#ifdef _USE_VTK_ +#ifdef USE_WXWIDGETS +#ifdef USE_VTK #ifndef __bbwxvtkViewer2D_h__ @@ -91,5 +91,5 @@ namespace bbwxvtk #endif //__bbwxvtkViewer2D_h__ -#endif //_USE_VTK_ -#endif //_USE_WXWIDGETS_ +#endif //USE_VTK +#endif //USE_WXWIDGETS