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=410e06c32fc330d53bc93f81afeca8b72a6ddb26;hp=07d9e462d6afc2817a7bbe11791d6719583f832a;hpb=ed6f960acce2ed63b0d6b964aee7ee243d8c6446;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index 07d9e46..54d036f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.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,45 +69,42 @@ public:
 	wxVtkBaseView( );
 	wxVtkBaseView( wxWindow *parent );
 	virtual ~wxVtkBaseView();
-	wxVTKRenderWindowInteractor		*GetWxVTKRenderWindowInteractor() throw (char*);
-	virtual void					Configure();
-	virtual void					Refresh();
-	virtual void					RefreshView();
-	virtual vtkRenderer*			GetRenderer();
+	crea::wxVTKRenderWindowInteractor	*GetWxVTKRenderWindowInteractor() throw (char*);
+	virtual void				Configure();
+	virtual void				Refresh();
+	virtual void				RefreshView();
+	virtual vtkRenderer*		GetRenderer();
 	virtual vtkRenderWindow*	GetRenWin();
-	virtual void					TransFromCoordScreenToWorld(double &X, double &Y, double &Z, bool keepNormalDirection=false,int type=2);
+	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();
-	virtual void					GetSpacing(double spc[3]);
-	virtual int						GetDirection();
-
-
-	vtkBaseData*					GetVtkBaseData();
-	void								SetVtkBaseData(vtkBaseData *vtkbasedata);
-
+	virtual void				GetSpacing(double spc[3]);
+	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;
+	vtkBaseData							*_vtkbasedata;
 
 protected: