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=fb56e3542582aae7ce16770804c633dbf41300a0;hp=dead6db868955deba9bd041ea289ae60ec4e45f4;hpb=c016f2efd20188d031f0bc29c5a2bb1aab959adf;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index dead6db..da3d19b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
@@ -1,3 +1,27 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
 
 #include "ContourExtractData.h"
 
@@ -27,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  
@@ -363,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;
 }
 
 //------------------------------------------------------------------------
@@ -383,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
 }
 
@@ -436,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
 
 }
@@ -534,22 +575,41 @@ void ContourExtractData::InitVtkImagesResult()
 		imagedataValueResult->Delete();
 	}
 	imagedataValueResult = vtkImageData::New();
-	//	  imagedataValueResult->SetScalarType(scalartype);
-	imagedataValueResult->SetScalarTypeToUnsignedShort();
 	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->AllocateScalars();
+#else
+	imagedataValueResult->AllocateScalars(scalartype,1);
+#endif
+
 
 	if (imagedataMaskResult!=NULL)
 	{
 		imagedataMaskResult->Delete();
 	}
 	imagedataMaskResult  = vtkImageData::New();
-	//	  imagedataMaskResult->SetScalarType(scalartype);
-	imagedataMaskResult->SetScalarTypeToUnsignedShort();
+
+
 	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
+
 }