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=5380f9e66daf440f27f33bb060e5ae1a646612cd;hp=7714676410c5df5ad31f94d577c4a83f324108da;hpb=bee98ac008a4469f1ce8cbf67d178ec8561e19c0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index 7714676..fa7c2fe 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -15,56 +15,53 @@
 #include <iostream>
 #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
 {
 
 public:
 	wxMaracasRendererView( wxWindow* parent, std::string path);
-    ~wxMaracasRendererView( );
+        ~wxMaracasRendererView( );
 
 	static wxMaracasRendererView* getInstance(wxWindow* parent,std::string path="");
 	static wxMaracasRendererView* getInstance();
-	
+
 	std::string getPath();
-	wxMaracasRenderTabbedPanel* getTabbedPanel(int id)throw(char*);
+	wxMaracasRenderTabbedPanel* getTabbedPanel(int id) throw(char*);
 
-	void setRenderer(vtkRenderer*  renderer) 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<std::string> getFiles();
-	
+
 private:
 	static wxMaracasRendererView* instance;
 
 	std::vector<wxMaracasRenderTabbedPanel*> tabsVector;
 	std::vector<std::string> files;
-	
+
 	wxAuiManager* wxauimanager;
 	wxToolBar * _toolb;
 
 	vtkRenderer*  _renderer;
+	wxVtk3DBaseView* baseView;
 	std::string _path;
+
+	int _idCount;
 };
 
 class ToolBarEventHandlerRenderer : public wxEvtHandler
 {
-
 	public:
 		ToolBarEventHandlerRenderer();
 		~ToolBarEventHandlerRenderer();
@@ -78,16 +75,13 @@ class ToolBarEventHandlerRenderer : public wxEvtHandler
 
 class ToolBarRenderer : public wxToolBar{
 
-	
 public:
 	ToolBarRenderer(wxWindow * parent,std::string iconsdir);
 	~ToolBarRenderer(void);
 
-
 private:
 
 	ToolBarEventHandlerRenderer* _evthand;
-
 };
 
 #endif