X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourExtractData.cxx;h=2947bdc03f6586de3c99d7f84d4e5ec81bb47340;hb=56eb704bce4e7a4206ffa16c84f3000b8b8f93eb;hp=422e0936245b08adacef5bd27b43c383966084d0;hpb=581e566e84a6829d8494e117728d195b0f078db1;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourExtractData.cxx
index 422e093..2947bdc 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  
@@ -104,8 +135,6 @@ int ContourExtractData::AnalisisContourInsideV2(int x, int y, int iContour )
 	int result	= 0;
 	int i;
 
-	//cout<<"RaC ContourExtractData::AnalisisContourInsideV2-iContour:"<<iContour<<" y:"<<y<<endl; 
-
 	int nps=_lstlstlstVecX1[iContour][y].size();
 
 	double x1,y1,x2,y2;
@@ -438,8 +467,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
 
 }
@@ -537,10 +573,17 @@ void ContourExtractData::InitVtkImagesResult()
 	}
 	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
+	imagedataValueResult->SetScalarTypeToUnsignedShort();
 	imagedataValueResult->AllocateScalars();
+#else
+	imagedataValueResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+#endif
+
 
 	if (imagedataMaskResult!=NULL)
 	{
@@ -548,10 +591,17 @@ void ContourExtractData::InitVtkImagesResult()
 	}
 	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
+	imagedataMaskResult->SetScalarTypeToUnsignedShort();
 	imagedataMaskResult->AllocateScalars();
+#else
+	imagedataMaskResult->AllocateScalars(VTK_UNSIGNED_SHORT,1);
+#endif
+
 }