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=17c633a2d85df361d7174369edb3541c1f352e3f;hpb=e4ef2b5df5aac431ff3b806f83b7dd5e55e89d86;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
index 17c633a..05e92d8 100644
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelManager.cxx
@@ -84,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
@@ -98,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);
 	}
@@ -401,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);