X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMPRWidget.h;h=c98583a5eda18aa2a2cf7b95515957113b15f8d9;hb=0a4bb77d5281ee5bc6eebd504abae2500cfa780a;hp=7440a6f0d45f147cdea4876f7f16ff6a9ef0d6df;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMPRWidget.h
index 7440a6f..c98583a 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/10/31 16:32:42 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2009/03/24 10:49:21 $
+  Version:   $Revision: 1.7 $
 
   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>
@@ -46,7 +46,7 @@
 
 
 //#include "kernel/marInterface.h"
-#include "../manualContour.h"
+#include "manualContour.h"
 
 #include "wxMPRBaseData.h"
 #include "wxVtkBaseView.h"
@@ -55,7 +55,7 @@
 #include <wx/listbox.h>
 #include <wx/tglbtn.h>
 #include <wx/splitter.h>
-
+#include "marTypes.h"
 
 class wxMPRWidget;
 
@@ -325,7 +325,7 @@ private:
 				
 class vtkInteractorStyleMPRView;
 	
-class wxVtkMPR2DView :  public wxVtk2DBaseView
+class creaMaracasVisu_EXPORT wxVtkMPR2DView :  public wxVtk2DBaseView
 {
 public:
 	wxVtkMPR2DView( wxWindow *parent, int direction );
@@ -526,11 +526,11 @@ private:
 //------------------------------------------------------------------
 //------------------------------------------------------------------
 
-class wxVtkMPR3DView
+class creaMaracasVisu_EXPORT wxVtkMPR3DView
 {
 public:
 	wxVtkMPR3DView( wxVtk3DBaseView *wxvtk3Dbaseview );
-	~wxVtkMPR3DView();
+	virtual ~wxVtkMPR3DView();
 	void				VisibleImageActor(int idPosition, bool visible);
 	void				VisiblePointWidget( bool visible );
 	void				VisiblePlaneWidget( bool visible );
@@ -581,7 +581,7 @@ class wxVtkClipping3DView
 {
 public:
 	wxVtkClipping3DView( wxVtk3DBaseView* wxvtk3Dbaseview );
-	~wxVtkClipping3DView();
+	virtual ~wxVtkClipping3DView();
 	virtual void				Refresh();
 	virtual void				Configure();
 	void						SetVtkClipping3DDataViewer( vtkClipping3DDataViewer *vtkclipping3Ddataviewer );
@@ -939,10 +939,10 @@ private:
 
 
 
-class wxMPRWidget : public wxPanel
+class creaMaracasVisu_EXPORT wxMPRWidget : public wxPanel
 {
 public:
-    wxMPRWidget(wxWindow* parent,marImageData *marimageData,double voxelSize);
+    wxMPRWidget(wxWindow* parent,marImageData *marimageData = NULL,double voxelSize = -1);
 	~wxMPRWidget( );
 	void ConfigureVTK();
 
@@ -965,6 +965,8 @@ public:
 	//returns the 2d view of the specific direction (0|1|2)
 	wxVtkMPR2DView *GetWxvtkMPR2Dview(int direction);
 
+	void setMarImage(marImageData *marimageData, double voxelsize);
+
 private:
 	double					_voxelSize;
 	marImageData			*_marImageData; 
@@ -1009,7 +1011,7 @@ private:
 };
 
 
-class wxMPRWidget2 : public wxMPRWidget
+class creaMaracasVisu_EXPORT wxMPRWidget2 : public wxMPRWidget
 {
 public:
 	wxMPRWidget2(wxWindow* parent,marImageData *marimagedata,double voxelSize);