X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FmanualContour.h;h=6cb157a8a10b91eda64ebf103e30f6c457a56fc0;hb=ca78db7b1c30ba0bbb64db3cf28cc92643d49d8e;hp=aad7c52bbae2dcc41782a3b383aedba74d23bbba;hpb=206564e24c5c40e1f8830bfd17ebb4cc99175ec2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
index aad7c52..6cb157a 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/manualContour.h
@@ -32,7 +32,7 @@
 #include <vtkDataSetMapper.h>
 #include <vtkUnstructuredGrid.h>
 
-#include "widgets/wxVTKRenderWindowInteractor.h"
+#include "wxVTKRenderWindowInteractor.h"
 
 
 //--
@@ -40,7 +40,7 @@
 #include <vector>
 
 
-#include "widgets/wxVtkBaseView.h"
+#include "wxVtkBaseView.h"
 #include "marTypes.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();