From 880196d957fb5ab0de224dac24f62af7afeabec0 Mon Sep 17 00:00:00 2001 From: Eduardo DAVILA Date: Tue, 7 Aug 2018 16:45:57 +0200 Subject: [PATCH] #3219 creaMaracasVisu Feature New Normal - vtk8itk4wx3-mingw64 --- .../interface/wxWindows/Contour/ContourExtractData.cxx | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx index 8010789..9dc9133 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx @@ -575,15 +575,12 @@ void ContourExtractData::InitVtkImagesResult() imagedataValueResult->Delete(); } imagedataValueResult = vtkImageData::New(); -<<<<<<< HEAD - // imagedataValueResult->SetScalarType(scalartype); -======= //EED 2017-12-18 imagedataValueResult->SetScalarType(scalartype); //imagedataValueResult->SetScalarTypeToUnsignedShort(); ->>>>>>> master + imagedataValueResult->SetSpacing(spc); imagedataValueResult->SetDimensions( newDim ); @@ -601,16 +598,12 @@ void ContourExtractData::InitVtkImagesResult() imagedataMaskResult->Delete(); } imagedataMaskResult = vtkImageData::New(); -<<<<<<< HEAD - // imagedataMaskResult->SetScalarType(scalartype); -======= //EED 2017-12-18 // imagedataMaskResult->SetScalarType(scalartype); // imagedataMaskResult->SetScalarTypeToUnsignedShort(); imagedataMaskResult->SetScalarTypeToUnsignedChar(); ->>>>>>> master imagedataMaskResult->SetSpacing(spc); imagedataMaskResult->SetDimensions( newDim ); -- 2.45.1