X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Fkernel%2FCutModelData.cxx;h=ccd36989a479e62849484c255e0a17ff5b793999;hb=e263b7ace0f53d647a731553a3f67700838ad146;hp=546e416cd15547c95f1a67fd552615074fba483b;hpb=44f56c175ed253a0c2600ec683f368627c4da4ee;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx
index 546e416..ccd3698 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelData.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: CutModelData.cxx,v $
   Language:  C++
-  Date:      $Date: 2011/02/07 10:30:05 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2012/11/15 14:15:48 $
+  Version:   $Revision: 1.10 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -143,12 +168,29 @@ void CutModelData::ShowViewBox(bool check)throw( CutModelException){
 void CutModelData::ChangeShape(int selection)throw( CutModelException){
 	checkInvariant();
 	
-	if(selection == 0){
+	if(selection == 0)
+	{
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_Mapper->SetInput(_spherefigure->getPolyData());
+#else
+		_Mapper->SetInputData(_spherefigure->getPolyData());
+#endif
 	}else if(selection == 1){
+
+#if VTK_MAJOR_VERSION <= 5
 		_Mapper->SetInput(_cylinderfigure->getPolyData());
+#else
+		_Mapper->SetInputData(_cylinderfigure->getPolyData());
+#endif
+
 	}else if(selection == 2){
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_Mapper->SetInput(_cubefigure->getPolyData());
+#else
+		_Mapper->SetInputData(_cubefigure->getPolyData());
+#endif
 	}else{
 		throw CutModelException("Shape type not found");
 	}