X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.h;h=fa7c2fe1730d6ba00cc8315da04aaa33d49fd7e4;hb=f050938d3947f6b785289da6d58f8fec2da57421;hp=1031d5f8c9e3b2390cbbfff956cc4ea46d20a70d;hpb=2098cdccd2ed2c0593b36175bf67f4ee5230c327;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h index 1031d5f..fa7c2fe 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h @@ -15,13 +15,12 @@ #include #include "marTypes.h" #include "vtkProp3D.h" +#include "wxVtkBaseView.h" #include "wxMaracasRendererView.h" #include "wxMaracasRenderTabbedPanel.h" -#include "wxMaracasMultipleVolumeRendererManager.h" +#include "volumerenderermanager.h" #include "wxMaracasSurfaceRenderingManager.h" -//#include "wxMaracasMultipleVolumeRendererPanel.h" -//#include "wxMaracasSurfaceRenderingProp3DMHD.h" class creaMaracasVisu_EXPORT wxMaracasRendererView : public wxPanel { @@ -37,16 +36,12 @@ public: wxMaracasRenderTabbedPanel* getTabbedPanel(int id) throw(char*); void setRenderer(vtkRenderer* renderer); /* throw(char*), */ // JPR + void setVtkBaseView(wxVtk3DBaseView* base); void onLoadImageFile(); void addVolumes(vtkImageData* img, std::string pathfile, std::string filename); void addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkImageData* img, std::string pathfile, std::string filename); void deleteVolume(int volid); - void addRemoveActorVol(int id, bool remove); - void addRemoveSurf1Actor(int id, bool addremove); - void addRemoveSurf2Actor(int id, bool addremove); - void addRemoveSurf3Actor(int id, bool addremove); - std::vector getFiles(); private: @@ -59,6 +54,7 @@ private: wxToolBar * _toolb; vtkRenderer* _renderer; + wxVtk3DBaseView* baseView; std::string _path; int _idCount;