X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.h;h=54d036f6f4fa5e24800dcca748bed976277ea5b8;hb=04daf8279bb4bd4219f2903e7352e36db8d88866;hp=43ccd2f1b68839b7b64ecdf34a2456ad87f65aca;hpb=1e7de89ec5e380426c57ee4e85c6a5ccd5aa44ad;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index 43ccd2f..54d036f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
@@ -43,7 +43,7 @@
 #include <vtkImageViewer2.h> 
 #include <vtkInteractorStyleImage.h> 
 
-#include "wxMPRBaseData.h"
+#include "vtkBaseData.h"
 #include "wxVTKRenderWindowInteractorEditContour.h"
 
 #include <wx/wx.h>
@@ -53,7 +53,7 @@
 #include <vector>
 #include "marTypes.h"
 
-#include "wxVTKRenderWindowInteractor.h"
+#include "creawxVTKRenderWindowInteractor.h"
 //#include "include/vtkImageViewer2_XYZ.h"
 
 /* JCP 14/05/09
@@ -69,37 +69,43 @@ public:
 	wxVtkBaseView( );
 	wxVtkBaseView( wxWindow *parent );
 	virtual ~wxVtkBaseView();
-	wxVTKRenderWindowInteractor		*GetWxVTKRenderWindowInteractor() throw (char*);
+	crea::wxVTKRenderWindowInteractor	*GetWxVTKRenderWindowInteractor() throw (char*);
 	virtual void				Configure();
 	virtual void				Refresh();
 	virtual void				RefreshView();
-	virtual vtkRenderer*			GetRenderer();
-	virtual vtkRenderWindow*		GetRenWin();
+	virtual vtkRenderer*		GetRenderer();
+	virtual vtkRenderWindow*	GetRenWin();
 	virtual void				TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool keepNormalDirection=false,int type=2);
 
 	//RaC 03-2010 Method used by TransFromCoordScreenToWorld
-	void					TransCoordScreenToWorld(double &X, double &Y, double &Z,int type=2);
+	void						TransCoordScreenToWorld(double &X, double &Y, double &Z,int type=2);
 
 	/* JCP 04/05/09
 	void					SetInteractorStyleBaseView( vtkInteractorStyleBaseView*	interactorStyle);
 	*/
-	void					SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle);
+	void						SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle);
 	/* JCP 04/05/09
 	 * 
 	vtkInteractorStyleBaseView*		GetInteractorStyleBaseView();	
 	*/
-	vtkInteractorStyleImage*		GetInteractorStyleBaseView();
+	vtkInteractorStyleImage*	GetInteractorStyleBaseView();
 	virtual void				GetSpacing(double spc[3]);
-	virtual int				GetDirection();
+	virtual int					GetDirection();
+	vtkBaseData*				GetVtkBaseData();
+	void						SetVtkBaseData(vtkBaseData *vtkbasedata);
 
 private:
-	wxWindow				*_parent;
-	wxVTKRenderWindowInteractor		*_iren;
+	wxWindow							*_parent;
+	crea::wxVTKRenderWindowInteractor 	*_iren;
 	/**
 	 * JCP 04/05/09
-	 * vtkInteractorStyleImage		*_interactorStyle;
+	 * vtkInteractorStyleImage			*_interactorStyle;
 	 */
-	vtkInteractorStyleImage		*_interactorStyle;
+	vtkInteractorStyleImage				*_interactorStyle;
+
+// EED Nov 15 2014
+	vtkBaseData							*_vtkbasedata;
+
 protected:
 
 };