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=e263b7ace0f53d647a731553a3f67700838ad146;hp=2947bdc03f6586de3c99d7f84d4e5ec81bb47340;hpb=4645482ed1eae5aaabdd813b784acafd13c41179;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index 2947bdc..da3d19b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -394,10 +394,13 @@ void ContourExtractData::PutVtkImageDataResultValue( int x, int y, int z, double
 {
 	unsigned short *pValue;
 	unsigned short *pMask;
-	pValue	= (unsigned short *)imagedataValueResult->GetScalarPointer(x,y,z);
-	pMask	= (unsigned short *)imagedataMaskResult->GetScalarPointer(x,y,z);
-	*pMask	= 255;
-	*pValue = (unsigned short)value;
+//EED 2017-12-18
+	imagedataValueResult->SetScalarComponentFromDouble(x,y,z,0,value);
+	imagedataMaskResult->SetScalarComponentFromDouble(x,y,z,0,255);
+//	pValue	= (unsigned short *)imagedataValueResult->GetScalarPointer(x,y,z);
+//	*pValue = (unsigned short)value;
+//	pMask	= (unsigned char *)imagedataMaskResult->GetScalarPointer(x,y,z);
+//	*pMask	= 255;
 }
 
 //------------------------------------------------------------------------
@@ -414,8 +417,8 @@ void ContourExtractData::ResetImageResult(int z)
 		imagedataValueResult->GetExtent(ext);
 
 		int size = (ext[1]-ext[0]+1) * (ext[3]-ext[2]+1); 
-		memset(pValue,0,size*2);
-		memset(pMask,0,size*2);
+		memset(pValue,0, size*imagedataValueResult->GetScalarSize() );
+		memset(pMask,0, size*imagedataMaskResult->GetScalarSize() );
 	} // if
 }
 
@@ -572,16 +575,18 @@ void ContourExtractData::InitVtkImagesResult()
 		imagedataValueResult->Delete();
 	}
 	imagedataValueResult = vtkImageData::New();
-	//	  imagedataValueResult->SetScalarType(scalartype);
 	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
 
 
@@ -590,16 +595,19 @@ void ContourExtractData::InitVtkImagesResult()
 		imagedataMaskResult->Delete();
 	}
 	imagedataMaskResult  = vtkImageData::New();
-	//	  imagedataMaskResult->SetScalarType(scalartype);
+
+
 	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
 
 }