#3418 creaMaracasVisu Feature New Normal - ManualPaint_model with openmp

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
index 5e4c844f1324b6e8c54dec690b03d5c370f3b03e..227df55d84157c3888ed06e13d2e0c7d7fe64f1f 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.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 __pGraphicalFunction_h__
@@ -116,8 +141,8 @@ public:
 
        virtual void getOffsets(int &offsetX,int &offSetY )
        {
-               offsetX=_offsetX;
-               offsetY=_offsetY;
+               offsetX=(int)_offsetX;
+               offsetY=(int)_offsetY;
        }
        
        /*
@@ -245,6 +270,11 @@ public:
                }
                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
@@ -254,16 +284,27 @@ public:
                logicFunction->GetPoints(points);
                //points = realPoints;
        }  
+#else
+       /**
+       Get Point list of the funcion
+       @param return pointsPtr
+       */
+       virtual wxList* GetPointsPtr()
+       {
+               return logicFunction->GetPointsPtr();
+       }  
+#endif
+
+
 
        /**
        Get the point where the user
        made a click
        */
-
        virtual void getMousePoint(int &x,int &y)
        {
-               x=mousePoint.x;
-               y=mousePoint.y;
+               x = mousePoint.x;
+               y = mousePoint.y;
        }
 
        /**