From 3e48d6cf83c4d96585d3e825899db643f9a62193 Mon Sep 17 00:00:00 2001 From: guigues Date: Thu, 15 Jan 2009 11:09:34 +0000 Subject: [PATCH] Compile with new crea (export symbols under windows) --- lib/maracasVisuLib/CMakeLists.txt | 5 +-- .../wxWindows/Contour/ContourCrownWidget.h | 2 +- .../wxWindows/Contour/ContourExtractData.h | 2 +- .../wxWindows/Contour/ContourPropagation.h | 2 +- .../wxWindows/Contour/ContourVOIWidget.h | 2 +- .../Contour/ExtractControlPoints2D.h | 2 +- .../interface/wxWindows/Contour/Propagation.h | 2 +- .../src/interface/wxWindows/manualContour.h | 36 +++++++++---------- .../wxWindows/widgets/pPlotter/Histogram.h | 2 +- .../widgets/pPlotter/HistogramWidget.h | 2 +- .../wxWindows/widgets/pPlotter/mBarRange.h | 4 +-- .../wxWindows/widgets/pPlotter/mathplot.h | 4 +-- .../wxWindows/widgets/pPlotter/pColorBar.h | 2 +- .../widgets/pPlotter/pPlotterLayer.h | 2 +- .../widgets/pPlotter/pPlotterScaleX.h | 2 +- .../widgets/pPlotter/pPlotterScaleY.h | 2 +- .../widgets/pPlotter/pPlotterWindow.h | 2 +- .../wxWindows/widgets/wxMPRBaseData.h | 6 ++-- .../interface/wxWindows/widgets/wxMPRWidget.h | 12 +++---- .../widgets/wxMaracas_N_ViewersWidget.h | 6 ++-- .../wxWindows/widgets/wxVtkBaseView.h | 20 +++++------ .../src/interface/wxWindows/wxMaracasMPR.h | 6 ++-- .../src/kernel/creaMaracasVisu_EXPORT.h | 23 ++++++++++++ lib/maracasVisuLib/src/kernel/marDynData.h | 6 ++-- lib/maracasVisuLib/src/kernel/marImageData.h | 2 +- lib/maracasVisuLib/src/kernel/marObject.h | 6 ++-- lib/maracasVisuLib/src/kernel/marParameters.h | 6 ++-- lib/maracasVisuLib/src/kernel/marTypes.h | 8 +++-- lib/maracasVisuLib/src/kernel/volume.hxx | 6 ++-- 29 files changed, 103 insertions(+), 79 deletions(-) create mode 100644 lib/maracasVisuLib/src/kernel/creaMaracasVisu_EXPORT.h diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt index 35d6784..6e417e3 100644 --- a/lib/maracasVisuLib/CMakeLists.txt +++ b/lib/maracasVisuLib/CMakeLists.txt @@ -208,10 +208,7 @@ IF ( BUILD_${LIBRARY_NAME} ) ENDIF(CREA_VERBOSE_CMAKE) - # MANAGE SHARED LIB - CREA_DYNAMIC_LIBRARY_EXPORT ( ${LIBRARY_NAME}) - #CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME}) - + # CREATE THE TARGET ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS}) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h index 4be60a6..1adab38 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h @@ -13,7 +13,7 @@ //-------------------------------------------------------------------------- - class MARACASVISULIB_EXPORTS wxMaracasCoutourTool : public wxPanel + class creaMaracasVisu_EXPORT wxMaracasCoutourTool : public wxPanel { public: wxMaracasCoutourTool( wxWindow *parent, wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h index edf87f3..5ad15b9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.h @@ -8,7 +8,7 @@ //-------------------------------------------------------------------------- - class MARACASVISULIB_EXPORTS ContourExtractData + class creaMaracasVisu_EXPORT ContourExtractData { public: ContourExtractData(bool imagesResults=false); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h index 56d57af..5895fa9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourPropagation.h @@ -7,7 +7,7 @@ #include "vectorFunctions.h" #include "marTypes.h" -class MARACASVISULIB_EXPORTS ContourPropagation +class creaMaracasVisu_EXPORT ContourPropagation { public: ContourPropagation(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h index a901306..abd49ac 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h @@ -45,7 +45,7 @@ //-------------------------------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------------------------------- - class MARACASVISULIB_EXPORTS ContourVOIWidget : public wxPanel + class creaMaracasVisu_EXPORT ContourVOIWidget : public wxPanel { public: ContourVOIWidget( wxWindow *parent, wxVtkBaseView *wxvtkbaseview , vtkImageData* imagedata); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h index 6e6944f..392de94 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ExtractControlPoints2D.h @@ -4,7 +4,7 @@ #include "AutoControlPoints.h" #include "marTypes.h" -class MARACASVISULIB_EXPORTS ExtractControlPoints2D +class creaMaracasVisu_EXPORT ExtractControlPoints2D { public: ExtractControlPoints2D ( ); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h index f6b5c3d..d3f8aa2 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h @@ -47,7 +47,7 @@ class Vector std::vector _vecZ; }; -class MARACASVISULIB_EXPORTS PropContour +class creaMaracasVisu_EXPORT PropContour { public: PropContour(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h index e2aa630..6cb157a 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h @@ -73,7 +73,7 @@ private: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualContourModel{ +class creaMaracasVisu_EXPORT manualContourModel{ public: manualContourModel(); virtual ~manualContourModel(); @@ -141,7 +141,7 @@ private: //-------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualContourModelCircle : public manualContourModel +class creaMaracasVisu_EXPORT manualContourModelCircle : public manualContourModel { public: manualContourModelCircle(); @@ -197,7 +197,7 @@ private: //-------------------------------------------------------- //eed004 -class MARACASVISULIB_EXPORTS manualContourModelBullEye : public manualContourModel +class creaMaracasVisu_EXPORT manualContourModelBullEye : public manualContourModel { public: manualContourModelBullEye(); @@ -246,7 +246,7 @@ private: //-------------------------------------------------------- //JSTG 25-02-08 ------------------------------------------ -class MARACASVISULIB_EXPORTS manualContourModelRoi : public manualContourModel +class creaMaracasVisu_EXPORT manualContourModelRoi : public manualContourModel { public: manualContourModelRoi(); @@ -298,7 +298,7 @@ protected: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualViewBaseContour{ +class creaMaracasVisu_EXPORT manualViewBaseContour{ public: manualViewBaseContour(); virtual ~manualViewBaseContour(); @@ -458,7 +458,7 @@ protected: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualViewContour: public manualViewBaseContour +class creaMaracasVisu_EXPORT manualViewContour: public manualViewBaseContour { public: manualViewContour(); @@ -553,7 +553,7 @@ private: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualViewRoi: public manualViewBaseContour +class creaMaracasVisu_EXPORT manualViewRoi: public manualViewBaseContour { public: manualViewRoi(); @@ -579,7 +579,7 @@ private: // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualViewBullEyeSector: public manualViewBaseContour +class creaMaracasVisu_EXPORT manualViewBullEyeSector: public manualViewBaseContour { public: manualViewBullEyeSector(); @@ -592,7 +592,7 @@ public: // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- //EED004 -class MARACASVISULIB_EXPORTS manualViewBullEye: public manualViewRoi +class creaMaracasVisu_EXPORT manualViewBullEye: public manualViewRoi { public: manualViewBullEye(); @@ -625,7 +625,7 @@ private: // ---------------------------------------------------------------------------- // EED08 -class MARACASVISULIB_EXPORTS manualViewCircle: public manualViewContour +class creaMaracasVisu_EXPORT manualViewCircle: public manualViewContour { public: manualViewCircle(); @@ -655,7 +655,7 @@ private: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualContourBaseControler: public InteractorStyleMaracas +class creaMaracasVisu_EXPORT manualContourBaseControler: public InteractorStyleMaracas { public: manualContourBaseControler(); @@ -751,7 +751,7 @@ private: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualContourControler: public manualContourBaseControler +class creaMaracasVisu_EXPORT manualContourControler: public manualContourBaseControler { public: manualContourControler(); @@ -780,7 +780,7 @@ private: -class MARACASVISULIB_EXPORTS manualContour3VControler: public manualContourControler +class creaMaracasVisu_EXPORT manualContour3VControler: public manualContourControler { public: manualContour3VControler(int type); @@ -824,7 +824,7 @@ private: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualContour3DControler: public manualContourControler +class creaMaracasVisu_EXPORT manualContour3DControler: public manualContourControler { public: manualContour3DControler(); @@ -853,7 +853,7 @@ private: // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualContour3V3DControler: public manualContour3DControler +class creaMaracasVisu_EXPORT manualContour3V3DControler: public manualContour3DControler { public: manualContour3V3DControler(); @@ -882,7 +882,7 @@ private: // ---------------------------------------------------------------------------- // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualContourPerpPlaneControler: public manualContourControler +class creaMaracasVisu_EXPORT manualContourPerpPlaneControler: public manualContourControler { public: manualContourPerpPlaneControler(); @@ -925,7 +925,7 @@ protected: // ---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS manualRoiControler: public manualContourBaseControler +class creaMaracasVisu_EXPORT manualRoiControler: public manualContourBaseControler { public: manualRoiControler(); @@ -950,7 +950,7 @@ private: // ---------------------------------------------------------------------------- // EED08 -class MARACASVISULIB_EXPORTS manualCircleControler: public manualContourControler +class creaMaracasVisu_EXPORT manualCircleControler: public manualContourControler { public: manualCircleControler(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h index f4c010c..d2d0218 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h @@ -28,7 +28,7 @@ #define NUM_POINTS 100 #define WINDOW_SIZE 10 -class MARACASVISULIB_EXPORTS Histogram:public wxPanel +class creaMaracasVisu_EXPORT Histogram:public wxPanel { public: //--------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h index 1df255d..078e9ef 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h @@ -28,7 +28,7 @@ #define NUM_POINTS 100 #define WINDOW_SIZE 10 -class MARACASVISULIB_EXPORTS HistogramWidget:public wxPanel +class creaMaracasVisu_EXPORT HistogramWidget:public wxPanel { public: //--------------------- diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h index f1d95b7..358c9e9 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mBarRange.h @@ -32,7 +32,7 @@ BEGIN_DECLARE_EVENT_TYPES() DECLARE_EVENT_TYPE(wxEVT_TSBAR,-1) //DECLARE_EVENT_TYPE(wxEVT_TSBAR_ACTUAL,-1) //DECLARE_EXPORTED_EVENT_TYPE(MARACASVISULIB_EXPORTS,wxEVT_TSBAR_ACTUAL,-1) -extern MARACASVISULIB_EXPORTS const wxEventType wxEVT_TSBAR_ACTUAL; +extern creaMaracasVisu_EXPORT const wxEventType wxEVT_TSBAR_ACTUAL; DECLARE_EVENT_TYPE(wxEVT_TSBAR_START,-1) DECLARE_EVENT_TYPE(wxEVT_TSBAR_END,-1) DECLARE_EVENT_TYPE(wxEVT_TSBAR_MOVED,-1) @@ -54,7 +54,7 @@ enum }; -class MARACASVISULIB_EXPORTS mBarRange :public wxScrolledWindow{ +class creaMaracasVisu_EXPORT mBarRange :public wxScrolledWindow{ public: //------------------------------------ //Constructors & Destructors diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h index 749be40..e8b67dc 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h @@ -95,7 +95,7 @@ Examples for mpLayer implementations are function graphs, or scale rulers. For convenience mpLayer defines a name, a font (wxFont), and a pen (wxPen) as class members. These may or may not be used by implementations. */ -class MARACASVISULIB_EXPORTS mpLayer : public wxObject +class creaMaracasVisu_EXPORT mpLayer : public wxObject { public: mpLayer(); @@ -422,7 +422,7 @@ The canvas window provides a context menu with actions for navigating the view. The context menu can be retrieved with mpWindow::GetPopupMenu, e.g. for extending it externally. */ -class MARACASVISULIB_EXPORTS mpWindow : public wxScrolledWindow +class creaMaracasVisu_EXPORT mpWindow : public wxScrolledWindow { public: mpWindow() {} diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h index 794ff50..3db7c69 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pColorBar.h @@ -65,7 +65,7 @@ enum }; /** file pColorBar.h */ -class MARACASVISULIB_EXPORTS pColorBar :public wxScrolledWindow{ +class creaMaracasVisu_EXPORT pColorBar :public wxScrolledWindow{ public: //------------------------------------------------------------------------------------------------------------ diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h index 521fc10..ca89d1b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h @@ -30,7 +30,7 @@ //---------------------------------------------------------------------------- // Class definition //---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS pPlotterLayer: public mpLayer +class creaMaracasVisu_EXPORT pPlotterLayer: public mpLayer { public: diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h index ab2846b..ce22c19 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h @@ -24,7 +24,7 @@ //---------------------------------------------------------------------------- // Class definition //---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS pPlotterScaleX: public pPlotterLayer +class creaMaracasVisu_EXPORT pPlotterScaleX: public pPlotterLayer { public: /** diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h index dad7c71..406e0e4 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h @@ -25,7 +25,7 @@ //---------------------------------------------------------------------------- // Class definition //---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS pPlotterScaleY: public pPlotterLayer +class creaMaracasVisu_EXPORT pPlotterScaleY: public pPlotterLayer { public: /** diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h index f14871d..5271374 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h @@ -86,7 +86,7 @@ enum // Class definition //---------------------------------------------------------------------------- -class MARACASVISULIB_EXPORTS pPlotterWindow: public mpWindow +class creaMaracasVisu_EXPORT pPlotterWindow: public mpWindow { public: /** diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h index 87031dc..71beb88 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRBaseData.h @@ -48,7 +48,7 @@ //------------------------------------------------------------------ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS vtkBaseData { +class creaMaracasVisu_EXPORT vtkBaseData { public: vtkBaseData(); virtual ~vtkBaseData(); @@ -73,7 +73,7 @@ protected: //------------------------------------------------------------------ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS vtkMPRBaseData: public vtkBaseData{ +class creaMaracasVisu_EXPORT vtkMPRBaseData: public vtkBaseData{ public: vtkMPRBaseData(); virtual ~vtkMPRBaseData(); @@ -103,7 +103,7 @@ private: //------------------------------------------------------------------ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS vtkMPR3DDataViewer { +class creaMaracasVisu_EXPORT vtkMPR3DDataViewer { public: vtkMPR3DDataViewer(); virtual ~vtkMPR3DDataViewer(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h index 23a3ae6..5f0c759 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMPRWidget.h,v $ Language: C++ - Date: $Date: 2008/12/06 15:15:34 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/01/15 11:09:44 $ + Version: $Revision: 1.6 $ Copyright: (c) 2002, 2003 License: @@ -325,7 +325,7 @@ private: class vtkInteractorStyleMPRView; -class MARACASVISULIB_EXPORTS wxVtkMPR2DView : public wxVtk2DBaseView +class creaMaracasVisu_EXPORT wxVtkMPR2DView : public wxVtk2DBaseView { public: wxVtkMPR2DView( wxWindow *parent, int direction ); @@ -526,7 +526,7 @@ private: //------------------------------------------------------------------ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS wxVtkMPR3DView +class creaMaracasVisu_EXPORT wxVtkMPR3DView { public: wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview ); @@ -939,7 +939,7 @@ private: -class MARACASVISULIB_EXPORTS wxMPRWidget : public wxPanel +class creaMaracasVisu_EXPORT wxMPRWidget : public wxPanel { public: wxMPRWidget(wxWindow* parent,marImageData *marimageData,double voxelSize); @@ -1009,7 +1009,7 @@ private: }; -class MARACASVISULIB_EXPORTS wxMPRWidget2 : public wxMPRWidget +class creaMaracasVisu_EXPORT wxMPRWidget2 : public wxMPRWidget { public: wxMPRWidget2(wxWindow* parent,marImageData *marimagedata,double voxelSize); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h index 4e49628..fd2ed74 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracas_N_ViewersWidget.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracas_N_ViewersWidget.h,v $ Language: C++ - Date: $Date: 2008/10/31 16:32:42 $ - Version: $Revision: 1.1 $ + Date: $Date: 2009/01/15 11:09:44 $ + Version: $Revision: 1.2 $ Copyright: (c) 2002, 2003 License: @@ -44,7 +44,7 @@ // Class definition //------------------------------------------------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS wxMaracas_N_ViewersWidget : public wxPanel +class creaMaracasVisu_EXPORT wxMaracas_N_ViewersWidget : public wxPanel { public: diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h index fce85df..bc5d35f 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h @@ -34,7 +34,7 @@ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS vtkImageViewer2_XYZ{ +class creaMaracasVisu_EXPORT vtkImageViewer2_XYZ{ public: vtkImageViewer2_XYZ(); ~vtkImageViewer2_XYZ(); @@ -62,7 +62,7 @@ protected: class wxVtkBaseView; -class MARACASVISULIB_EXPORTS wxVTKRenderWindowInteractorPlus : public wxVTKRenderWindowInteractor +class creaMaracasVisu_EXPORT wxVTKRenderWindowInteractorPlus : public wxVTKRenderWindowInteractor { public: wxVTKRenderWindowInteractorPlus(wxWindow *parent ,wxVtkBaseView *_wxvtkbaseview); @@ -94,7 +94,7 @@ private: class vtkInteractorStyleBaseView; -class MARACASVISULIB_EXPORTS wxVtkBaseView{ +class creaMaracasVisu_EXPORT wxVtkBaseView{ public: wxVtkBaseView( ); wxVtkBaseView( wxWindow *parent ); @@ -132,7 +132,7 @@ class vtkInfoTextImageInteractor; //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS wxVtk2DBaseView: public wxVtkBaseView{ +class creaMaracasVisu_EXPORT wxVtk2DBaseView: public wxVtkBaseView{ public: wxVtk2DBaseView(wxWindow *parent); virtual ~wxVtk2DBaseView(); @@ -173,7 +173,7 @@ protected: //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS InteractorStyleMaracas +class creaMaracasVisu_EXPORT InteractorStyleMaracas { public: InteractorStyleMaracas(); @@ -215,7 +215,7 @@ private: -class MARACASVISULIB_EXPORTS manualInteractorWindowLevel : public InteractorStyleMaracas { +class creaMaracasVisu_EXPORT manualInteractorWindowLevel : public InteractorStyleMaracas { public: manualInteractorWindowLevel(); virtual ~manualInteractorWindowLevel(); @@ -318,7 +318,7 @@ private: class wxVtk3DBaseView; -class MARACASVISULIB_EXPORTS vtkInteractorStyleBaseView : public vtkInteractorStyleImage{ +class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView : public vtkInteractorStyleImage{ public: vtkInteractorStyleBaseView(); ~vtkInteractorStyleBaseView(); @@ -373,7 +373,7 @@ private: //------------------------------------------------------------------ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS vtkInteractorStyleBaseView2D : public vtkInteractorStyleBaseView{ +class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView2D : public vtkInteractorStyleBaseView{ public: vtkInteractorStyleBaseView2D(); ~vtkInteractorStyleBaseView2D(); @@ -399,7 +399,7 @@ private: //------------------------------------------------------------------ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS vtkInteractorStyleBaseView3D : public vtkInteractorStyleBaseView { +class creaMaracasVisu_EXPORT vtkInteractorStyleBaseView3D : public vtkInteractorStyleBaseView { public: vtkInteractorStyleBaseView3D(); ~vtkInteractorStyleBaseView3D(); @@ -421,7 +421,7 @@ private: //------------------------------------------------------------------ //------------------------------------------------------------------ -class MARACASVISULIB_EXPORTS wxVtk3DBaseView: public wxVtkBaseView{ +class creaMaracasVisu_EXPORT wxVtk3DBaseView: public wxVtkBaseView{ public: wxVtk3DBaseView( wxWindow *parent ); virtual ~wxVtk3DBaseView(); diff --git a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h index 68d6f4d..dc1dd1b 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: wxMaracasMPR.h,v $ Language: C++ - Date: $Date: 2008/11/24 10:47:10 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/01/15 11:09:39 $ + Version: $Revision: 1.3 $ Copyright: (c) 2002, 2003 License: @@ -27,7 +27,7 @@ #include "widgets/wxMPRWidget.h" -class MARACASVISULIB_EXPORTS wxMaracasMPR : public wxPanel +class creaMaracasVisu_EXPORT wxMaracasMPR : public wxPanel { public: wxMaracasMPR( wxWindow* parent, marImageData* marimagedata,double voxelSize); diff --git a/lib/maracasVisuLib/src/kernel/creaMaracasVisu_EXPORT.h b/lib/maracasVisuLib/src/kernel/creaMaracasVisu_EXPORT.h new file mode 100644 index 0000000..a5eae11 --- /dev/null +++ b/lib/maracasVisuLib/src/kernel/creaMaracasVisu_EXPORT.h @@ -0,0 +1,23 @@ +#ifndef __creaMaracasVisu_EXPORT_h_INCLUDED__ +#define __creaMaracasVisu_EXPORT_h_INCLUDED__ + +// Automatically generated file which defines +// the symbols creaMaracasVisu_EXPORT and creaMaracasVisu_CDECL +// to be used for the definition of classes or functions +// which must be exported when the lib is built as a shared lib on Windows +// and imported when the shared lib is used by another program + +#if defined(_WIN32) && defined (creaMaracasVisu_BUILD_SHARED) + #ifdef creaMaracasVisu_EXPORT_SYMBOLS + #define creaMaracasVisu_EXPORT __declspec( dllexport ) + #else + #define creaMaracasVisu_EXPORT __declspec( dllimport ) + #endif + #define creaMaracasVisu_CDECL __cdecl +#else + #define creaMaracasVisu_EXPORT + #define creaMaracasVisu_CDECL +#endif // defined(_WIN32) + +#endif + diff --git a/lib/maracasVisuLib/src/kernel/marDynData.h b/lib/maracasVisuLib/src/kernel/marDynData.h index 9c99585..c04aee1 100644 --- a/lib/maracasVisuLib/src/kernel/marDynData.h +++ b/lib/maracasVisuLib/src/kernel/marDynData.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marDynData.h,v $ Language: C++ - Date: $Date: 2008/11/24 10:47:12 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/01/15 11:09:47 $ + Version: $Revision: 1.3 $ Copyright: (c) 2002, 2003 License: @@ -24,7 +24,7 @@ #include -class MARACASVISULIB_EXPORTS marDynData : public marObject +class creaMaracasVisu_EXPORT marDynData : public marObject { public: diff --git a/lib/maracasVisuLib/src/kernel/marImageData.h b/lib/maracasVisuLib/src/kernel/marImageData.h index 0eaaf2e..f531c94 100644 --- a/lib/maracasVisuLib/src/kernel/marImageData.h +++ b/lib/maracasVisuLib/src/kernel/marImageData.h @@ -9,7 +9,7 @@ #include "vtkImageData.h" -class MARACASVISULIB_EXPORTS marImageData +class creaMaracasVisu_EXPORT marImageData { public: marImageData(vtkImageData *imagedata); diff --git a/lib/maracasVisuLib/src/kernel/marObject.h b/lib/maracasVisuLib/src/kernel/marObject.h index b01c5a1..3acda83 100644 --- a/lib/maracasVisuLib/src/kernel/marObject.h +++ b/lib/maracasVisuLib/src/kernel/marObject.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marObject.h,v $ Language: C++ - Date: $Date: 2008/11/24 10:47:12 $ - Version: $Revision: 1.3 $ + Date: $Date: 2009/01/15 11:09:47 $ + Version: $Revision: 1.4 $ Copyright: (c) 2002, 2003 License: @@ -24,7 +24,7 @@ /** /def marObject * \brief General maracas object. */ -class MARACASVISULIB_EXPORTS marObject +class creaMaracasVisu_EXPORT marObject { public: diff --git a/lib/maracasVisuLib/src/kernel/marParameters.h b/lib/maracasVisuLib/src/kernel/marParameters.h index 5dbf07c..a6b5312 100644 --- a/lib/maracasVisuLib/src/kernel/marParameters.h +++ b/lib/maracasVisuLib/src/kernel/marParameters.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marParameters.h,v $ Language: C++ - Date: $Date: 2008/11/24 10:47:12 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/01/15 11:09:47 $ + Version: $Revision: 1.3 $ Copyright: (c) 2002, 2003 License: @@ -26,7 +26,7 @@ /** /def marParameters * \brief Parameters class definition. */ -class MARACASVISULIB_EXPORTS marParameters +class creaMaracasVisu_EXPORT marParameters { public: diff --git a/lib/maracasVisuLib/src/kernel/marTypes.h b/lib/maracasVisuLib/src/kernel/marTypes.h index 60a06f9..1fbead0 100644 --- a/lib/maracasVisuLib/src/kernel/marTypes.h +++ b/lib/maracasVisuLib/src/kernel/marTypes.h @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: marTypes.h,v $ Language: C++ - Date: $Date: 2008/11/25 15:59:44 $ - Version: $Revision: 1.5 $ + Date: $Date: 2009/01/15 11:09:47 $ + Version: $Revision: 1.6 $ Copyright: (c) 2002, 2003 License: @@ -33,6 +33,7 @@ //JHCL - Start //If we're using windows +/* #if defined(WIN32) //If we're using a dynamic library #ifdef creaMaracasVisu_BUILD_SHARED @@ -43,6 +44,9 @@ #else #define MARACASVISULIB_EXPORTS #endif + */ +// LG 15/01/09 : Now use crea mechanism +#include "creaMaracasVisu_EXPORT.h" //JHCL - End diff --git a/lib/maracasVisuLib/src/kernel/volume.hxx b/lib/maracasVisuLib/src/kernel/volume.hxx index 5d29892..baf121b 100644 --- a/lib/maracasVisuLib/src/kernel/volume.hxx +++ b/lib/maracasVisuLib/src/kernel/volume.hxx @@ -3,8 +3,8 @@ Program: wxMaracas Module: $RCSfile: volume.hxx,v $ Language: C++ - Date: $Date: 2008/11/24 10:47:12 $ - Version: $Revision: 1.2 $ + Date: $Date: 2009/01/15 11:09:47 $ + Version: $Revision: 1.3 $ Copyright: (c) 2002, 2003 License: @@ -32,7 +32,7 @@ extern "C" #include #endif // KGFO_USE_VTK -class MARACASVISULIB_EXPORTS kVolume +class creaMaracasVisu_EXPORT kVolume { public: -- 2.45.1