X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.h;h=6552e6876a9ccb9a19927a020d01dd1e795492ae;hb=fc309690300a29fbfbac04f6fdf72783202617ad;hp=811d6dbd181725c8eb53b392a79e2484242ccb1f;hpb=87b6a1645b4dd6293e9c6ed9b33731d82a8623af;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index 811d6db..6552e68 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -3,18 +3,19 @@
 
 #include <wx/wx.h>
 #include <wx/notebook.h> 
-#include "wxMaracasRenderImageManagementPanel.h"
 
+#include "wxMaracasRenderImageManagementPanel.h"
 #include "wxMaracasMultipleVolumeRendererManager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
-
+#include "wxVtkBaseView.h"
+#include "wxMPRWidget.h"
 
 
 class wxMaracasRenderTabbedPanel : public wxPanel
 {
 	
 public:
-	wxMaracasRenderTabbedPanel(wxWindow* parent, int id);
+	wxMaracasRenderTabbedPanel(wxWindow* parent, int id, wxVtk3DBaseView* _baseView);
 	~wxMaracasRenderTabbedPanel();
 
 	void createControls(vtkImageData* inImg, std::string pathfile, std::string filename);
@@ -25,11 +26,11 @@ public:
 	void addSurface3(vtkImageData* img, std::string dataname);
 
 	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);
 	void addRemoveActorSC(int id, 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,10 +53,12 @@ public:
 	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 onOpenCutter(wxCommandEvent& event);
+	void OnRefreshView(wxCommandEvent& event);
 
 	vtkImageData* getVolImage();
 	vtkImageData* getSurfAImage();
@@ -69,20 +72,25 @@ private:
 	wxCheckBox* checkboxSA;
 	wxCheckBox* checkboxSB;
 	wxCheckBox* checkboxSC;
-	//wxBitmapButton* _viewimage;
-
+	wxCheckBox* checkboxViewer;
+	wxPanel*	controlPanelMPR3D;
 	wxNotebook* wxtabs;
-	wxMaracasRenderImageManagementPanel* dialog;
+	wxString	volname;
+	
+	wxVtk3DBaseView*	baseView;
+	wxVtkMPR3DView*		mwxvtkmpr3Dview;
+	vtkMPR3DDataViewer* vtkmpr3Ddataviewer;
 
 	bool first;
+	int _id;
 
+	wxMaracasRenderImageManagementPanel*	dialog;
 	wxMaracasMultipleVolumeRendererManager* volmanager;
-	wxMaracasSurfaceRenderingManager* surrendmanager1;
-	wxMaracasSurfaceRenderingManager* surrendmanager2;
-	wxMaracasSurfaceRenderingManager* surrendmanager3;
+	wxMaracasSurfaceRenderingManager*		surrendmanager1;
+	wxMaracasSurfaceRenderingManager*		surrendmanager2;
+	wxMaracasSurfaceRenderingManager*		surrendmanager3;
 
-	int _id;
+	DECLARE_EVENT_TABLE( );
 };
 
-#endif /*wxMaracasMultipleVolumeRendererPanel_H_*/
-
+#endif /*wxMaracasMultipleVolumeRendererPanel_H_*/
\ No newline at end of file