Several precompiler modifications in order to be compatible with bbmaracasvisu (bbtk...

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4f1ace9f39adc2551fecb3818c7d67cc5f13ba6..bce73aa3fe016fe1c6bee16f006ce59707d47053 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,3 +32,4 @@ MARK_AS_ADVANCED(
 #SUBDIRS(appli)
 #SUBDIRS(lib)
 SUBDIRS(lib)
+SUBDIRS(bbtk)
\ No newline at end of file

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h
index 56a03d2e89336de482fcaab4b6f83c7b07e3d3ac..4be60a60b8a23dde1f8fcfed1f8ba0d5931b4b09 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.h
@@ -2,7 +2,7 @@
 #ifndef __ContourCrownWidget_h_INCLUDED_H__
 #define __ContourCrownWidget_h_INCLUDED_H__
 
-
+#include "marTypes.h"
 #include <manualContour.h>
 #include "mBarRange.h"
 
@@ -13,7 +13,7 @@
 
 
   //--------------------------------------------------------------------------
-  class wxMaracasCoutourTool : public wxPanel
+  class MARACASVISULIB_EXPORTS wxMaracasCoutourTool : public wxPanel
   {
   public:
        wxMaracasCoutourTool( wxWindow *parent, wxVtkBaseView *wxvtkbaseview, vtkImageData* imagedata);

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h
index a862a4617496703e62483cac2316a0bf5e2aa06d..a9013061f8346364cacad15bc313941bf2032bac 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourVOIWidget.h
@@ -5,7 +5,7 @@
 
 #include <manualContour.h>
 #include "mBarRange.h"
-
+#include "marTypes.h"
   
 
 
@@ -45,7 +45,7 @@
 //--------------------------------------------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------------------------------------------
 
-  class ContourVOIWidget : public wxPanel
+  class MARACASVISULIB_EXPORTS ContourVOIWidget : public wxPanel
   {
   public:
        ContourVOIWidget( wxWindow *parent, wxVtkBaseView *wxvtkbaseview , vtkImageData* imagedata);

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h
index 27eea171714143f024a5fe5d4065a37eaeda1afe..9fb0bfeae55c41f5efba84751705236d7af39553 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.h
@@ -7,6 +7,7 @@
   #include "itkMatrix.h"
 */
 
+#include "marTypes.h"
 #include "../manualContour.h"
 #include "time.h"
 #include <wx/wx.h>
@@ -46,7 +47,7 @@ class Vector
                        std::vector<double> _vecZ;
 };
 
-class PropContour
+class MARACASVISULIB_EXPORTS PropContour
 {
        public:
                        PropContour();

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
index 5138dc65133f146a069f72f2ef70c86162b51b83..f4c010c513aec2f55515a42e044160e6e3d73fb0 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/Histogram.h
@@ -16,6 +16,7 @@
 #include <wx/wx.h>
 #endif
 
+#include "marTypes.h"
 #include "pPlotterWindow.h"
 #include "pFunctionPoint.h"
 #include  "vtkImageData.h"
@@ -27,7 +28,7 @@
 #define NUM_POINTS 100
 #define WINDOW_SIZE 10
 
-class Histogram:public wxPanel
+class MARACASVISULIB_EXPORTS 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 ff2d80329075a1d080899f3ecf7e662669e50046..1df255dcba52ef2fe0819857138b2ee82e9022e9 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/HistogramWidget.h
@@ -16,6 +16,7 @@
 #include <wx/wx.h>
 #endif
 
+#include "marTypes.h"
 #include "pPlotter.h"
 #include "pFunctionPoint.h"
 #include  "vtkImageData.h"
@@ -27,7 +28,7 @@
 #define NUM_POINTS 100
 #define WINDOW_SIZE 10
 
-class HistogramWidget:public wxPanel
+class MARACASVISULIB_EXPORTS HistogramWidget:public wxPanel
 {
 public:
        //---------------------

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
index 0edba5f7fb627603f0c43eb8b7a76a679fb819d9..1371715d581c7f83705d362dc6b101b87559dbb6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/mathplot.h
@@ -50,6 +50,7 @@ http://sourceforge.net/projects/wxmathplot
 #endif
 */
 
+#include "marTypes.h"
 #include "wx/defs.h"
 #include <wx/wx.h>
 
@@ -421,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  mpWindow : public wxScrolledWindow
+class MARACASVISULIB_EXPORTS mpWindow : public wxScrolledWindow
 {
 public:
        mpWindow() {}

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h
index 9623e2f2a8fcc55347632fd72731e39011ac1370..ab2846b2460b04071f0a1ad6bc38ffb1050c3d36 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleX.h
@@ -19,11 +19,12 @@
 //----------------------------------------------------------------------------
 
 #include "pPlotterLayer.h"
+#include "marTypes.h"
 
 //----------------------------------------------------------------------------
 // Class definition
 //----------------------------------------------------------------------------
-class pPlotterScaleX: public pPlotterLayer
+class MARACASVISULIB_EXPORTS 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 035a8b372f6e3f96d415d7cd7e0a2891cc6e2883..dad7c7148877abf7dac4b6411597004ea57edb0f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterScaleY.h
@@ -20,11 +20,12 @@
 //----------------------------------------------------------------------------
 
 #include "pPlotterLayer.h"
+#include "marTypes.h"
 
 //----------------------------------------------------------------------------
 // Class definition
 //----------------------------------------------------------------------------
-class pPlotterScaleY: public pPlotterLayer
+class MARACASVISULIB_EXPORTS 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 56541f2c1e3e5ac8dfa1aefb7f0ae91630f705bc..f14871db01e9a899a492b37c127f0d1bc6331116 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterWindow.h
@@ -23,6 +23,7 @@
 #include "pPlotterLayer.h"
 #include "pGraphicalFunction.h"
 #include "mathplot.h"
+#include "marTypes.h"
 
 
 
@@ -85,7 +86,7 @@ enum
 // Class definition
 //----------------------------------------------------------------------------
 
-class pPlotterWindow: public mpWindow
+class MARACASVISULIB_EXPORTS pPlotterWindow: public mpWindow
 {
 public:
        /**

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
index 70a911b1dca11a74ef77e85fa2aaa1f4a9547971..2993255f36509b101dd88f2423a9cd074720ab2f 100644 (file)
--- 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/11/06 10:00:54 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2008/11/12 16:25:06 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -18,7 +18,7 @@
 #ifndef __WX__MPR__WIDGET__HXX__
 #define __WX__MPR__WIDGET__HXX__
 
-
+#include "marTypes.h"
 #include <vector>
 
 #include <vtkObjectBase.h>
@@ -526,7 +526,7 @@ private:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class wxVtkMPR3DView
+class MARACASVISULIB_EXPORTS wxVtkMPR3DView
 {
 public:
        wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview );
@@ -939,7 +939,7 @@ private:
 
 
 
-class wxMPRWidget : public wxPanel
+class MARACASVISULIB_EXPORTS wxMPRWidget : public wxPanel
 {
 public:
     wxMPRWidget(wxWindow* parent,marImageData *marimageData,double voxelSize);
@@ -1009,7 +1009,7 @@ private:
 };
 
 
-class wxMPRWidget2 : public wxMPRWidget
+class MARACASVISULIB_EXPORTS wxMPRWidget2 : public wxMPRWidget
 {
 public:
        wxMPRWidget2(wxWindow* parent,marImageData *marimagedata,double voxelSize);

diff --git a/lib/maracasVisuLib/src/kernel/marImageData.h b/lib/maracasVisuLib/src/kernel/marImageData.h
index 32cc068d98b52c048c4918a7208dd2bd1eadd0fa..87db79ccbc4a840fa1ed45db39aad86490383473 100644 (file)
--- a/lib/maracasVisuLib/src/kernel/marImageData.h
+++ b/lib/maracasVisuLib/src/kernel/marImageData.h
@@ -4,12 +4,12 @@
 
 #ifndef __MAR_IMAGE_DATA__h
 #define __MAR_IMAGE_DATA__h
-
+#include "marTypes.h"
 #include <vector>
 
 #include "vtkImageData.h"
 
-class marImageData
+class MARACASVISULIB_EXPORTS marImageData
 {
 public:
        marImageData(vtkImageData *imagedata);