X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FcutImageSegmentation.cpp;h=f898f85d7bee3c7138ca20b8813f0065f2823a67;hb=71174bb44a65806fe33fe736faba98d8bf8d89e5;hp=45c2e3d55e4a261d55ac5f78fdcf5d666b48c84f;hpb=db50a79c8da0c3a8856882e948f714c2321ee97a;p=creaVtk.git

diff --git a/lib/creaVtk/cutImageSegmentation.cpp b/lib/creaVtk/cutImageSegmentation.cpp
index 45c2e3d..f898f85 100644
--- a/lib/creaVtk/cutImageSegmentation.cpp
+++ b/lib/creaVtk/cutImageSegmentation.cpp
@@ -51,11 +51,6 @@ cutImageSegmentation::GetResultImage()
 	return m_ResultImage;
 }
 
-void cutImageSegmentation::InitValues()
-{
-
-	
-}
 
 void cutImageSegmentation::Process()
 {
@@ -191,21 +186,37 @@ void cutImageSegmentation::Process()
 		m_Image->SetOrigin(origin);
 
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		extrude->SetInput(m_Mesh1);
+#else
+		extrude->SetInputData(m_Mesh1);
+#endif
 		extrude->SetScaleFactor(1);
 		extrude->SetExtrusionTypeToNormalExtrusion();
 		extrude->SetVector(0,0,1);
 		extrude->Update();
 
 		dataToStencil->SetTolerance(0);
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		dataToStencil->SetInput(extrude->GetOutput());
+#else
+		dataToStencil->SetInputData(extrude->GetOutput());
+#endif
 		dataToStencil->SetOutputOrigin(origin);
 		dataToStencil->SetOutputSpacing(spacing);
 		dataToStencil->SetOutputWholeExtent(m_Image->GetExtent());
 		dataToStencil->Update();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		imageStencil->SetInput(m_Image);
 		imageStencil->SetStencil(dataToStencil->GetOutput());
+#else
+		imageStencil->SetInputData(m_Image);
+		imageStencil->SetStencilData(dataToStencil->GetOutput());
+#endif
 		imageStencil->ReverseStencilOff();
 		imageStencil->SetBackgroundValue(-200);
 		imageStencil->Update();
@@ -216,7 +227,7 @@ void cutImageSegmentation::Process()
 	}//i m_Mesh1 != Null
 	else{
 
-		std::cout << "MLER cutImageSegmentation :: NO HAY MESH" << std::endl;
+		std::cout << "MLER cutImageSegmentation :: MESH NOT EXIST" << std::endl;
 
 	}//else if m_Mesh1