X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourExtractData.cxx;h=da3d19b816e7aab56e211799800c3660d91ba27c;hb=201c9ad0b300530ef664356626a529aa4d73863c;hp=c08f5d977fa6307339d3bcfb6c9b189681d9a98d;hpb=dea0efc567d8332b2e7eb936e3ba4ac1c11b2542;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index c08f5d9..da3d19b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -51,7 +51,14 @@ void ContourExtractData::SetImage( vtkImageData* imagedata)
 
 	// RaC 20-11-09 Changes in InitLstContoursLinesYPoints
 	int ext[6];
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	this->imagedata->GetWholeExtent(ext);
+#else
+	this->imagedata->GetExtent(ext);
+#endif
+
 	_sizeImageY = ext[3]-ext[2]+1;
 
 	// init vtk image result : valuesImage maskImage  
@@ -463,8 +470,15 @@ void ContourExtractData::CalculateImageResult()
 
 		imagedataValueResult->Modified();
 		imagedataMaskResult->Modified();
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		imagedataValueResult->Update();
 		imagedataMaskResult->Update();
+#else
+  //...
+#endif
+
 	} // if
 
 }
@@ -561,14 +575,20 @@ void ContourExtractData::InitVtkImagesResult()
 		imagedataValueResult->Delete();
 	}
 	imagedataValueResult = vtkImageData::New();
+	imagedataValueResult->SetSpacing(spc);
+	imagedataValueResult->SetDimensions( newDim );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 
 //EED 2017-12-18
 	imagedataValueResult->SetScalarType(scalartype);
 	//imagedataValueResult->SetScalarTypeToUnsignedShort();
-
-	imagedataValueResult->SetSpacing(spc);
-	imagedataValueResult->SetDimensions( newDim );
 	imagedataValueResult->AllocateScalars();
+#else
+	imagedataValueResult->AllocateScalars(scalartype,1);
+#endif
+
 
 	if (imagedataMaskResult!=NULL)
 	{
@@ -576,14 +596,20 @@ void ContourExtractData::InitVtkImagesResult()
 	}
 	imagedataMaskResult  = vtkImageData::New();
 
-//EED 2017-12-18
-//	imagedataMaskResult->SetScalarType(scalartype);
-//	imagedataMaskResult->SetScalarTypeToUnsignedShort();
-	imagedataMaskResult->SetScalarTypeToUnsignedChar();
 
 	imagedataMaskResult->SetSpacing(spc);
 	imagedataMaskResult->SetDimensions( newDim );
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+    //EED 2017-12-18
+    //imagedataMaskResult->SetScalarTypeToUnsignedShort();
+	imagedataMaskResult->SetScalarTypeToUnsignedChar();
 	imagedataMaskResult->AllocateScalars();
+#else
+	imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_CHAR,1);
+#endif
+
 }