From bb2b61421bed4f2129c5f5355458cb42d599957a Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Tue, 23 Jan 2018 13:22:05 +0300
Subject: [PATCH] OK In progress...

---
 src/Cursor.vala |  8 ++++----
 src/Series.vala | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Cursor.vala b/src/Cursor.vala
index 0143542..62ae52e 100644
--- a/src/Cursor.vala
+++ b/src/Cursor.vala
@@ -156,7 +156,7 @@ namespace CairoChart {
 						switch (style.orientation) {
 						case Orientation.VERTICAL:
 							Float128 y = 0;
-							if (Math.vcross(s.get_scr_point(points[i]), s.get_scr_point(points[i+1]), rel2scr_x(c.x),
+							if (Math.vcross(s.scr_pnt(points[i]), s.scr_pnt(points[i+1]), rel2scr_x(c.x),
 							                chart.plarea.y0, chart.plarea.y1, out y)) {
 								var point = Point128(s.axis_x.axis_val(rel2scr_x(c.x)), s.axis_y.axis_val(y));
 								Point128 size; bool show_x, show_date, show_time, show_y;
@@ -168,7 +168,7 @@ namespace CairoChart {
 							break;
 						case Orientation.HORIZONTAL:
 							Float128 x = 0;
-							if (Math.hcross(s.get_scr_point(points[i]), s.get_scr_point(points[i+1]),
+							if (Math.hcross(s.scr_pnt(points[i]), s.scr_pnt(points[i+1]),
 							                chart.plarea.x0, chart.plarea.x1, rel2scr_y(c.y), out x)) {
 								var point = Point128(s.axis_x.axis_val(x), s.axis_y.axis_val(rel2scr_y(c.y)));
 								Point128 size; bool show_x, show_date, show_time, show_y;
@@ -207,7 +207,7 @@ namespace CairoChart {
 					var si = ccs[ci].series_index;
 					var s = chart.series[si];
 					var p = ccs[ci].point;
-					var scrp = s.get_scr_point(p);
+					var scrp = s.scr_pnt(p);
 					if (scrp.x < low.x) low.x = scrp.x;
 					if (scrp.y < low.y) low.y = scrp.y;
 					if (scrp.x > high.x) high.x = scrp.x;
@@ -483,7 +483,7 @@ namespace CairoChart {
 				for (var cci = 0, max_cci = crossings[ccsi].crossings.length; cci < max_cci; ++cci) {
 					// TODO: Ticket #142: find smart algorithm of cursors values placements
 					unowned CursorCross[] cr = crossings[ccsi].crossings;
-					cr[cci].scr_point = chart.series[cr[cci].series_index].get_scr_point (cr[cci].point);
+					cr[cci].scr_point = chart.series[cr[cci].series_index].scr_pnt (cr[cci].point);
 					var d_max = double.max (cr[cci].size.x / 1.5, cr[cci].size.y / 1.5);
 					cr[cci].scr_value_point = Point (cr[cci].scr_point.x + d_max, cr[cci].scr_point.y - d_max);
 				}
diff --git a/src/Series.vala b/src/Series.vala
index 5065d4e..619d10d 100644
--- a/src/Series.vala
+++ b/src/Series.vala
@@ -130,8 +130,8 @@ namespace CairoChart {
 				if (Math.cut_line (
 				        Point(chart.plarea.x0, chart.plarea.y0),
 				        Point(chart.plarea.x1, chart.plarea.y1),
-				        get_scr_point(points[i-1]),
-				        get_scr_point(points[i]),
+				        scr_pnt(points[i-1]),
+				        scr_pnt(points[i]),
 				        out c, out d)
 				) {
 					chart.ctx.move_to (c.x, c.y);
@@ -140,7 +140,7 @@ namespace CairoChart {
 			}
 			chart.ctx.stroke();
 			for (int i = 0; i < points.length; ++i) {
-				var p = get_scr_point(points[i]);
+				var p = scr_pnt(points[i]);
 				if (Math.point_in_rect (p, chart.plarea.x0, chart.plarea.x1,
 				                           chart.plarea.y0, chart.plarea.y1))
 					marker.draw_at_pos(p);
@@ -151,7 +151,7 @@ namespace CairoChart {
 		 * Gets screen point by real ``Series`` (X;Y) value.
 		 * @param p real ``Series`` (X;Y) value.
 		 */
-		public virtual Point get_scr_point (Point128 p) {
+		public virtual Point scr_pnt (Point128 p) {
 			return Point(axis_x.scr_pos(p.x), axis_y.scr_pos(p.y));
 		}
 
@@ -159,7 +159,7 @@ namespace CairoChart {
 		 * Gets real ``Series`` (X;Y) value by plot area screen point.
 		 * @param p (X;Y) screen point.
 		 */
-		public virtual Point128 get_real_point (Point p) {
+		public virtual Point128 axis_pnt (Point p) {
 			return Point128 (axis_x.axis_val(p.x), axis_y.axis_val(p.y));
 		}