#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

[creaMaracasVisu.git] / lib / maracasVisuLib / src / CutModule / kernel / CutModelPolygon.cxx

diff --git a/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx b/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx
index 1d5691b8bc937e7fac15bb42d3344a591aef7197..1f7482fc50dab29386a3bfd147df03cba095f487 100644 (file)
--- a/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx
+++ b/lib/maracasVisuLib/src/CutModule/kernel/CutModelPolygon.cxx
@@ -1,6 +1,29 @@
-
-
-#include "CutModelPolygon.H"
+/*# ---------------------------------------------------------------------
+#
+# 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 "CutModelPolygon.h"
 
 
 CutModelPolygon::CutModelPolygon() 
@@ -92,7 +115,12 @@ void CutModelPolygon::cutInputImage(std::vector<double> vectorOutX,std::vector<d
        initializeOutputImage();
 
        int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _inImage->GetWholeExtent(ext);
+#else
+       _inImage->GetExtent(ext);
+#endif
        int dimX=ext[1]-ext[0]+1;
        int dimY=ext[3]-ext[2]+1;
        int dimZ=ext[5]-ext[4]+1;
@@ -160,7 +188,12 @@ void CutModelPolygon::cutInputImage(std::vector<double> vectorOutX,std::vector<d
        }// for i
 
        _inImage->Modified();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        _inImage->Update();
+#else
+       // ..
+#endif
 
 }
 
@@ -357,4 +390,4 @@ void CutModelPolygon::setPoints(vtkPoints *pPoints)
 void CutModelPolygon::setDirection(double *pDirection)
 {
        _direction=pDirection;
-}
\ No newline at end of file
+}