X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.h;h=0df3853ef68477dfc86ecd46178f8981ac8a7676;hb=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=14411e98be7d3376049e9ac5609473b2ca974a52;hpb=d2fc2645728a4aea4f0aa0febfa1d7a894ab3ff1;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
index 14411e9..0df3853 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef wxMaracasRenderTabbedPanel_H_
 #define wxMaracasRenderTabbedPanel_H_
 
@@ -5,8 +30,7 @@
 #include <wx/notebook.h> 
 
 #include "wxMaracasRenderImageManagementPanel.h"
-//#include "CutModelMainPanel.h"
-#include "wxMaracasMultipleVolumeRendererManager.h"
+#include "volumerenderermanager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
 #include "wxVtkBaseView.h"
 #include "wxMPRWidget.h"
@@ -27,11 +51,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 addRemoveActorMPR(bool addremove);
 	void addMPROptions();
 
 	// ----- Volume rendering functions ----- //
@@ -60,6 +84,7 @@ public:
 	void onOpenParameters(wxCommandEvent& event);
 	void onColorChange(wxCommandEvent& event);
 	void onOpenCutter(wxCommandEvent& event);
+	void OnRefreshView(wxCommandEvent& event);
 
 	vtkImageData* getVolImage();
 	vtkImageData* getSurfAImage();
@@ -74,25 +99,24 @@ private:
 	wxCheckBox* checkboxSB;
 	wxCheckBox* checkboxSC;
 	wxCheckBox* checkboxViewer;
-	//wxBitmapButton* _viewimage;
-
+	wxPanel*	controlPanelMPR3D;
 	wxNotebook* wxtabs;
 	wxString	volname;
 	
 	wxVtk3DBaseView*	baseView;
 	wxVtkMPR3DView*		mwxvtkmpr3Dview;
 	vtkMPR3DDataViewer* vtkmpr3Ddataviewer;
-	wxPanel*			controlPanelMPR3D;
 
 	bool first;
 	int _id;
 
-	//CutModel2MainPanel* cutter;
 	wxMaracasRenderImageManagementPanel*	dialog;
-	wxMaracasMultipleVolumeRendererManager* volmanager;
+        VolumeRendererManager* volmanager;
 	wxMaracasSurfaceRenderingManager*		surrendmanager1;
 	wxMaracasSurfaceRenderingManager*		surrendmanager2;
 	wxMaracasSurfaceRenderingManager*		surrendmanager3;
+
+	DECLARE_EVENT_TABLE( );
 };
 
 #endif /*wxMaracasMultipleVolumeRendererPanel_H_*/