X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FwxMaracasMPR.cxx;h=a5cc4e6800a0b67e9d5baa45b8c36e67a74100c4;hb=db0efc14374a0b55772378c9d9b442f2d3443e50;hp=2fd86e88df517a8bc03366bf21076e7c074958a4;hpb=e6b030ceb3ee4eea1f012e7d5c47503cf6322c61;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.cxx b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.cxx
index 2fd86e8..a5cc4e6 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/wxMaracasMPR.cxx
@@ -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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: wxMaracasMPR.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/03/24 10:49:18 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/15 14:16:51 $
+  Version:   $Revision: 1.5 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -52,8 +77,14 @@ vtkPlane2DView *wxMaracasMPR::GetVtkPlane2DView()
 	return _MPR->GetVtkPlane2DView();
 }
 //----------------------------------------------------------------------------
-wxVtkMPR3DView  *wxMaracasMPR::GetWxvtkmpr3Dview_BB()
+wxVtkMPR3DView  *wxMaracasMPR::GetWxvtkmpr3Dview_BB() throw(char*)
 { 
+	if(_MPR == NULL){ 
+        throw "wxVtkMPR3DView  *wxMaracasMPR::GetWxvtkmpr3Dview_BB() _MPR =NULL";
+	}
+	if(_MPR->GetWxvtkmpr3Dview_BB() ==NULL){
+		throw "wxVtkMPR3DView  *wxMaracasMPR::GetWxvtkmpr3Dview_BB() _MPR->GetWxvtkmpr3Dview_BB()=NULL";
+	}
 	return _MPR->GetWxvtkmpr3Dview_BB();
 }
 
@@ -63,8 +94,8 @@ void wxMaracasMPR::RefreshView()
 	_MPR->RefreshView();
 }
 
-void wxMaracasMPR::setMarImage(marImageData *marimageData, double voxelsize){
-	_MPR->setMarImage(marimageData, voxelsize);
+void wxMaracasMPR::setImageData(vtkImageData *img, double voxelsize){
+	_MPR->setImageData(img, voxelsize);
 
 }