X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.h;h=3dd2a336f045e9805068e2a0f239c9a8f4db22d6;hb=978a6b69b838cd857d997d53e1392573853ae702;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..3dd2a33 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -3,38 +3,35 @@
 
 #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"
+#include "wxVtkBaseView.h"
+#include "wxMPRWidget.h"
 
 
 class wxMaracasRenderTabbedPanel : public wxPanel
 {
 	
 public:
-	wxMaracasRenderTabbedPanel(wxWindow* parent/*, wxMaracasMultipleVolumeRendererManager* volmanager, wxMaracasSurfaceRenderingManager* surmanager1, wxMaracasSurfaceRenderingManager* surmanager2, 
-									  wxMaracasSurfaceRenderingManager* surmanager3, wxString pathfile, wxString filename*/);
+	wxMaracasRenderTabbedPanel(wxWindow* parent, int id, wxVtk3DBaseView* _baseView);
 	~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 addRemoveActorV(int id, bool addremove);
 	void addRemoveActorSA(int id, bool addremove);
 	void addRemoveActorSB(int id, bool addremove);
 	void addRemoveActorSC(int id, bool addremove);
+	void addRemoveActorMPR(bool addremove);
+	void addMPROptions();
 
 	// ----- Volume rendering functions ----- //
 	void SetValuesColorPointsFunction(int volid, std::vector<double> greylevelcolors,std::vector<double> red,std::vector<double> green,std::vector<double> blue);
@@ -52,44 +49,49 @@ 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 onMPROptions(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);
+	void OnRefreshView(wxCommandEvent& event);
+
+	vtkImageData* getVolImage();
+	vtkImageData* getSurfAImage();
+	vtkImageData* getSurfBImage();
+	vtkImageData* getSurfCImage();
 
-	void updateVolume();
 	int getPropIdV();
-	int getPropIdSA();
-	int getPropIdSB();
-	int getPropIdSC();
 	
 private:
 	wxCheckBox* checkboxVol;
 	wxCheckBox* checkboxSA;
 	wxCheckBox* checkboxSB;
 	wxCheckBox* checkboxSC;
-	//wxBitmapButton* _viewimage;
-
+	wxCheckBox* checkboxViewer;
+	wxPanel*	controlPanelMPR3D;
 	wxNotebook* wxtabs;
-
-	int _propidV;
-	int _propidSA;
-	int _propidSB;
-	int _propidSC;
+	wxString	volname;
+	
+	wxVtk3DBaseView*	baseView;
+	wxVtkMPR3DView*		mwxvtkmpr3Dview;
+	vtkMPR3DDataViewer* vtkmpr3Ddataviewer;
 
 	bool first;
+	int _id;
 
+	wxMaracasRenderImageManagementPanel*	dialog;
 	wxMaracasMultipleVolumeRendererManager* volmanager;
-	wxMaracasSurfaceRenderingManager* surrendmanager1;
-	wxMaracasSurfaceRenderingManager* surrendmanager2;
-	wxMaracasSurfaceRenderingManager* surrendmanager3;
-
-	wxMaracasMultipleVolumeRendererPanel* controlpanV;
-	wxMaracasSurfaceRenderingPanel* controlpanSA;
-	wxMaracasSurfaceRenderingPanel* controlpanSB;
-	wxMaracasSurfaceRenderingPanel* controlpanSC;
+	wxMaracasSurfaceRenderingManager*		surrendmanager1;
+	wxMaracasSurfaceRenderingManager*		surrendmanager2;
+	wxMaracasSurfaceRenderingManager*		surrendmanager3;
+
+	DECLARE_EVENT_TABLE( );
 };
 
 #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/