X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Finterface%2FvtkInteractorStyleCutter.cxx;h=b118ce09a032292da29a0b5023e5a51f9313df1a;hb=56eb704bce4e7a4206ffa16c84f3000b8b8f93eb;hp=c138a13864d8a5529746a5edcd35e038ccca254f;hpb=fd5ad1cd9ee1d6073a5e247b9a4e85871a8a3f38;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.cxx b/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.cxx
index c138a13..b118ce0 100644
--- a/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.cxx
+++ b/lib/maracasVisuLib/src/CutModule/interface/vtkInteractorStyleCutter.cxx
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   Visualization Toolkit
   Module:    $RCSfile: vtkInteractorStyleCutter.cxx,v $
   Language:  C++
-  Date:      $Date: 2010/02/24 14:00:46 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2012/11/15 14:16:20 $
+  Version:   $Revision: 1.2 $
 
   Copyright (c) 1993-2002 Ken Martin, Will Schroeder, Bill Lorensen 
   All rights reserved.
@@ -28,7 +53,12 @@
 #include <vtkProperty2D.h>
 #include <vtkCamera.h>
 
-vtkCxxRevisionMacro(vtkInteractorStyleCutter, "$Revision: 1.1 $");
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+vtkCxxRevisionMacro(vtkInteractorStyleCutter, "$Revision: 1.2 $");
+#else
+// ..
+#endif
 vtkStandardNewMacro(vtkInteractorStyleCutter);
 
 //----------------------------------------------------------------------------
@@ -47,7 +77,12 @@ vtkInteractorStyleCutter::vtkInteractorStyleCutter()
   pd->SetLines( Lines );
    
   vtkPolyDataMapper2D *bboxMapper = vtkPolyDataMapper2D::New();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
   bboxMapper->SetInput( pd );
+#else
+  bboxMapper->SetInputData( pd );
+#endif
    
   this->BboxActor = vtkActor2D::New();
   this->BboxActor->SetMapper( bboxMapper );