X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRendering.h;h=3aec4f7440687162b0139dfcd63c99cd1d8fd24f;hb=65c158dc171f8d3114ee3544b2a94a1f41880df0;hp=9a40c949f8bca051dfc19052540369a9aeaeb3c9;hpb=52134c6f15827d0ae9ea8cf0ffaa15867ab87dcc;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
index 9a40c94..3aec4f7 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRendering.h
@@ -3,8 +3,8 @@
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasSurfaceRendering.h,v $
   Language:  C++
-  Date:      $Date: 2009/10/15 11:56:43 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2010/01/22 17:00:52 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -28,57 +28,61 @@
 #include "wxMaracasSurfaceRenderingManager.h"
 #include "wxMaracasSurfaceRenderingPanel.h"
 
-
-
 class  creaMaracasVisu_EXPORT  wxMaracasSurfaceRendering : public wxPanel
 {
 
 public:
-	wxMaracasSurfaceRendering( wxWindow* parent, std::string path);
+    wxMaracasSurfaceRendering( wxWindow* parent, std::string path);
     ~wxMaracasSurfaceRendering( );
 
-	static wxMaracasSurfaceRendering* getInstance(wxWindow* parent,std::string path="");
+    static wxMaracasSurfaceRendering* getInstance(wxWindow* parent,std::string path="");
+
+    static wxMaracasSurfaceRendering* getInstance();
 
-	static wxMaracasSurfaceRendering* getInstance();
+    void setRenderer(vtkRenderer*  renderer);
 
-	void setRenderer(vtkRenderer*  renderer);
+    void setInteractor(vtkRenderWindowInteractor*  interactor);
 
-	void changeOpacity(int propid, int value);
+    void changeOpacity(int propid, int value);
 
-	void changeIsoValue(int propid, double value);
+    void changeIsoValue(int propid, double value);
 
     void addRemoveActor(int propid, bool addremove);
 
-	void changeColor(int propid, double red, double green, double blue);
+    void addRemoveSurfaceBox(int propid, bool addremove);
 
-	void addProp3D(vtkProp3D* prop3D, std::string dataname="");
+    void changeColor(int propid, double red, double green, double blue);
 
-	void addPropMHD(vtkImageData* imgdata, std::string dataname="");
+    void addProp3D(vtkProp3D* prop3D, std::string dataname="");
 
-	void loadProp3D(wxString filename, wxString dataname);
+    void addPropMHD(vtkImageData* imgdata, std::string dataname="");
 
-	void loadPropMHD(wxString filename, wxString dataname);
+    void loadProp3D(wxString filename, wxString dataname);
 
-	void onLoadImageFile();
+    void loadPropMHD(wxString filename, wxString dataname);
 
-	void addSurfaceRenderingPanel(wxMaracasSurfaceRenderingPanel* surrend, std::string dataname="");
+    void onLoadImageFile();
 
-	std::string getPath();
+    void addSurfaceRenderingPanel(wxMaracasSurfaceRenderingPanel* surrend, std::string dataname="");
 
-	void deleteActor(int propid);
-private:
-	static wxMaracasSurfaceRendering* instance;
+    std::string getPath();
 
-	wxMaracasSurfaceRenderingManager* surrendmanager;
+    void deleteActor(int propid);
 
-	wxAuiManager* wxauimanager;
+    bool interactorSet();
 
-	void createFileChooser();
+private:
+    static wxMaracasSurfaceRendering* instance;
 
-	std::string _path;
+    wxMaracasSurfaceRenderingManager* surrendmanager;
+	
+    wxAuiManager* wxauimanager;
+    
+    wxToolBar* _toolb;
 
-	wxToolBar* _toolb;
+    std::string _path;
 
+    void createFileChooser();
 };
 
 class ToolBarEventHandler : public wxEvtHandler{
@@ -96,17 +100,13 @@ class ToolBarEventHandler : public wxEvtHandler{
 
 class ToolBar : public wxToolBar{
 
-	
 public:
 	ToolBar(wxWindow * parent,std::string iconsdir);
 	~ToolBar(void);
 
-
 private:
 
 	ToolBarEventHandler* _evthand;
-
 };
 
 #endif
-