X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourExtractData.cxx;h=da3d19b816e7aab56e211799800c3660d91ba27c;hb=e263b7ace0f53d647a731553a3f67700838ad146;hp=801078958158d57a1b217ec054d5fc78c39355d3;hpb=25e3adf442d6a8d357d52410267445c54426c525;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index 8010789..da3d19b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -575,24 +575,18 @@ 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 );
 
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
-	imagedataValueResult->SetScalarTypeToUnsignedShort();
+
+//EED 2017-12-18
+	imagedataValueResult->SetScalarType(scalartype);
+	//imagedataValueResult->SetScalarTypeToUnsignedShort();
 	imagedataValueResult->AllocateScalars();
 #else
-	imagedataValueResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+	imagedataValueResult->AllocateScalars(scalartype,1);
 #endif
 
 
@@ -601,25 +595,19 @@ 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 );
 
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
-	imagedataMaskResult->SetScalarTypeToUnsignedShort();
+    //EED 2017-12-18
+    //imagedataMaskResult->SetScalarTypeToUnsignedShort();
+	imagedataMaskResult->SetScalarTypeToUnsignedChar();
 	imagedataMaskResult->AllocateScalars();
 #else
-	imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+	imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_CHAR,1);
 #endif
 
 }