X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FContourCrownWidget.cxx;h=010ec0c533cb3ca0b73357c5e14b7ed894ab3a2d;hb=56eb704bce4e7a4206ffa16c84f3000b8b8f93eb;hp=d28a6b27c766a2685b0cc229b7d58b535927133c;hpb=35a5d83be3d84f9d1544b8d3ad0de044f1e65286;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx
index d28a6b2..010ec0c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/ContourCrownWidget.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 "ContourCrownWidget.h"
 
@@ -98,11 +122,22 @@ void wxMaracasCoutourTool::Init(wxVtkBaseView *wxvtkbaseview, vtkImageData* imag
 	table->SetRampToLinear();
 	table->Build();
 	
-	vtkImageMapToColors  *mapperImage = vtkImageMapToColors::New();
+	vtkImageMapToColors  *mapperImage 	= vtkImageMapToColors::New();
+	vtkImageActor *actorImage			= vtkImageActor::New();
+
 	mapperImage->SetLookupTable(table);
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 	mapperImage->SetInput( imagedataMaskResult );
-	vtkImageActor *actorImage	= vtkImageActor::New();
 	actorImage->SetInput( mapperImage->GetOutput() );
+#else
+	mapperImage->SetInputData( imagedataMaskResult );
+	actorImage->SetInputData( mapperImage->GetOutput() );
+#endif
+
+
 	actorImage->SetOpacity(1);
 	
 	wxvtkbaseview->GetRenderer()->AddActor(actorImage);	
@@ -464,17 +499,31 @@ void wxMaracasCoutourTool::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
+
 
 	  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
+
 
   }