DFCH: imageUndoRedo + Manual Paint: It doesn't works :s :s

[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 1a45b14022a74de15f3064e658458b57d43caca8..fa7c2fe1730d6ba00cc8315da04aaa33d49fd7e4 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
@@ -15,60 +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);
-       
-       
-       //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);
+       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;
-       wxToolBar * _toolb;
 
+       int _idCount;
 };
 
 class ToolBarEventHandlerRenderer : public wxEvtHandler
 {
-
        public:
                ToolBarEventHandlerRenderer();
                ~ToolBarEventHandlerRenderer();
@@ -82,16 +75,13 @@ class ToolBarEventHandlerRenderer : public wxEvtHandler
 
 class ToolBarRenderer : public wxToolBar{
 
-       
 public:
        ToolBarRenderer(wxWindow * parent,std::string iconsdir);
        ~ToolBarRenderer(void);
 
-
 private:
 
        ToolBarEventHandlerRenderer* _evthand;
-
 };
 
 #endif