X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Fkernel%2FCutModelManager.cxx;h=05e92d879559024a916ed787b3334c773ca60227;hb=f9901e756bb82bd333310b47607875331616bb29;hp=53139eafc0baceee6ec4e91af4793c48021c0900;hpb=badc6cea49d018dec82191a977fc082299a1da35;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
index 53139ea..05e92d8 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.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: CutModelManager.cxx,v $
 Language:  C++
-Date:      $Date: 2010/09/29 21:21:05 $
-Version:   $Revision: 1.10 $
+Date:      $Date: 2012/11/15 14:15:48 $
+Version:   $Revision: 1.11 $
 
 Copyright: (c) 2002, 2003
 License:
@@ -59,8 +84,12 @@ void CutModelManager::setImageData(vtkImageData* img){
 		_img2 = vtkImageData::New();
 		_img2->SetExtent(_img->GetExtent());
 		_img2->SetSpacing(_img->GetSpacing());
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_img2->AllocateScalars();
-
+#else
+  //...
+#endif
 		_img2->DeepCopy(_img);
 	}
 	else
@@ -73,7 +102,12 @@ void CutModelManager::setImageData(vtkImageData* img){
 		_img = vtkImageData::New();
 		_img->SetExtent(_img2->GetExtent());
 		_img->SetSpacing(_img2->GetSpacing());
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_img->AllocateScalars();
+#else
+  //...
+#endif
 
 		_img->DeepCopy(_img2);
 	}
@@ -376,13 +410,23 @@ void CutModelManager::UpdatePolygon(bool mode)
 			sample->CappingOn();			
 
 			contour = vtkContourFilter::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			contour->SetInput((vtkDataObject *)sample->GetOutput());
+#else
+			contour->SetInputData((vtkDataObject *)sample->GetOutput());
+#endif
 			contour->SetValue(0,1);
 
 			actor = contour->GetOutput();
 
 			actor3D = vtkActor::New();			
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			mapper->SetInput(actor);			 
+#else
+			mapper->SetInputData(actor);			 
+#endif
 			mapper->SetScalarModeToUseCellData();
 			actor3D->SetMapper( mapper);
 			_render->AddActor(actor3D);