#3347 creaMaracasVisu Bug New Normal - ViewerMPR2D Reset back position when set...

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / pPlotter / pPlotterLayer.h

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h
index 5ef2f599dba924959942b5aba7ba3f61b0604d1c..1e6ef4d645011bbd6467fc1915f34e3970d6f697 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 
 #ifndef __pPlotterLayer_h__
 #define __pPlotterLayer_h__
@@ -188,11 +213,21 @@ void draw(wxDC & dc,mpWindow & w,double x1,double y1,double x2,double y2, int or
        */
        virtual bool GetNextXY(double & x, double & y){return false;}
 
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        /**
        Get Point list of the funcion
        @param return points
        */
        virtual void GetPoints(wxList &points){}
+#else
+       /**
+       Get Point list of the funcion
+       @param return points
+       */
+       virtual wxList* GetPointsPtr(){  }
+#endif
+
 
        /** Layer plot handler.
        This implementation will plot the locus in the visible area and
@@ -225,10 +260,17 @@ void draw(wxDC & dc,mpWindow & w,double x1,double y1,double x2,double y2, int or
 
 protected:
        int m_flags; //!< Holds label alignment
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
        /*
        * Points of the function thats is drawing
        */
        wxList points;
+#else
+       //  use GetPointsPtr()
+#endif
+
        /*
        * the scale in x, with wich it must draw
        */