X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpGraphicalFunction.h;h=227df55d84157c3888ed06e13d2e0c7d7fe64f1f;hb=25e3adf442d6a8d357d52410267445c54426c525;hp=a95a25cfdbf1941b1a4510b7a84a0f08c351ac96;hpb=8e7ab74a199d1f05b01dccfb75da7f2c4754ddc5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pGraphicalFunction.h
index a95a25c..227df55 100644
--- 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__
@@ -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;
 	}
 
 	/**