X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.h;h=1031d5f8c9e3b2390cbbfff956cc4ea46d20a70d;hb=87b6a1645b4dd6293e9c6ed9b33731d82a8623af;hp=7be98884be86f5248e2373619b1aca37f0799815;hpb=52134c6f15827d0ae9ea8cf0ffaa15867ab87dcc;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index 7be9888..1031d5f 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -19,78 +19,53 @@
 #include "wxMaracasRendererView.h"
 #include "wxMaracasRenderTabbedPanel.h"
 #include "wxMaracasMultipleVolumeRendererManager.h"
-#include "wxMaracasMultipleVolumeRendererPanel.h"
-#include "wxMaracasSurfaceRenderingProp3DMHD.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();
 
-	void setRenderer(vtkRenderer*  renderer);
-	
-	wxMaracasMultipleVolumeRendererPanel* addVolume(vtkImageData* img, std::string dataname="");		
-
-	wxMaracasSurfaceRenderingPanel* addSurface1(vtkImageData* img, std::string dataname="");
-	
-	wxMaracasSurfaceRenderingPanel* addSurface2(vtkImageData* img, std::string dataname="");
-	
-	wxMaracasSurfaceRenderingPanel* addSurface3(vtkImageData* img, std::string dataname="");
-
-	void loadVolume(wxString filename, wxString dataname);
+	std::string getPath();
+	wxMaracasRenderTabbedPanel* getTabbedPanel(int id) throw(char*);
 
+	void setRenderer(vtkRenderer*  renderer); /* throw(char*), */   // JPR
 	void onLoadImageFile();
-
-	void addPanels(wxString filename, wxString dataname = "");
-
-	std::string getPath();
+	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);
-	
-	void SetValuesColorPointsFunction(int volid, std::vector<double> greylevelcolors,std::vector<double> red,std::vector<double> green,std::vector<double> blue);
-	void SetValuesPointsFunction(int volid, std::vector<double> greylevel, std::vector<double> values);
 
-	void addPanels(wxMaracasMultipleVolumeRendererPanel* irmview, std::string dataname);
-
-	 vtkPiecewiseFunction* GetTransferFunction(int volumeid);
-	 vtkColorTransferFunction* GetColorFunction(int volumeid);
+	std::vector<std::string> getFiles();
 
 private:
 	static wxMaracasRendererView* instance;
 
-	wxMaracasMultipleVolumeRendererManager* volmanager;
-
-	wxMaracasSurfaceRenderingManager* surrendmanager1;
-
-	wxMaracasSurfaceRenderingManager* surrendmanager2;
-
-	wxMaracasSurfaceRenderingManager* surrendmanager3;
-
-	wxMaracasRenderTabbedPanel* wxtabs;
+	std::vector<wxMaracasRenderTabbedPanel*> tabsVector;
+	std::vector<std::string> files;
 
 	wxAuiManager* wxauimanager;
-	
-	std::string _path;
+	wxToolBar * _toolb;
 
-	wxToolBar* _toolb;
+	vtkRenderer*  _renderer;
+	std::string _path;
 
+	int _idCount;
 };
 
-class ToolBarEventHandlerRenderer : public wxEvtHandler{
-
+class ToolBarEventHandlerRenderer : public wxEvtHandler
+{
 	public:
 		ToolBarEventHandlerRenderer();
 		~ToolBarEventHandlerRenderer();
@@ -104,17 +79,13 @@ class ToolBarEventHandlerRenderer : public wxEvtHandler{
 
 class ToolBarRenderer : public wxToolBar{
 
-	
 public:
 	ToolBarRenderer(wxWindow * parent,std::string iconsdir);
 	~ToolBarRenderer(void);
 
-
 private:
 
 	ToolBarEventHandlerRenderer* _evthand;
-
 };
 
 #endif
-