From 8bc81c75088c502b24f322e307cf16a0f5aef92d Mon Sep 17 00:00:00 2001
From: Kolan Sh <backbone@backbone.ws>
Date: Mon, 22 Jan 2018 19:21:29 +0300
Subject: [PATCH] OK In progress...

---
 src/Chart.vala  | 28 ++++++++++++++++++++++++++--
 src/Series.vala | 24 ------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/Chart.vala b/src/Chart.vala
index 4efcc20..659e425 100644
--- a/src/Chart.vala
+++ b/src/Chart.vala
@@ -307,6 +307,30 @@ namespace CairoChart {
 				s.axis_y.title.font.orient = Gtk.Orientation.VERTICAL;
 		}
 
+		protected virtual bool equal_x_axis (Series s1, Series s2) {
+			if (   s1.axis_x.position != s2.axis_x.position
+			    || s1.axis_x.range.zmin != s2.axis_x.range.zmin
+			    || s1.axis_x.range.zmax != s2.axis_x.range.zmax
+			    || s1.place.zx0 != s2.place.zx0
+			    || s1.place.zx1 != s2.place.zx1
+			    || s1.axis_x.dtype != s2.axis_x.dtype
+			)
+				return false;
+			return true;
+		}
+
+		protected virtual bool equal_y_axis (Series s1, Series s2) {
+			if (   s1.axis_y.position != s2.axis_y.position
+			    || s1.axis_y.range.zmin != s2.axis_y.range.zmin
+			    || s1.axis_y.range.zmax != s2.axis_y.range.zmax
+			    || s1.place.zy0 != s2.place.zy0
+			    || s1.place.zy1 != s2.place.zy1
+			    || s1.axis_y.dtype != s2.axis_y.dtype
+			)
+				return false;
+			return true;
+		}
+
 		protected virtual void eval_plarea () {
 			plarea = evarea.copy();
 			if (legend.show)
@@ -322,8 +346,8 @@ namespace CairoChart {
 			int nshow = 0;
 			foreach (var s in series) {
 				if (!s.zoom_show) continue;
-				if (!s.equal_x_axis(series[0])) joint_x = false;
-				if (!s.equal_y_axis(series[0])) joint_y = false;
+				if (!equal_x_axis(s, series[0])) joint_x = false;
+				if (!equal_y_axis(s, series[0])) joint_y = false;
 				++nshow;
 			}
 			if (nshow == 1) joint_x = joint_y = false;
diff --git a/src/Series.vala b/src/Series.vala
index 8603fa2..4fbbeaa 100644
--- a/src/Series.vala
+++ b/src/Series.vala
@@ -92,30 +92,6 @@ namespace CairoChart {
 			}
 		}
 
-		public virtual bool equal_x_axis (Series s) {
-			if (   axis_x.position != s.axis_x.position
-			    || axis_x.range.zmin != s.axis_x.range.zmin
-			    || axis_x.range.zmax != s.axis_x.range.zmax
-			    || place.zx0 != s.place.zx0
-			    || place.zx1 != s.place.zx1
-			    || axis_x.dtype != s.axis_x.dtype
-			)
-				return false;
-			return true;
-		}
-
-		public virtual bool equal_y_axis (Series s) {
-			if (   axis_y.position != s.axis_y.position
-			    || axis_y.range.zmin != s.axis_y.range.zmin
-			    || axis_y.range.zmax != s.axis_y.range.zmax
-			    || place.zy0 != s.place.zy0
-			    || place.zy1 != s.place.zy1
-			    || axis_y.dtype != s.axis_y.dtype
-			)
-				return false;
-			return true;
-		}
-
 		public virtual void join_axes (bool is_x, int si, ref int nskip) {
 			var s = chart.series[si];
 			Axis axis = s.axis_x;