X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.h;h=11293dcbc25425259f4e8719fd1b9d957e0b2765;hb=0eb7703d529af805f4a4f2a1b01b4151283c2327;hp=02913129ee4436144450d382a384efca5ba54b31;hpb=7bd9fee1949b9512a4fd021596674cbbfb991506;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index 0291312..11293dc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -19,10 +19,9 @@
 #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
 {
@@ -32,25 +31,14 @@ public:
     ~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);
-
 	void onLoadImageFile();
-
 	void addPanels(wxString filename, wxString dataname = _T(""));
-
+	
+	wxMaracasRenderTabbedPanel* getTabbedPanel();
 	std::string getPath();
 
 	void deleteVolume(int volid);
@@ -60,36 +48,25 @@ public:
 	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);
+	//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);
 
-	 vtkPiecewiseFunction* GetTransferFunction(int volumeid);
-	 vtkColorTransferFunction* GetColorFunction(int volumeid);
+	//vtkPiecewiseFunction* GetTransferFunction(int volumeid);
+	//vtkColorTransferFunction* GetColorFunction(int volumeid);
 
 private:
 	static wxMaracasRendererView* instance;
 
-	wxMaracasMultipleVolumeRendererManager* volmanager;
-
-	wxMaracasSurfaceRenderingManager* surrendmanager1;
-
-	wxMaracasSurfaceRenderingManager* surrendmanager2;
-
-	wxMaracasSurfaceRenderingManager* surrendmanager3;
-
 	wxMaracasRenderTabbedPanel* wxtabs;
-
 	wxAuiManager* wxauimanager;
 	
 	std::string _path;
-
-	wxToolBar* _toolb;
+	wxToolBar * _toolb;
 
 };
 
-class ToolBarEventHandlerRenderer : public wxEvtHandler{
+class ToolBarEventHandlerRenderer : public wxEvtHandler
+{
 
 	public:
 		ToolBarEventHandlerRenderer();
@@ -117,4 +94,3 @@ private:
 };
 
 #endif
-