kolan
/
Cairo-Chart
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OK In progress...

This commit is contained in:
Kolan Sh 2018-01-22 19:21:29 +03:00
parent 10fc250f5f
commit 8bc81c7508
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Chart.vala
View File

@ -307,6 +307,30 @@ namespace CairoChart {
s.axis_y.title.font.orient = Gtk.Orientation.VERTICAL; 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 () { protected virtual void eval_plarea () {
plarea = evarea.copy(); plarea = evarea.copy();
if (legend.show) if (legend.show)
@ -322,8 +346,8 @@ namespace CairoChart {
int nshow = 0; int nshow = 0;
foreach (var s in series) { foreach (var s in series) {
if (!s.zoom_show) continue; if (!s.zoom_show) continue;
if (!s.equal_x_axis(series[0])) joint_x = false; if (!equal_x_axis(s, series[0])) joint_x = false;
if (!s.equal_y_axis(series[0])) joint_y = false; if (!equal_y_axis(s, series[0])) joint_y = false;
++nshow; ++nshow;
} }
if (nshow == 1) joint_x = joint_y = false; if (nshow == 1) joint_x = joint_y = false;

24
src/Series.vala
View File

@ -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) { public virtual void join_axes (bool is_x, int si, ref int nskip) {
var s = chart.series[si]; var s = chart.series[si];
Axis axis = s.axis_x; Axis axis = s.axis_x;