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=4dcdcabb81ce9f9e9b7ccdb86a64995d7b18ea23;hp=bf11360898cafb2f3530104b9f7e9665bb8a2950;hpb=4af1766449a43e02dd007e1397f239f1581126c5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasRenderTabbedPanel.cpp
index bf11360..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"
 
@@ -16,6 +41,7 @@
 #include "Color.xpm"
 //#include "creaSystem.h"
 
+#include "creaWx.h"
 
 	BEGIN_EVENT_TABLE( wxMaracasRenderTabbedPanel, wxPanel )
 		EVT_MENU( 12121, wxMaracasRenderTabbedPanel::OnRefreshView )
@@ -26,13 +52,13 @@
 ** Class constructor
 **/
 wxMaracasRenderTabbedPanel::wxMaracasRenderTabbedPanel(wxWindow* parent, int id, wxVtk3DBaseView* _baseView)
-: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
+  : wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize)
 {
 	_id = id;
 	baseView = _baseView;
 	dialog = NULL;
 
-	volmanager = new wxMaracasMultipleVolumeRendererManager();
+        volmanager =      new VolumeRendererManager();
 	surrendmanager1 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager2 = new wxMaracasSurfaceRenderingManager();
 	surrendmanager3 = new wxMaracasSurfaceRenderingManager();
@@ -48,12 +74,12 @@ wxMaracasRenderTabbedPanel::~wxMaracasRenderTabbedPanel()
 	//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSB(_propid, false);
 	//wxMaracasRenderTabbedPanel::getInstance()->addRemoveActorSC(_propid, false);
 	addRemoveActorMPR(false);
-	if( vtkmpr3Ddataviewer	)	{ delete vtkmpr3Ddataviewer;	}
-	if( mwxvtkmpr3Dview		)	{ delete mwxvtkmpr3Dview;		}
+	if( vtkmpr3Ddataviewer	)   { delete vtkmpr3Ddataviewer; }
+	if( mwxvtkmpr3Dview	)   { delete mwxvtkmpr3Dview;    }
 
 	this->deleteVolume(_id);
 	delete dialog;
-	delete wxtabs;	
+	delete wxtabs;
 }
 
 /**
@@ -110,12 +136,12 @@ void wxMaracasRenderTabbedPanel::createControls(vtkImageData* inImg, std::string
 		//vtkImageData* img3 = surrendmanager3->getImageData(pathfile);
 		if(img!=NULL /*&& img1!=NULL && img2!=NULL && img3!=NULL*/)
 		{
-			addVolume(img, filename);
+			addVolume(img,   filename);
 			addSurface1(img, filename);
 			addSurface2(img, filename);
 			addSurface3(img, filename);	
 			addMPROptions();
-			volname = (wxString) filename;
+			volname = crea::std2wx(filename);
 			wxtabs->Refresh();
 		}
 	}	
@@ -346,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);
 	}
@@ -897,4 +924,4 @@ vtkImageData* wxMaracasRenderTabbedPanel::getSurfCImage()
 int wxMaracasRenderTabbedPanel::getPropIdV()
 {
 	return _id;
-}
\ No newline at end of file
+}