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=c85eb0d2045092682d9ec729097ba1a06084732c;hp=79391aa6dc764f31119b84efdeb433f4d026f047;hpb=439cc05f12e61d0ba090ec0c2ba8701d382238d7;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkBaseView.h index 79391aa..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 #include "marTypes.h" -#include "wxVTKRenderWindowInteractor.h" +#include "creawxVTKRenderWindowInteractor.h" //#include "include/vtkImageViewer2_XYZ.h" /* JCP 14/05/09 @@ -69,7 +69,7 @@ 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(); @@ -91,23 +91,20 @@ public: vtkInteractorStyleImage* GetInteractorStyleBaseView(); 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: