X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.h;h=a9d10391125f7efccc49f26912c562fdecd709b8;hb=2725f81fc97c9faa92749159bdbaf9cedeef7af4;hp=4118b75f7915ebeca9ed8bacb5b8a6466a7d9c7c;hpb=d7d3ec17199e6b725bd375fdfe1085eeb35b34cc;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h index 4118b75..a9d1039 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h @@ -5,8 +5,7 @@ #include #include "wxMaracasRenderImageManagementPanel.h" -#include "CutModel2MainPanel.h" -#include "wxMaracasMultipleVolumeRendererManager.h" +#include "volumerenderermanager.h" #include "wxMaracasSurfaceRenderingManager.h" #include "wxVtkBaseView.h" #include "wxMPRWidget.h" @@ -31,6 +30,7 @@ public: void addRemoveActorSA(int id, bool addremove); void addRemoveActorSB(int id, bool addremove); void addRemoveActorSC(int id, bool addremove); + void addRemoveActorMPR(bool addremove); void addMPROptions(); // ----- Volume rendering functions ----- // @@ -59,6 +59,7 @@ public: void onOpenParameters(wxCommandEvent& event); void onColorChange(wxCommandEvent& event); void onOpenCutter(wxCommandEvent& event); + void OnRefreshView(wxCommandEvent& event); vtkImageData* getVolImage(); vtkImageData* getSurfAImage(); @@ -73,25 +74,24 @@ private: wxCheckBox* checkboxSB; wxCheckBox* checkboxSC; wxCheckBox* checkboxViewer; - //wxBitmapButton* _viewimage; - + wxPanel* controlPanelMPR3D; wxNotebook* wxtabs; wxString volname; wxVtk3DBaseView* baseView; wxVtkMPR3DView* mwxvtkmpr3Dview; vtkMPR3DDataViewer* vtkmpr3Ddataviewer; - wxPanel* controlPanelMPR3D; bool first; int _id; - CutModel2MainPanel* cutter; wxMaracasRenderImageManagementPanel* dialog; - wxMaracasMultipleVolumeRendererManager* volmanager; + VolumeRendererManager* volmanager; wxMaracasSurfaceRenderingManager* surrendmanager1; wxMaracasSurfaceRenderingManager* surrendmanager2; wxMaracasSurfaceRenderingManager* surrendmanager3; + + DECLARE_EVENT_TABLE( ); }; #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/