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

Separate join_calc_{x,y}() added.

This commit is contained in:
Kolan Sh 2018-01-15 16:40:14 +03:00
parent dcfb85126e
commit a3bbf50b6f
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/Chart.vala
View File

@ -232,24 +232,7 @@ namespace CairoChart {
} }
} }
protected virtual void calc_plot_area () { protected virtual void join_calc_x () {
plot_x_min = cur_x_min + legend.indent;
plot_x_max = cur_x_max - legend.indent;
plot_y_min = cur_y_min + legend.indent;
plot_y_max = cur_y_max - legend.indent;
// Check for joint axes
joint_x = joint_y = true;
int nzoom_series_show = 0;
for (var si = series.length - 1; si >=0; --si) {
var s = series[si], s0 = series[0];
if (!s.zoom_show) continue;
++nzoom_series_show;
if (!s.equal_x_axis(s0)) joint_x = false;
if (!s.equal_y_axis(s0)) joint_y = false;
}
if (nzoom_series_show == 1) joint_x = joint_y = false;
// Join and calc X-axes // Join and calc X-axes
for (var si = series.length - 1, nskip = 0; si >= 0; --si) { for (var si = series.length - 1, nskip = 0; si >= 0; --si) {
var s = series[si]; var s = series[si];
@ -276,7 +259,9 @@ namespace CairoChart {
case Axis.Position.HIGH: plot_y_min += max_rec_height + max_font_indent + max_axis_font_height; break; case Axis.Position.HIGH: plot_y_min += max_rec_height + max_font_indent + max_axis_font_height; break;
} }
} }
}
protected virtual void join_calc_y () {
// Join and calc Y-axes // Join and calc Y-axes
for (var si = series.length - 1, nskip = 0; si >= 0; --si) { for (var si = series.length - 1, nskip = 0; si >= 0; --si) {
var s = series[si]; var s = series[si];
@ -305,6 +290,28 @@ namespace CairoChart {
} }
} }
protected virtual void calc_plot_area () {
plot_x_min = cur_x_min + legend.indent;
plot_x_max = cur_x_max - legend.indent;
plot_y_min = cur_y_min + legend.indent;
plot_y_max = cur_y_max - legend.indent;
// Check for joint axes
joint_x = joint_y = true;
int nzoom_series_show = 0;
for (var si = series.length - 1; si >=0; --si) {
var s = series[si], s0 = series[0];
if (!s.zoom_show) continue;
++nzoom_series_show;
if (!s.equal_x_axis(s0)) joint_x = false;
if (!s.equal_y_axis(s0)) joint_y = false;
}
if (nzoom_series_show == 1) joint_x = joint_y = false;
join_calc_x ();
join_calc_y ();
}
protected virtual double compact_rec_x_pos (Series s, Float128 x, Text text) { protected virtual double compact_rec_x_pos (Series s, Float128 x, Text text) {
var sz = text.get_size(context); var sz = text.get_size(context);
return get_scr_x(s, x) - sz.width / 2.0 return get_scr_x(s, x) - sz.width / 2.0