X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRendererView.h;h=818dd321f20c67a0855deb6c488a0da2890249ee;hb=8cb2e736dbd160649089afd44928db6d26febcca;hp=edd3309169d9ae4b659c7da52e0f102998bd89e8;hpb=8e51f74bc77447daf61b8e1caf7ab07ae235b578;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
index edd3309..818dd32 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRendererView.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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
@@ -15,13 +40,12 @@
 #include <iostream>
 #include "marTypes.h"
 #include "vtkProp3D.h"
+#include "wxVtkBaseView.h"
 
 #include "wxMaracasRendererView.h"
 #include "wxMaracasRenderTabbedPanel.h"
-#include "wxMaracasMultipleVolumeRendererManager.h"
+#include "volumerenderermanager.h"
 #include "wxMaracasSurfaceRenderingManager.h"
-//#include "wxMaracasMultipleVolumeRendererPanel.h"
-//#include "wxMaracasSurfaceRenderingProp3DMHD.h"
 
 class  creaMaracasVisu_EXPORT  wxMaracasRendererView : public wxPanel
 {
@@ -37,16 +61,12 @@ public:
 	wxMaracasRenderTabbedPanel* getTabbedPanel(int id) throw(char*);
 
 	void setRenderer(vtkRenderer*  renderer); /* throw(char*), */   // JPR
+	void setVtkBaseView(wxVtk3DBaseView* base);
 	void onLoadImageFile();
 	void addVolumes(vtkImageData* img, std::string pathfile, std::string filename);
 	void addPanels(wxMaracasRenderTabbedPanel* wxtabs, vtkImageData* img, std::string pathfile, std::string filename);
 
 	void deleteVolume(int volid);
-	void addRemoveActorVol(int id, bool remove);
-	void addRemoveSurf1Actor(int id, bool addremove);
-	void addRemoveSurf2Actor(int id, bool addremove);
-	void addRemoveSurf3Actor(int id, bool addremove);
-
 	std::vector<std::string> getFiles();
 
 private:
@@ -59,7 +79,10 @@ private:
 	wxToolBar * _toolb;
 
 	vtkRenderer*  _renderer;
+	wxVtk3DBaseView* baseView;
 	std::string _path;
+
+	int _idCount;
 };
 
 class ToolBarEventHandlerRenderer : public wxEvtHandler