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-18 11:30:18 +03:00
parent 43836e1c56
commit 7bb7ca1b6f
3 changed files with 52 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Chart.vala
View File

@ -40,10 +40,11 @@ namespace CairoChart {
*/ */
public Series[] series = {}; public Series[] series = {};
public double cur_x_min = 0.0; /**
public double cur_x_max = 1.0; * Current calculated Plot Position.
public double cur_y_min = 0.0; */
public double cur_y_max = 1.0; public Cairo.Rectangle calc_pos = Cairo.Rectangle()
{ x = 0, y = 0, width = 1, height = 1 };
// relative zoom limits // relative zoom limits
public double rz_x_min { get; protected set; default = 0.0; } public double rz_x_min { get; protected set; default = 0.0; }
@ -87,10 +88,7 @@ namespace CairoChart {
chart.joint_x = this.joint_x; chart.joint_x = this.joint_x;
chart.joint_y = this.joint_y; chart.joint_y = this.joint_y;
chart.ctx = this.ctx; chart.ctx = this.ctx;
chart.cur_x_max = this.cur_x_max; chart.calc_pos = this.calc_pos;
chart.cur_x_min = this.cur_x_min;
chart.cur_y_max = this.cur_y_max;
chart.cur_y_min = this.cur_y_min;
chart.cursors = this.cursors.copy(); chart.cursors = this.cursors.copy();
chart.legend = this.legend.copy(); chart.legend = this.legend.copy();
chart.plot_x_max = this.plot_x_max; chart.plot_x_max = this.plot_x_max;
@ -112,11 +110,9 @@ namespace CairoChart {
return chart; return chart;
} }
protected virtual void check_cur_values () { protected virtual void fix_calc_pos () {
if (cur_x_min > cur_x_max) if (calc_pos.width < 0) calc_pos.width = 0;
cur_x_max = cur_x_min; if (calc_pos.height < 0) calc_pos.height = 0;
if (cur_y_min > cur_y_max)
cur_y_max = cur_y_min;
} }
protected virtual void set_vertical_axes_titles () { protected virtual void set_vertical_axes_titles () {
for (var si = 0; si < series.length; ++si) { for (var si = 0; si < series.length; ++si) {
@ -135,16 +131,13 @@ namespace CairoChart {
public virtual bool draw () { public virtual bool draw () {
cur_x_min = pos.x; calc_pos = pos;
cur_y_min = pos.y;
cur_x_max = pos.x + pos.width;
cur_y_max = pos.y + pos.height;
draw_chart_title (); draw_chart_title ();
check_cur_values (); fix_calc_pos ();
legend.draw (this); legend.draw (this);
check_cur_values (); fix_calc_pos ();
set_vertical_axes_titles (); set_vertical_axes_titles ();
@ -153,26 +146,27 @@ namespace CairoChart {
calc_plot_area (); calc_plot_area ();
draw_horizontal_axes (); draw_horizontal_axes ();
check_cur_values (); fix_calc_pos ();
draw_vertical_axes (); draw_vertical_axes ();
check_cur_values (); fix_calc_pos ();
draw_plot_area_border (); draw_plot_area_border ();
check_cur_values (); fix_calc_pos ();
draw_series (); draw_series ();
check_cur_values (); fix_calc_pos ();
cursors.draw_cursors (this); cursors.draw_cursors (this);
check_cur_values (); fix_calc_pos ();
return true; return true;
} }
protected virtual void draw_chart_title () { protected virtual void draw_chart_title () {
var sz = title.get_size(ctx); var sz = title.get_size(ctx);
title_height = sz.height + (legend.position == Legend.Position.TOP ? title_indent * 2 : title_indent); title_height = sz.height + (legend.position == Legend.Position.TOP ? title_indent * 2 : title_indent);
cur_y_min += title_height; calc_pos.y += title_height;
calc_pos.height -= title_height;
color = title.color; color = title.color;
ctx.move_to (pos.width/2 - sz.width/2, sz.height + title_indent); ctx.move_to (pos.width/2 - sz.width/2, sz.height + title_indent);
title.show(ctx); title.show(ctx);
@ -313,10 +307,10 @@ namespace CairoChart {
series[si].join_calc(is_x, si, ref nskip); series[si].join_calc(is_x, si, ref nskip);
} }
protected virtual void calc_plot_area () { protected virtual void calc_plot_area () {
plot_x_min = cur_x_min + legend.indent; plot_x_min = calc_pos.x + legend.indent;
plot_x_max = cur_x_max - legend.indent; plot_x_max = calc_pos.x + calc_pos.width - legend.indent;
plot_y_min = cur_y_min + legend.indent; plot_y_min = calc_pos.y + legend.indent;
plot_y_max = cur_y_max - legend.indent; plot_y_max = calc_pos.y + calc_pos.height - legend.indent;
// Check for joint axes // Check for joint axes
joint_x = joint_y = true; joint_x = joint_y = true;

10
src/Legend.vala
View File

@ -201,16 +201,18 @@ namespace CairoChart {
height = leg_height_sum; height = leg_height_sum;
switch (position) { switch (position) {
case Position.TOP: case Position.TOP:
chart.cur_y_min += height; chart.calc_pos.y += height;
chart.calc_pos.height -= height;
break; break;
case Position.BOTTOM: case Position.BOTTOM:
chart.cur_y_max -= height; chart.calc_pos.height -= height;
break; break;
case Position.LEFT: case Position.LEFT:
chart.cur_x_min += width; chart.calc_pos.x += width;
chart.calc_pos.width -= width;
break; break;
case Position.RIGHT: case Position.RIGHT:
chart.cur_x_max -= width; chart.calc_pos.width -= width;
break; break;
} }
break; break;

45
src/Series.vala
View File

@ -258,7 +258,7 @@ namespace CairoChart {
switch (axis_x.position) { switch (axis_x.position) {
case Axis.Position.LOW: case Axis.Position.LOW:
var print_y = chart.cur_y_max - axis_x.font_indent - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); var print_y = chart.calc_pos.y + chart.calc_pos.height - axis_x.font_indent - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent);
var print_x = compact_rec_x_pos (x, text_t); var print_x = compact_rec_x_pos (x, text_t);
ctx.move_to (print_x, print_y); ctx.move_to (print_x, print_y);
switch (axis_x.type) { switch (axis_x.type) {
@ -277,7 +277,7 @@ namespace CairoChart {
var line_style = grid.line_style; var line_style = grid.line_style;
if (joint_x) line_style.color = Color(0, 0, 0, 0.5); if (joint_x) line_style.color = Color(0, 0, 0, 0.5);
line_style.set(chart); line_style.set(chart);
double y = chart.cur_y_max - max_rec_height - axis_x.font_indent - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); double y = chart.calc_pos.y + chart.calc_pos.height - max_rec_height - axis_x.font_indent - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent);
ctx.move_to (scr_x, y); ctx.move_to (scr_x, y);
if (joint_x) if (joint_x)
ctx.line_to (scr_x, chart.plot_y_min); ctx.line_to (scr_x, chart.plot_y_min);
@ -285,7 +285,7 @@ namespace CairoChart {
ctx.line_to (scr_x, double.min (y, chart.plot_y_max - (chart.plot_y_max - chart.plot_y_min) * place.zoom_y_max)); ctx.line_to (scr_x, double.min (y, chart.plot_y_max - (chart.plot_y_max - chart.plot_y_min) * place.zoom_y_max));
break; break;
case Axis.Position.HIGH: case Axis.Position.HIGH:
var print_y = chart.cur_y_min + max_rec_height + axis_x.font_indent + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); var print_y = chart.calc_pos.y + max_rec_height + axis_x.font_indent + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent);
var print_x = compact_rec_x_pos (x, text_t); var print_x = compact_rec_x_pos (x, text_t);
ctx.move_to (print_x, print_y); ctx.move_to (print_x, print_y);
@ -305,7 +305,7 @@ namespace CairoChart {
var line_style = grid.line_style; var line_style = grid.line_style;
if (joint_x) line_style.color = Color(0, 0, 0, 0.5); if (joint_x) line_style.color = Color(0, 0, 0, 0.5);
line_style.set(chart); line_style.set(chart);
double y = chart.cur_y_min + max_rec_height + axis_x.font_indent + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); double y = chart.calc_pos.y + max_rec_height + axis_x.font_indent + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent);
ctx.move_to (scr_x, y); ctx.move_to (scr_x, y);
if (joint_x) if (joint_x)
ctx.line_to (scr_x, chart.plot_y_max); ctx.line_to (scr_x, chart.plot_y_max);
@ -348,8 +348,8 @@ namespace CairoChart {
// 4.2. Cursor values for joint X axis // 4.2. Cursor values for joint X axis
if (chart.joint_x && chart.cursors.cursor_style.orientation == Cursors.Orientation.VERTICAL && chart.cursors.cursors_crossings.length != 0) { if (chart.joint_x && chart.cursors.cursor_style.orientation == Cursors.Orientation.VERTICAL && chart.cursors.cursors_crossings.length != 0) {
switch (s.axis_x.position) { switch (s.axis_x.position) {
case Axis.Position.LOW: chart.cur_y_max -= max_rec_height + s.axis_x.font_indent; break; case Axis.Position.LOW: chart.calc_pos.height -= max_rec_height + s.axis_x.font_indent; break;
case Axis.Position.HIGH: chart.cur_y_min += max_rec_height + s.axis_x.font_indent; break; case Axis.Position.HIGH: var tmp = max_rec_height + s.axis_x.font_indent; chart.calc_pos.y += tmp; chart.calc_pos.height -= tmp; break;
} }
} }
@ -360,8 +360,8 @@ namespace CairoChart {
var scr_x = chart.plot_x_min + (chart.plot_x_max - chart.plot_x_min) * (s.place.zoom_x_min + s.place.zoom_x_max) / 2.0; var scr_x = chart.plot_x_min + (chart.plot_x_max - chart.plot_x_min) * (s.place.zoom_x_min + s.place.zoom_x_max) / 2.0;
double scr_y = 0.0; double scr_y = 0.0;
switch (s.axis_x.position) { switch (s.axis_x.position) {
case Axis.Position.LOW: scr_y = chart.cur_y_max - s.axis_x.font_indent; break; case Axis.Position.LOW: scr_y = chart.calc_pos.y + chart.calc_pos.height - s.axis_x.font_indent; break;
case Axis.Position.HIGH: scr_y = chart.cur_y_min + s.axis_x.font_indent + sz.height; break; case Axis.Position.HIGH: scr_y = chart.calc_pos.y + s.axis_x.font_indent + sz.height; break;
} }
chart.ctx.move_to(scr_x - sz.width / 2.0, scr_y); chart.ctx.move_to(scr_x - sz.width / 2.0, scr_y);
chart.color = s.axis_x.color; chart.color = s.axis_x.color;
@ -380,12 +380,12 @@ namespace CairoChart {
switch (s.axis_x.position) { switch (s.axis_x.position) {
case Axis.Position.LOW: case Axis.Position.LOW:
chart.cur_y_max -= max_rec_height + s.axis_x.font_indent chart.calc_pos.height -= max_rec_height + s.axis_x.font_indent
+ (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_indent); + (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_indent);
break; break;
case Axis.Position.HIGH: case Axis.Position.HIGH:
chart.cur_y_min += max_rec_height + s.axis_x.font_indent var tmp = max_rec_height + s.axis_x.font_indent + (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_indent);
+ (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_indent); chart.calc_pos.y += tmp; chart.calc_pos.height -= tmp;
break; break;
} }
} }
@ -406,7 +406,7 @@ namespace CairoChart {
switch (axis_y.position) { switch (axis_y.position) {
case Axis.Position.LOW: case Axis.Position.LOW:
ctx.move_to (chart.cur_x_min + max_rec_width - text_sz.width + axis_y.font_indent ctx.move_to (chart.calc_pos.x + max_rec_width - text_sz.width + axis_y.font_indent
+ (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent), + (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent),
compact_rec_y_pos (y, text_t)); compact_rec_y_pos (y, text_t));
text_t.show(ctx); text_t.show(ctx);
@ -414,7 +414,7 @@ namespace CairoChart {
var line_style = grid.line_style; var line_style = grid.line_style;
if (joint_y) line_style.color = Color(0, 0, 0, 0.5); if (joint_y) line_style.color = Color(0, 0, 0, 0.5);
line_style.set(chart); line_style.set(chart);
double x = chart.cur_x_min + max_rec_width + axis_y.font_indent + (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent); double x = chart.calc_pos.x + max_rec_width + axis_y.font_indent + (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent);
ctx.move_to (x, scr_y); ctx.move_to (x, scr_y);
if (joint_y) if (joint_y)
ctx.line_to (chart.plot_x_max, scr_y); ctx.line_to (chart.plot_x_max, scr_y);
@ -422,7 +422,7 @@ namespace CairoChart {
ctx.line_to (double.max (x, chart.plot_x_min + (chart.plot_x_max - chart.plot_x_min) * place.zoom_x_max), scr_y); ctx.line_to (double.max (x, chart.plot_x_min + (chart.plot_x_max - chart.plot_x_min) * place.zoom_x_max), scr_y);
break; break;
case Axis.Position.HIGH: case Axis.Position.HIGH:
ctx.move_to (chart.cur_x_max - text_sz.width - axis_y.font_indent ctx.move_to (chart.calc_pos.x + chart.calc_pos.width - text_sz.width - axis_y.font_indent
- (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent), - (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent),
compact_rec_y_pos (y, text_t)); compact_rec_y_pos (y, text_t));
text_t.show(ctx); text_t.show(ctx);
@ -430,7 +430,7 @@ namespace CairoChart {
var line_style = grid.line_style; var line_style = grid.line_style;
if (joint_y) line_style.color = Color(0, 0, 0, 0.5); if (joint_y) line_style.color = Color(0, 0, 0, 0.5);
line_style.set(chart); line_style.set(chart);
double x = chart.cur_x_max - max_rec_width - axis_y.font_indent - (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent); double x = chart.calc_pos.x + chart.calc_pos.width - max_rec_width - axis_y.font_indent - (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent);
ctx.move_to (x, scr_y); ctx.move_to (x, scr_y);
if (joint_y) if (joint_y)
ctx.line_to (chart.plot_x_min, scr_y); ctx.line_to (chart.plot_x_min, scr_y);
@ -472,8 +472,8 @@ namespace CairoChart {
// 4.2. Cursor values for joint Y axis // 4.2. Cursor values for joint Y axis
if (chart.joint_y && chart.cursors.cursor_style.orientation == Cursors.Orientation.HORIZONTAL && chart.cursors.cursors_crossings.length != 0) { if (chart.joint_y && chart.cursors.cursor_style.orientation == Cursors.Orientation.HORIZONTAL && chart.cursors.cursors_crossings.length != 0) {
switch (s.axis_y.position) { switch (s.axis_y.position) {
case Axis.Position.LOW: chart.cur_x_min += max_rec_width + s.axis_y.font_indent; break; case Axis.Position.LOW: var tmp = max_rec_width + s.axis_y.font_indent; chart.calc_pos.x += tmp; chart.calc_pos.width -= tmp; break;
case Axis.Position.HIGH: chart.cur_x_max -= max_rec_width + s.axis_y.font_indent; break; case Axis.Position.HIGH: chart.calc_pos.width -= max_rec_width + s.axis_y.font_indent; break;
} }
} }
@ -484,11 +484,11 @@ namespace CairoChart {
var scr_y = chart.plot_y_max - (chart.plot_y_max - chart.plot_y_min) * (s.place.zoom_y_min + s.place.zoom_y_max) / 2.0; var scr_y = chart.plot_y_max - (chart.plot_y_max - chart.plot_y_min) * (s.place.zoom_y_min + s.place.zoom_y_max) / 2.0;
switch (s.axis_y.position) { switch (s.axis_y.position) {
case Axis.Position.LOW: case Axis.Position.LOW:
var scr_x = chart.cur_x_min + s.axis_y.font_indent + sz.width; var scr_x = chart.calc_pos.x + s.axis_y.font_indent + sz.width;
chart.ctx.move_to(scr_x, scr_y + sz.height / 2.0); chart.ctx.move_to(scr_x, scr_y + sz.height / 2.0);
break; break;
case Axis.Position.HIGH: case Axis.Position.HIGH:
var scr_x = chart.cur_x_max - s.axis_y.font_indent; var scr_x = chart.calc_pos.x + chart.calc_pos.width - s.axis_y.font_indent;
chart.ctx.move_to(scr_x, scr_y + sz.height / 2.0); chart.ctx.move_to(scr_x, scr_y + sz.height / 2.0);
break; break;
} }
@ -508,10 +508,11 @@ namespace CairoChart {
switch (s.axis_y.position) { switch (s.axis_y.position) {
case Axis.Position.LOW: case Axis.Position.LOW:
chart.cur_x_min += max_rec_width + s.axis_y.font_indent var tmp = max_rec_width + s.axis_y.font_indent + (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent);
+ (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent); break; chart.calc_pos.x += tmp; chart.calc_pos.width -= tmp;
break;
case Axis.Position.HIGH: case Axis.Position.HIGH:
chart.cur_x_max -= max_rec_width + s.axis_y.font_indent chart.calc_pos.width -= max_rec_width + s.axis_y.font_indent
+ (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent); break; + (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent); break;
} }
} }