X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FcreaVtkBasicSlicer.cxx;h=9a9611653f1857d8ca3cb6d08ef22fbb57a4c35c;hb=76d191e5d56c8400923b603792aa7032612e07b5;hp=65b2925d9143d100b324d7fc5f33a6ea90d08384;hpb=dd693592c4b6d6810eca299760c302812f7c4553;p=crea.git diff --git a/src/creaVtkBasicSlicer.cxx b/src/creaVtkBasicSlicer.cxx index 65b2925..9a96116 100644 --- a/src/creaVtkBasicSlicer.cxx +++ b/src/creaVtkBasicSlicer.cxx @@ -1,3 +1,30 @@ +/* +# --------------------------------------------------------------------- +# +# 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. +# ------------------------------------------------------------------------ +*/ + #ifdef USE_VTK #include @@ -35,7 +62,14 @@ namespace crea // An outline is shown for context. vtkOutlineFilter* outline = vtkOutlineFilter::New(); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) outline->SetInput(I); +#endif +#if (VTK_MAJOR_VERSION >= 6) + outline->SetInputData(I); +#endif vtkPolyDataMapper* outlineMapper = vtkPolyDataMapper::New(); outlineMapper->SetInputConnection(outline->GetOutputPort()); @@ -52,7 +86,15 @@ namespace crea // The 3 image plane widgets are used to probe the dataset. vtkImagePlaneWidget* planeWidgetX = vtkImagePlaneWidget::New(); planeWidgetX->DisplayTextOn(); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) planeWidgetX->SetInput(I); +#endif +#if (VTK_MAJOR_VERSION >= 6) + planeWidgetX->SetInputData(I); +#endif + planeWidgetX->SetPlaneOrientationToXAxes(); planeWidgetX->SetSlicePosition((xMax+xMin)/2.); planeWidgetX->SetPicker(picker); @@ -62,7 +104,15 @@ namespace crea vtkImagePlaneWidget* planeWidgetY = vtkImagePlaneWidget::New(); planeWidgetY->DisplayTextOn(); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) planeWidgetY->SetInput(I); +#endif +#if (VTK_MAJOR_VERSION >= 6) + planeWidgetY->SetInputData(I); +#endif + planeWidgetY->SetPlaneOrientationToYAxes(); planeWidgetY->SetSlicePosition((yMax+yMin)/2.); planeWidgetY->SetPicker(picker); @@ -76,7 +126,16 @@ namespace crea // cross-hair cursor snapping to pixel centers vtkImagePlaneWidget* planeWidgetZ = vtkImagePlaneWidget::New(); planeWidgetZ->DisplayTextOn(); + +//EED 2017-01-01 Migration VTK7 +#if (VTK_MAJOR_VERSION <= 5) planeWidgetZ->SetInput(I); +#endif +#if (VTK_MAJOR_VERSION >= 6) + planeWidgetZ->SetInputData(I); +#endif + + planeWidgetZ->SetPlaneOrientationToZAxes(); planeWidgetZ->SetSlicePosition((zMax+zMin)/2.); planeWidgetZ->SetPicker(picker);