X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasRenderTabbedPanel.cpp;h=69538a803325c1ed55e479c7fcbc3ad52d1bedb6;hb=b90d2dce776b27c95bd59251ee83d10a42b0cae5;hp=fd6463b8b8b17a90615aac22737a93ad95912d55;hpb=29ac45e15af78e7565693465053770e00e7b1a0d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index fd6463b..69538a8 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 #include "wxMaracasRenderTabbedPanel.h"
 
 #include "HistogramDialogComboBox.h"
 #include "wxMaracasMultipleVolumeRendererPanel.h"
 #include "wxMaracasSurfaceRenderingPanel.h"
 #include "wxMaracasSurfaceRenderingProp3DMHD.h"
-#include "wxMaracasMultipleVolumeRendererManagerData.h"
+#include "volumerenderermanagerdata.h"
 #include "wxMaracasDialog_NViewers.h"
 #include "wxVtkMPR3DViewCntrlPanel.h"
 
@@ -33,7 +58,7 @@ wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id,
 	baseView = _baseView;
 	dialog = NULL;
 
-	volmanager =      new wxMaracasMultipleVolumeRendererManager();
+        volmanager =      new VolumeRendererManager();
 	surrendmanager1 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager2 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager3 = new wxMaracasSurfaceRenderingManager();
@@ -347,7 +372,8 @@ void wxMaracasRenderTabbedPanel::addMPROptions()
 	{ 
 		mwxvtkmpr3Dview		->SetVtkMPR3DDataViewer(vtkmpr3Ddataviewer);		
 		mwxvtkmpr3Dview		->Configure();
-		mwxvtkmpr3Dview		->ResetCamera(ext,org,spc);
+//EED 27/05/2013
+		mwxvtkmpr3Dview		->GetWxvtk3Dbaseview()->ResetCamera(ext	,spc);
 		vtkInteractorStyleBaseView* vtkInteractorBV = (vtkInteractorStyleBaseView*)mwxvtkmpr3Dview->GetWxvtk3Dbaseview()->GetInteractorStyleBaseView();
 		vtkInteractorBV->AddParentToReport(this);
 	}