X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Fkernel%2FCutModelSaveBinInfo.cxx;h=06c9eeafdb0b1386c2d41451f2d3d6b90260507f;hb=f9901e756bb82bd333310b47607875331616bb29;hp=51a514b6a8c39dea122ded92c7ad6dfe038cd2bf;hpb=062ae799e283a7de038b13d78eaf7d8495086378;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelSaveBinInfo.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelSaveBinInfo.cxx
index 51a514b..06c9eea 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelSaveBinInfo.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelSaveBinInfo.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: CutModelSaveBinInfo.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/10/16 15:17:56 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/15 14:15:48 $
+  Version:   $Revision: 1.3 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -42,7 +67,14 @@ CutModelSaveBinInfo::~CutModelSaveBinInfo(){
 void CutModelSaveBinInfo::savePolyData(vtkPolyData* polydata){
 	vtkPolyDataWriter * writer = vtkPolyDataWriter ::New();
 	writer->SetFileName(_stdFilename.c_str());	
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	writer->SetInput(polydata);
+#else
+	writer->SetInputData(polydata);
+#endif
+
 	writer->SetFileTypeToBinary();
 	writer->Write();
 	writer->Delete();
@@ -55,7 +87,12 @@ vtkTransform* CutModelSaveBinInfo::getPolyDataTransform()throw( CutModelExceptio
 	vtkPolyData* poly = reader->GetOutput();
 
 	vtkPolyDataMapper* mapper	= vtkPolyDataMapper::New();	
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	mapper->SetInput(poly);
+#else
+	mapper->SetInputData(poly);
+#endif
 	vtkActor* actor	= vtkActor::New();
 	actor->SetMapper(mapper);
 	vtkMatrix4x4* actmatrix = actor->GetMatrix();