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-19 17:34:30 +03:00
parent 277e0a407b
commit 548863c0e8
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Chart.vala
View File

@ -306,7 +306,6 @@ namespace CairoChart {
s.axis_y.title.style.orientation = Font.Orientation.VERTICAL; s.axis_y.title.style.orientation = Font.Orientation.VERTICAL;
} }
// TODO
protected virtual void eval_plarea () { protected virtual void eval_plarea () {
plarea.x = evarea.x + legend.spacing; plarea.x = evarea.x + legend.spacing;
plarea.width = evarea.width - 2 * legend.spacing; plarea.width = evarea.width - 2 * legend.spacing;
@ -318,17 +317,17 @@ 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;
++nshow;
if (!s.equal_x_axis(series[0])) joint_x = false; if (!s.equal_x_axis(series[0])) joint_x = false;
if (!s.equal_y_axis(series[0])) joint_y = false; if (!s.equal_y_axis(series[0])) joint_y = false;
++nshow;
} }
if (nshow == 1) joint_x = joint_y = false; if (nshow == 1) joint_x = joint_y = false;
for (var si = series.length - 1, nskip = 0; si >= 0; --si) for (var si = series.length - 1, nskip = 0; si >= 0; --si)
series[si].join_calc(true, si, ref nskip); series[si].join_axes(true, si, ref nskip);
for (var si = series.length - 1, nskip = 0; si >= 0; --si) for (var si = series.length - 1, nskip = 0; si >= 0; --si)
series[si].join_calc(false, si, ref nskip); series[si].join_axes(false, si, ref nskip);
} }
protected virtual void draw_plarea_border () { protected virtual void draw_plarea_border () {
@ -346,12 +345,10 @@ namespace CairoChart {
ctx.move_to (area.width/2 - sz.width/2, sz.height + title.vspacing); ctx.move_to (area.width/2 - sz.width/2, sz.height + title.vspacing);
title.show(ctx); title.show(ctx);
} }
// TODO
protected virtual void draw_haxes () { protected virtual void draw_haxes () {
for (var si = series.length - 1, nskip = 0; si >=0; --si) for (var si = series.length - 1, nskip = 0; si >=0; --si)
series[si].draw_horizontal_axis (si, ref nskip); series[si].draw_horizontal_axis (si, ref nskip);
} }
// TODO
protected virtual void draw_vaxes () { protected virtual void draw_vaxes () {
for (var si = series.length - 1, nskip = 0; si >=0; --si) for (var si = series.length - 1, nskip = 0; si >=0; --si)
series[si].draw_vertical_axis (si, ref nskip); series[si].draw_vertical_axis (si, ref nskip);

2
src/Series.vala
View File

@ -114,7 +114,7 @@ namespace CairoChart {
return true; return true;
} }
public virtual void join_calc (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;
if (!is_x) axis = s.axis_y; if (!is_x) axis = s.axis_y;