*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / wxMaracasRendererView.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index 7be98884be86f5248e2373619b1aca37f0799815..11293dcbc25425259f4e8719fd1b9d957e0b2765 100644 (file)
--- 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 = "");
-
+       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
-