Removing volumeRendererManager files for addition in folder lib/GUI/Wx/VolumeRender...

[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 2ea03f3d5b5cba83a890880efd6d1443b92cadbb..08e209fe520b56a6fc1f5eae9bb3ce98e7ab2de6 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -15,65 +15,53 @@
 #include <iostream>
 #include "marTypes.h"
 #include "vtkProp3D.h"
+#include "wxVtkBaseView.h"
 
 #include "wxMaracasRendererView.h"
 #include "wxMaracasRenderTabbedPanel.h"
-#include "wxMaracasMultipleVolumeRendererManager.h"
-//#include "wxMaracasMultipleVolumeRendererPanel.h"
-//#include "wxMaracasSurfaceRenderingProp3DMHD.h"
+#include "volumerenderermanager.h".h"
 #include "wxMaracasSurfaceRenderingManager.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);
 
-       void loadVolume(wxString filename, wxString dataname);
-       void onLoadImageFile();
-       void addPanels(wxString filename, wxString dataname = _T(""));
-       wxMaracasRenderTabbedPanel* getTabbedPanel();
        std::string getPath();
-       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);
+       wxMaracasRenderTabbedPanel* getTabbedPanel(int id) throw(char*);
 
-       void addPanels(wxMaracasMultipleVolumeRendererPanel* irmview, std::string dataname);
+       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);
 
-        vtkPiecewiseFunction* GetTransferFunction(int volumeid);
-        vtkColorTransferFunction* GetColorFunction(int volumeid);
+       void deleteVolume(int volid);
+       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;
+       wxVtk3DBaseView* baseView;
+       std::string _path;
 
+       int _idCount;
 };
 
-class ToolBarEventHandlerRenderer : public wxEvtHandler{
-
+class ToolBarEventHandlerRenderer : public wxEvtHandler
+{
        public:
                ToolBarEventHandlerRenderer();
                ~ToolBarEventHandlerRenderer();
@@ -87,17 +75,13 @@ class ToolBarEventHandlerRenderer : public wxEvtHandler{
 
 class ToolBarRenderer : public wxToolBar{
 
-       
 public:
        ToolBarRenderer(wxWindow * parent,std::string iconsdir);
        ~ToolBarRenderer(void);
 
-
 private:
 
        ToolBarEventHandlerRenderer* _evthand;
-
 };
 
 #endif
-