X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkBaseView.h;h=0ecedb5f0ddf7b02c2431711b9b6af5c829963c8;hb=dea0efc567d8332b2e7eb936e3ba4ac1c11b2542;hp=08bffa2be8c761dcd6b3ca6027920ca58b7dccfe;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h
index 08bffa2..0ecedb5 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>
@@ -69,36 +69,43 @@ public:
 	wxVtkBaseView( );
 	wxVtkBaseView( wxWindow *parent );
 	virtual ~wxVtkBaseView();
-	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);
+	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);
 
 	//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( vtkInteractorStyleBaseView*	interactorStyle);
 	*/
-	void							SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle);
+	void						SetInteractorStyleBaseView( vtkInteractorStyleImage*	interactorStyle);
 	/* JCP 04/05/09
 	 * 
 	vtkInteractorStyleBaseView*		GetInteractorStyleBaseView();	
 	*/
-	vtkInteractorStyleImage*		GetInteractorStyleBaseView();
-	virtual void					GetSpacing(double spc[3]);
+	vtkInteractorStyleImage*	GetInteractorStyleBaseView();
+	virtual void				GetSpacing(double spc[3]);
+	virtual int					GetDirection();
+	vtkBaseData*				GetVtkBaseData();
+	void						SetVtkBaseData(vtkBaseData *vtkbasedata);
 
 private:
-	wxWindow						*_parent;
-	wxVTKRenderWindowInteractor		*_iren;
+	wxWindow					*_parent;
+	wxVTKRenderWindowInteractor *_iren;
 	/**
 	 * JCP 04/05/09
 	 * vtkInteractorStyleImage		*_interactorStyle;
 	 */
 	vtkInteractorStyleImage		*_interactorStyle;
+
+// EED Nov 15 2014
+	vtkBaseData					*_vtkbasedata;
+
 protected:
 
 };