X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpLogicalFunction.h;h=6c5bac405aa7d17427755129a2d235b6463bc8d4;hb=f9901e756bb82bd333310b47607875331616bb29;hp=216cb92d2516a27161889c32e29659dc747a913d;hpb=206564e24c5c40e1f8830bfd17ebb4cc99175ec2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h
index 216cb92..6c5bac4 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pLogicalFunction.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 __pLogicalFunction_h__
 #define __pLogicalFunction_h__
@@ -76,6 +101,9 @@ public:
 	}
 	*/
 
+
+//EED 2017-09-16 Migration wxWidgets 2.8 to 3.0
+#if wxMAJOR_VERSION <= 2
 	/**
 	Get Point list of the funcion
 	@param return points
@@ -85,6 +113,19 @@ public:
 	{
 		points = realPoints;
 	}  
+#else
+	/**
+	Get Point list of the funcion
+	@param return pointsPtr
+	*/
+	/*virtual*/
+	wxList* GetPointsPtr()
+	{
+		return &realPoints;
+	}  
+#endif
+
+
 	/*
 	* validate if the function has that point in a sensible area returning the index where the point was found or -1 if is in not part of the function: define the sensible area is  
 	* x1-validPointRange<x<x1+validPointRange y1-validPointRange<y<y1+validPointRange