X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FpPlotter%2FpPlotterLayer.h;h=1e6ef4d645011bbd6467fc1915f34e3970d6f697;hb=d6fb1d5d3e478c70b90f5a4e27874e1478905195;hp=f43b0fc014d0759fece45950d2745f8aa4732ba6;hpb=c5feadbb145eecf6d73f793535b7e23eb18db2cb;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter/pPlotterLayer.h
index f43b0fc..1e6ef4d 100644
--- 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__
@@ -30,7 +55,7 @@
 //----------------------------------------------------------------------------
 // Class definition
 //----------------------------------------------------------------------------
-class pPlotterLayer: public mpLayer 
+class creaMaracasVisu_EXPORT pPlotterLayer: public mpLayer 
 {
 
 public:
@@ -47,27 +72,27 @@ public:
 	Draw the line from (x1,y1) to (x2,y2) only passing by the 
 	positive points in the line
 	*/
-void draw(wxDC & dc,mpWindow & w,double x1,double y1,double x2,double y2);
+void draw(wxDC & dc,mpWindow & w,double x1,double y1,double x2,double y2, int orgy);
 	
 	/**
 	* Draw the function with th spline points
 	*
 	*/
-	void drawSplineCurve(wxDC & dc,mpWindow & w);
+	void drawSplineCurve(wxDC & dc,mpWindow & w, int orgy);
 	
 	/**
 	* Draw the line between the last point of the function
 	* and the position of the mouse
 	*/
-	void drawLineToMousePoint(wxDC & dc,mpWindow & w);
+	void drawLineToMousePoint(wxDC & dc,mpWindow & w, int orgy);
 	/**
 	* Draw le lines between the points of the function
 	*/
-	void drawFunction(wxDC & dc,mpWindow & w);
+	void drawFunction(wxDC & dc,mpWindow & w, int orgy);
 	/**
 	*  Draw the points of the function
 	*/
-	void drawPoints(wxDC & dc,mpWindow & w);
+	void drawPoints(wxDC & dc,mpWindow & w, int orgy );
 	
 	/**
 	 Get the value of the traslation
@@ -188,11 +213,21 @@ void draw(wxDC & dc,mpWindow & w,double x1,double y1,double x2,double y2);
 	*/
 	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);
 
 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
 	*/