X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.h;h=a22e5616885ef8e5b5ff70f86309050f3c654074;hb=8e51f74bc77447daf61b8e1caf7ab07ae235b578;hp=a8c6fc87fb2973113ce2111385ed1588393312cd;hpb=28c74ab5eb531ce001260e9bc3fcb0151fcfc56b;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index a8c6fc8..a22e561 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -3,34 +3,29 @@
 
 #include <wx/wx.h>
 #include <wx/notebook.h> 
-#include "wxMaracasMultipleVolumeRendererPanel.h"
-#include "wxMaracasSurfaceRenderingPanel.h"
+#include "wxMaracasRenderImageManagementPanel.h"
+
 #include "wxMaracasMultipleVolumeRendererManager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
-#include "wxMaracasSurfaceRenderingProp3DMHD.h"
+
 
 
 class wxMaracasRenderTabbedPanel : public wxPanel
 {
 	
 public:
-	wxMaracasRenderTabbedPanel(wxWindow* parent/*, wxMaracasMultipleVolumeRendererManager* volmanager, wxMaracasSurfaceRenderingManager* surmanager1, wxMaracasSurfaceRenderingManager* surmanager2, 
-									  wxMaracasSurfaceRenderingManager* surmanager3, wxString pathfile, wxString filename*/);
+	wxMaracasRenderTabbedPanel(wxWindow* parent);
 	~wxMaracasRenderTabbedPanel();
 
-	void createControls(wxString pathfile, wxString filename);
+	void createControls(vtkImageData* inImg, std::string pathfile, std::string filename);
 	void setRenderer(vtkRenderer* rend);
 	void addVolume(vtkImageData* img, std::string dataname);
 	void addSurface1(vtkImageData* img, std::string dataname);
 	void addSurface2(vtkImageData* img, std::string dataname);
 	void addSurface3(vtkImageData* img, std::string dataname);
 
-	void onCheckBoxVChange(wxCommandEvent& event);
-	void onCheckBoxSAChange(wxCommandEvent& event);
-	void onCheckBoxSBChange(wxCommandEvent& event);
-	void onCheckBoxSCChange(wxCommandEvent& event);
-
 	void deleteVolume(int volid);
+	void Transform(vtkMatrix4x4* tmatrix);
 	void addRemoveActorV(int id, bool addremove);
 	void addRemoveActorSA(int id, bool addremove);
 	void addRemoveActorSB(int id, bool addremove);
@@ -52,14 +47,21 @@ public:
 	void changeOpacityC(int _propid, int value);
 	void changeIsoValueC(int propid, double value);
 	void changeColorC(int propid, double red, double green, double blue);
+	
+	void onCheckBoxVChange(wxCommandEvent& event);
+	void onCheckBoxSAChange(wxCommandEvent& event);
+	void onCheckBoxSBChange(wxCommandEvent& event);
+	void onCheckBoxSCChange(wxCommandEvent& event);
 
+	void onOpenParameters(wxCommandEvent& event);
 	void onColorChange(wxCommandEvent& event);
-	//void onOK(wxCommandEvent& event);
-	//void onCancel(wxCommandEvent& event);
-	void onUpdate(wxCommandEvent& event);
-	void onViewImage(wxCommandEvent& event);
+	void onOpenCutter(wxCommandEvent& event);
+
+	vtkImageData* getVolImage(int id);
+	vtkImageData* getSurfAImage(int id);
+	vtkImageData* getSurfBImage(int id);
+	vtkImageData* getSurfCImage(int id);
 
-	void updateVolume();
 	int getPropIdV();
 	int getPropIdSA();
 	int getPropIdSB();
@@ -73,6 +75,7 @@ private:
 	//wxBitmapButton* _viewimage;
 
 	wxNotebook* wxtabs;
+	wxMaracasRenderImageManagementPanel* dialog;
 
 	int _propidV;
 	int _propidSA;
@@ -85,11 +88,6 @@ private:
 	wxMaracasSurfaceRenderingManager* surrendmanager1;
 	wxMaracasSurfaceRenderingManager* surrendmanager2;
 	wxMaracasSurfaceRenderingManager* surrendmanager3;
-
-	wxMaracasMultipleVolumeRendererPanel* controlpanV;
-	wxMaracasSurfaceRenderingPanel* controlpanSA;
-	wxMaracasSurfaceRenderingPanel* controlpanSB;
-	wxMaracasSurfaceRenderingPanel* controlpanSC;
 };
 
 #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/