From 3b7216a90b1b7635cedbab47cab07c59fd82dfcb Mon Sep 17 00:00:00 2001
From: koldo <koldo@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Fri, 10 Feb 2017 22:23:12 +0000
Subject: [PATCH] ScatterDraw: Interface updated

git-svn-id: svn://ultimatepp.org/upp/trunk@10841 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ScatterDraw/ScatterDraw.h | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/uppsrc/ScatterDraw/ScatterDraw.h b/uppsrc/ScatterDraw/ScatterDraw.h
index ce8b12e9b..9ad82be25 100644
--- a/uppsrc/ScatterDraw/ScatterDraw.h
+++ b/uppsrc/ScatterDraw/ScatterDraw.h
@@ -496,23 +496,14 @@ public:
 	ScatterDraw& LinkedWith(ScatterDraw& ctrl);
 	void Unlinked();
 	
-	int GetPlotWidth()	{return plotW;}
-	int GetPlotHeight()	{return plotH;}
-	Pointf GetPosPrimary(double x, double y) {
-		Pointf ret;
-		ret.x = plotW*(x - xMin)/xRange;
-		ret.y = plotH - plotH*(y - yMin)/yRange;
-		return ret;
-	}
+	int GetPlotWidth()					{return plotW;}
+	int GetPlotHeight()					{return plotH;}
+	double GetPosX(double x)			{return plotW*(x - xMin)/xRange;}
 	double GetSizeX(double cx) 			{return plotW*cx/xRange;}
+	double GetPosYPrimary(double y)		{return plotH - plotH*(y - yMin)/yRange;}
 	double GetSizeYPrimary(double cy) 	{return plotH*cy/yRange;}		
-	Pointf GetPosSecondary(double x, double y) {
-		Pointf ret;
-		ret.x = plotW*(x - xMin)/xRange;
-		ret.y = plotH - plotH*(y - yMin2)/yRange2;
-		return ret;
-	}
-	double GetSizeYSecondary(double cy) 	{return plotH*cy/yRange2;}
+	double GetPosYSecondary(double y)	{return plotH - plotH*(y - yMin2)/yRange2;}
+	double GetSizeYSecondary(double cy) {return plotH*cy/yRange2;}
 	
 protected:
 	ScatterDraw &_AddSeries(DataSource *data);