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-23 13:18:27 +03:00
parent c35376d566
commit e7cb034b68
4 changed files with 75 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

130
src/Axis.vala
View File

@ -11,6 +11,7 @@ namespace CairoChart {
protected string _date_format = "%Y.%m.%d"; protected string _date_format = "%Y.%m.%d";
protected string _time_format = "%H:%M:%S"; protected string _time_format = "%H:%M:%S";
protected int _dsec_signs = 2; // 2 signs = centiseconds protected int _dsec_signs = 2; // 2 signs = centiseconds
protected bool is_x;
/** /**
* ``Axis`` title. * ``Axis`` title.
@ -166,10 +167,12 @@ namespace CairoChart {
* Constructs a new ``Axis``. * Constructs a new ``Axis``.
* @param chart ``Chart`` instance. * @param chart ``Chart`` instance.
* @param ser ``Series`` instance. * @param ser ``Series`` instance.
* @param is_x is X-axis or not (Y-axis otherwise).
*/ */
public Axis (Chart chart, Series ser) { public Axis (Chart chart, Series ser, bool is_x) {
this.chart = chart; this.chart = chart;
this.ser = ser; this.ser = ser;
this.is_x = is_x;
title = new Text (chart, ""); title = new Text (chart, "");
} }
@ -177,7 +180,7 @@ namespace CairoChart {
* Gets a copy of the ``Axis``. * Gets a copy of the ``Axis``.
*/ */
public virtual Axis copy () { public virtual Axis copy () {
var axis = new Axis (chart, ser); var axis = new Axis (chart, ser, is_x);
axis._date_format = this._date_format; axis._date_format = this._date_format;
axis._dsec_signs = this._dsec_signs; axis._dsec_signs = this._dsec_signs;
axis._format = this._format; axis._format = this._format;
@ -221,15 +224,10 @@ namespace CairoChart {
/** /**
* Joins equal axes. * Joins equal axes.
* @param is_x is this X-axis or not.
* @param nskip returns number of series to skip printing. * @param nskip returns number of series to skip printing.
*/ */
public virtual void join_axes (ref int nskip) { public virtual void join_axes (ref int nskip) {
Axis axis = this; Axis axis = this;
bool is_x;
if (ser.axis_x == this) is_x = true;
else if (ser.axis_y == this) is_x = false;
else return;
if (!ser.zoom_show) return; if (!ser.zoom_show) return;
if (nskip != 0) {--nskip; return;} if (nskip != 0) {--nskip; return;}
var max_rec_width = 0.0, max_rec_height = 0.0; var max_rec_width = 0.0, max_rec_height = 0.0;
@ -242,9 +240,9 @@ namespace CairoChart {
if (si == -1) return; if (si == -1) return;
if (is_x) if (is_x)
join_relative_x_axes (si, true, ref max_rec_width, ref max_rec_height, ref max_font_spacing, ref max_axis_font_height, ref nskip); join_rel_x_axes (si, true, ref max_rec_width, ref max_rec_height, ref max_font_spacing, ref max_axis_font_height, ref nskip);
else else
join_relative_y_axes (si, true, ref max_rec_width, ref max_rec_height, ref max_font_spacing, ref max_axis_font_width, ref nskip); join_rel_y_axes (si, true, ref max_rec_width, ref max_rec_height, ref max_font_spacing, ref max_axis_font_width, ref nskip);
// for 4.2. Cursor values for joint X axis // for 4.2. Cursor values for joint X axis
if (si == chart.zoom_1st_idx && chart.cursors.has_crossings) { if (si == chart.zoom_1st_idx && chart.cursors.has_crossings) {
@ -289,7 +287,7 @@ namespace CairoChart {
* Draws horizontal axis. * Draws horizontal axis.
* @param nskip number of series to skip printing. * @param nskip number of series to skip printing.
*/ */
public virtual void draw_horizontal_axis (ref int nskip) { public virtual void draw_haxis (ref int nskip) {
if (!ser.zoom_show) return; if (!ser.zoom_show) return;
var si = Math.find_arr<Series>(chart.series, ser); var si = Math.find_arr<Series>(chart.series, ser);
@ -344,12 +342,12 @@ namespace CairoChart {
title.show(); title.show();
} }
draw_horizontal_records (step, max_rec_height, x_min); draw_hrecs (step, max_rec_height, x_min);
chart.ctx.stroke (); chart.ctx.stroke ();
var tmp1 = 0.0, tmp2 = 0.0, tmp3 = 0.0, tmp4 = 0.0; var tmp1 = 0.0, tmp2 = 0.0, tmp3 = 0.0, tmp4 = 0.0;
join_relative_x_axes (si, false, ref tmp1, ref tmp2, ref tmp3, ref tmp4, ref nskip); join_rel_x_axes (si, false, ref tmp1, ref tmp2, ref tmp3, ref tmp4, ref nskip);
if (nskip != 0) {--nskip; return;} if (nskip != 0) {--nskip; return;}
@ -364,7 +362,7 @@ namespace CairoChart {
* Draws vertical axis. * Draws vertical axis.
* @param nskip number of series to skip printing. * @param nskip number of series to skip printing.
*/ */
public virtual void draw_vertical_axis (ref int nskip) { public virtual void draw_vaxis (ref int nskip) {
if (!ser.zoom_show) return; if (!ser.zoom_show) return;
var si = Math.find_arr<Series>(chart.series, ser); var si = Math.find_arr<Series>(chart.series, ser);
@ -422,12 +420,12 @@ namespace CairoChart {
title.show(); title.show();
} }
draw_vertical_records (step, max_rec_width, y_min); draw_vrecs (step, max_rec_width, y_min);
chart.ctx.stroke (); chart.ctx.stroke ();
var tmp1 = 0.0, tmp2 = 0.0, tmp3 = 0.0, tmp4 = 0.0; var tmp1 = 0.0, tmp2 = 0.0, tmp3 = 0.0, tmp4 = 0.0;
join_relative_y_axes (si, false, ref tmp1, ref tmp2, ref tmp3, ref tmp4, ref nskip); join_rel_y_axes (si, false, ref tmp1, ref tmp2, ref tmp3, ref tmp4, ref nskip);
if (nskip != 0) {--nskip; return;} if (nskip != 0) {--nskip; return;}
@ -439,55 +437,31 @@ namespace CairoChart {
} }
/** /**
* Gets compact placement X-position on the screen. * Gets compact placement position on the screen.
* @param x real ``Series`` X-value. * @param axis_value real ``Axis`` value.
* @param text to place on the screen. * @param text to place on the screen.
*/ */
public virtual double compact_rec_x_pos (Float128 x, Text text) { public virtual double compact_rec_pos (Float128 axis_value, Text text) {
return get_scr_x(x) - text.width / 2 return is_x ? scr_pos(axis_value) - text.width / 2 - text.width * (axis_value - (range.zmin + range.zmax) / 2) / range.zrange
- text.width * (x - (range.zmin + range.zmax) / 2) / range.zrange; : scr_pos(axis_value) + text.height / 2 + text.height * (axis_value - (range.zmin + range.zmax) / 2) / range.zrange;
} }
/** /**
* Gets compact placement Y-position on the screen. * Gets screen position by real ``Axis`` value.
* @param y real ``Series`` Y-value. * @param axis_value real ``Axis`` value.
* @param text to place on the screen.
*/ */
public virtual double compact_rec_y_pos (Float128 y, Text text) { public virtual double scr_pos (Float128 axis_value) {
return get_scr_y(y) + text.height / 2 return is_x ? chart.plarea.x0 + chart.plarea.width * (place.zmin + (axis_value - range.zmin) / range.zrange * place.zrange)
+ text.height * (y - (range.zmin + range.zmax) / 2) / range.zrange; : chart.plarea.y0 + chart.plarea.height * (1 - (place.zmin + (axis_value - range.zmin) / range.zrange * place.zrange));
} }
/** /**
* Gets screen X-position by real ``Series`` X-value. * Gets real ``Axis`` value by screen position.
* @param x real ``Series`` X-value. * @param scr_pos screen position.
*/ */
public virtual double get_scr_x (Float128 x) { public virtual Float128 axis_val (double scr_pos) {
return chart.plarea.x0 + chart.plarea.width * (place.zmin + (x - range.zmin) / range.zrange * place.zrange); return is_x ? range.zmin + ((scr_pos - chart.plarea.x0) / chart.plarea.width - place.zmin) * range.zrange / place.zrange
} : range.zmin + ((chart.plarea.y1 - scr_pos) / chart.plarea.height - place.zmin) * range.zrange / place.zrange;
/**
* Gets screen Y-position by real ``Series`` Y-value.
* @param y real ``Series`` Y-value.
*/
public virtual double get_scr_y (Float128 y) {
return chart.plarea.y0 + chart.plarea.height * (1 - (place.zmin + (y - range.zmin) / range.zrange * place.zrange));
}
/**
* Gets real ``Series`` X-value by plot area screen X-position.
* @param scr_x screen X-position.
*/
public virtual Float128 get_real_x (double scr_x) {
return range.zmin + ((scr_x - chart.plarea.x0) / chart.plarea.width - place.zmin) * range.zrange / place.zrange;
}
/**
* Gets real ``Series`` Y-value by plot area screen Y-position.
* @param scr_y screen Y-position.
*/
public virtual Float128 get_real_y (double scr_y) {
return range.zmin + ((chart.plarea.y1 - scr_y) / chart.plarea.height - place.zmin) * range.zrange / place.zrange;
} }
protected virtual void calc_rec_sizes (Axis axis, out double max_rec_width, out double max_rec_height, bool horizontal = true) { protected virtual void calc_rec_sizes (Axis axis, out double max_rec_width, out double max_rec_height, bool horizontal = true) {
@ -521,13 +495,13 @@ namespace CairoChart {
} }
} }
protected virtual void join_relative_x_axes (int si, protected virtual void join_rel_x_axes (int si,
bool calc_max_values, bool calc_max_values,
ref double max_rec_width, ref double max_rec_width,
ref double max_rec_height, ref double max_rec_height,
ref double max_font_spacing, ref double max_font_spacing,
ref double max_axis_font_height, ref double max_axis_font_height,
ref int nskip) { ref int nskip) {
for (int sj = si - 1; sj >= 0; --sj) { for (int sj = si - 1; sj >= 0; --sj) {
var s2 = chart.series[sj]; var s2 = chart.series[sj];
if (!s2.zoom_show) continue; if (!s2.zoom_show) continue;
@ -559,13 +533,13 @@ namespace CairoChart {
} }
} }
protected virtual void join_relative_y_axes (int si, protected virtual void join_rel_y_axes (int si,
bool calc_max_values, bool calc_max_values,
ref double max_rec_width, ref double max_rec_width,
ref double max_rec_height, ref double max_rec_height,
ref double max_font_spacing, ref double max_font_spacing,
ref double max_axis_font_width, ref double max_axis_font_width,
ref int nskip) { ref int nskip) {
for (int sj = si - 1; sj >= 0; --sj) { for (int sj = si - 1; sj >= 0; --sj) {
var s2 = chart.series[sj]; var s2 = chart.series[sj];
if (!s2.zoom_show) continue; if (!s2.zoom_show) continue;
@ -595,7 +569,7 @@ namespace CairoChart {
} }
} }
protected virtual void draw_horizontal_records (Float128 step, double max_rec_height, Float128 x_min) { protected virtual void draw_hrecs (Float128 step, double max_rec_height, Float128 x_min) {
// 5. Draw records, update cur_{x,y}_{min,max}. // 5. Draw records, update cur_{x,y}_{min,max}.
var ctx = chart.ctx; var ctx = chart.ctx;
var joint_x = chart.joint_x; var joint_x = chart.joint_x;
@ -608,13 +582,13 @@ namespace CairoChart {
case Axis.DType.NUMBERS: text = format.printf((LongDouble)x); break; case Axis.DType.NUMBERS: text = format.printf((LongDouble)x); break;
case Axis.DType.DATE_TIME: print_dt(x, out text, out time_text); break; case Axis.DType.DATE_TIME: print_dt(x, out text, out time_text); break;
} }
var scr_x = get_scr_x (x); var scr_x = scr_pos (x);
var text_t = new Text(chart, text, font, color); var text_t = new Text(chart, text, font, color);
switch (position) { switch (position) {
case Axis.Position.LOW: case Axis.Position.LOW:
var print_y = chart.evarea.y1 - font.vspacing - (title.text == "" ? 0 : title.height + font.vspacing); var print_y = chart.evarea.y1 - font.vspacing - (title.text == "" ? 0 : title.height + font.vspacing);
var print_x = compact_rec_x_pos (x, text_t); var print_x = compact_rec_pos (x, text_t);
ctx.move_to (print_x, print_y); ctx.move_to (print_x, print_y);
switch (dtype) { switch (dtype) {
case Axis.DType.NUMBERS: case Axis.DType.NUMBERS:
@ -623,7 +597,7 @@ namespace CairoChart {
case Axis.DType.DATE_TIME: case Axis.DType.DATE_TIME:
if (date_format != "") text_t.show(); if (date_format != "") text_t.show();
var time_text_t = new Text(chart, time_text, font, color); var time_text_t = new Text(chart, time_text, font, color);
print_x = compact_rec_x_pos (x, time_text_t); print_x = compact_rec_pos (x, time_text_t);
ctx.move_to (print_x, print_y - (date_format == "" ? 0 : text_t.height + font.vspacing)); ctx.move_to (print_x, print_y - (date_format == "" ? 0 : text_t.height + font.vspacing));
if (time_format != "") time_text_t.show(); if (time_format != "") time_text_t.show();
break; break;
@ -641,7 +615,7 @@ namespace CairoChart {
break; break;
case Axis.Position.HIGH: case Axis.Position.HIGH:
var print_y = chart.evarea.y0 + max_rec_height + font.vspacing + (title.text == "" ? 0 : title.height + font.vspacing); var print_y = chart.evarea.y0 + max_rec_height + font.vspacing + (title.text == "" ? 0 : title.height + font.vspacing);
var print_x = compact_rec_x_pos (x, text_t); var print_x = compact_rec_pos (x, text_t);
ctx.move_to (print_x, print_y); ctx.move_to (print_x, print_y);
switch (dtype) { switch (dtype) {
@ -651,7 +625,7 @@ namespace CairoChart {
case Axis.DType.DATE_TIME: case Axis.DType.DATE_TIME:
if (date_format != "") text_t.show(); if (date_format != "") text_t.show();
var time_text_t = new Text(chart, time_text, font, color); var time_text_t = new Text(chart, time_text, font, color);
print_x = compact_rec_x_pos (x, time_text_t); print_x = compact_rec_pos (x, time_text_t);
ctx.move_to (print_x, print_y - (date_format == "" ? 0 : text_t.height + font.vspacing)); ctx.move_to (print_x, print_y - (date_format == "" ? 0 : text_t.height + font.vspacing));
if (time_format != "") time_text_t.show(); if (time_format != "") time_text_t.show();
break; break;
@ -671,7 +645,7 @@ namespace CairoChart {
} }
} }
protected virtual void draw_vertical_records (Float128 step, double max_rec_width, Float128 y_min) { protected virtual void draw_vrecs (Float128 step, double max_rec_width, Float128 y_min) {
// 5. Draw records, update cur_{x,y}_{min,max}. // 5. Draw records, update cur_{x,y}_{min,max}.
var ctx = chart.ctx; var ctx = chart.ctx;
var joint_y = chart.joint_y; var joint_y = chart.joint_y;
@ -680,14 +654,14 @@ namespace CairoChart {
if (joint_y) chart.color = chart.joint_color; if (joint_y) chart.color = chart.joint_color;
else chart.color = color; else chart.color = color;
var text = format.printf((LongDouble)y); var text = format.printf((LongDouble)y);
var scr_y = get_scr_y (y); var scr_y = scr_pos (y);
var text_t = new Text(chart, text, font, color); var text_t = new Text(chart, text, font, color);
switch (position) { switch (position) {
case Axis.Position.LOW: case Axis.Position.LOW:
ctx.move_to (chart.evarea.x0 + max_rec_width - text_t.width + font.hspacing ctx.move_to (chart.evarea.x0 + max_rec_width - text_t.width + font.hspacing
+ (title.text == "" ? 0 : title.width + font.hspacing), + (title.text == "" ? 0 : title.width + font.hspacing),
compact_rec_y_pos (y, text_t)); compact_rec_pos (y, text_t));
text_t.show(); text_t.show();
// 6. Draw grid lines to the ser.axis_x.place.zmin. // 6. Draw grid lines to the ser.axis_x.place.zmin.
var grid_style = ser.grid.style; var grid_style = ser.grid.style;
@ -703,7 +677,7 @@ namespace CairoChart {
case Axis.Position.HIGH: case Axis.Position.HIGH:
ctx.move_to (chart.evarea.x1 - text_t.width - font.hspacing ctx.move_to (chart.evarea.x1 - text_t.width - font.hspacing
- (title.text == "" ? 0 : title.width + font.hspacing), - (title.text == "" ? 0 : title.width + font.hspacing),
compact_rec_y_pos (y, text_t)); compact_rec_pos (y, text_t));
text_t.show(); text_t.show();
// 6. Draw grid lines to the ser.axis_x.place.zmax. // 6. Draw grid lines to the ser.axis_x.place.zmax.
var grid_style = ser.grid.style; var grid_style = ser.grid.style;

12
src/Chart.vala
View File

@ -191,11 +191,11 @@ namespace CairoChart {
public virtual void zoom_in (Area area) { public virtual void zoom_in (Area area) {
foreach (var s in series) { foreach (var s in series) {
if (!s.zoom_show) continue; if (!s.zoom_show) continue;
var real_x0 = s.axis_x.get_real_x (area.x0); var real_x0 = s.axis_x.axis_val (area.x0);
var real_x1 = s.axis_x.get_real_x (area.x1); var real_x1 = s.axis_x.axis_val (area.x1);
var real_width = real_x1 - real_x0; var real_width = real_x1 - real_x0;
var real_y0 = s.axis_y.get_real_y (area.y0); var real_y0 = s.axis_y.axis_val (area.y0);
var real_y1 = s.axis_y.get_real_y (area.y1); var real_y1 = s.axis_y.axis_val (area.y1);
var real_height = real_y0 - real_y1; var real_height = real_y0 - real_y1;
// if selected square does not intersect with the series's square // if selected square does not intersect with the series's square
if ( real_x1 <= s.axis_x.range.zmin || real_x0 >= s.axis_x.range.zmax if ( real_x1 <= s.axis_x.range.zmin || real_x0 >= s.axis_x.range.zmax
@ -374,11 +374,11 @@ namespace CairoChart {
} }
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].axis_x.draw_horizontal_axis (ref nskip); series[si].axis_x.draw_haxis (ref nskip);
} }
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].axis_y.draw_vertical_axis (ref nskip); series[si].axis_y.draw_vaxis (ref nskip);
} }
protected virtual void draw_series () { protected virtual void draw_series () {
foreach (var s in series) foreach (var s in series)

26
src/Cursor.vala
View File

@ -158,7 +158,7 @@ namespace CairoChart {
Float128 y = 0; Float128 y = 0;
if (Math.vcross(s.get_scr_point(points[i]), s.get_scr_point(points[i+1]), rel2scr_x(c.x), if (Math.vcross(s.get_scr_point(points[i]), s.get_scr_point(points[i+1]), rel2scr_x(c.x),
chart.plarea.y0, chart.plarea.y1, out y)) { chart.plarea.y0, chart.plarea.y1, out y)) {
var point = Point128(s.axis_x.get_real_x(rel2scr_x(c.x)), s.axis_y.get_real_y(y)); var point = Point128(s.axis_x.axis_val(rel2scr_x(c.x)), s.axis_y.axis_val(y));
Point128 size; bool show_x, show_date, show_time, show_y; Point128 size; bool show_x, show_date, show_time, show_y;
cross_what_to_show(s, out show_x, out show_time, out show_date, out show_y); cross_what_to_show(s, out show_x, out show_time, out show_date, out show_y);
calc_cross_sizes (s, point, out size, show_x, show_time, show_date, show_y); calc_cross_sizes (s, point, out size, show_x, show_time, show_date, show_y);
@ -170,7 +170,7 @@ namespace CairoChart {
Float128 x = 0; Float128 x = 0;
if (Math.hcross(s.get_scr_point(points[i]), s.get_scr_point(points[i+1]), if (Math.hcross(s.get_scr_point(points[i]), s.get_scr_point(points[i+1]),
chart.plarea.x0, chart.plarea.x1, rel2scr_y(c.y), out x)) { chart.plarea.x0, chart.plarea.x1, rel2scr_y(c.y), out x)) {
var point = Point128(s.axis_x.get_real_x(x), s.axis_y.get_real_y(rel2scr_y(c.y))); var point = Point128(s.axis_x.axis_val(x), s.axis_y.axis_val(rel2scr_y(c.y)));
Point128 size; bool show_x, show_date, show_time, show_y; Point128 size; bool show_x, show_date, show_time, show_y;
cross_what_to_show(s, out show_x, out show_time, out show_date, out show_y); cross_what_to_show(s, out show_x, out show_time, out show_date, out show_y);
calc_cross_sizes (s, point, out size, show_x, show_time, show_date, show_y); calc_cross_sizes (s, point, out size, show_x, show_time, show_date, show_y);
@ -249,7 +249,7 @@ namespace CairoChart {
// show joint X value // show joint X value
if (chart.joint_x) { if (chart.joint_x) {
var s = chart.series[chart.zoom_1st_idx]; var s = chart.series[chart.zoom_1st_idx];
var x = s.axis_x.get_real_x(rel2scr_x(c.x)); var x = s.axis_x.axis_val(rel2scr_x(c.x));
string text = "", time_text = ""; string text = "", time_text = "";
switch (s.axis_x.dtype) { switch (s.axis_x.dtype) {
case Axis.DType.NUMBERS: text = s.axis_x.format.printf((LongDouble)x); break; case Axis.DType.NUMBERS: text = s.axis_x.format.printf((LongDouble)x); break;
@ -279,7 +279,7 @@ namespace CairoChart {
} }
break; break;
} }
var print_x = s.axis_x.compact_rec_x_pos (x, text_t); var print_x = s.axis_x.compact_rec_pos (x, text_t);
chart.ctx.move_to (print_x, print_y); chart.ctx.move_to (print_x, print_y);
switch (s.axis_x.dtype) { switch (s.axis_x.dtype) {
@ -288,7 +288,7 @@ namespace CairoChart {
break; break;
case Axis.DType.DATE_TIME: case Axis.DType.DATE_TIME:
if (s.axis_x.date_format != "") text_t.show(); if (s.axis_x.date_format != "") text_t.show();
print_x = s.axis_x.compact_rec_x_pos (x, time_text_t); print_x = s.axis_x.compact_rec_pos (x, time_text_t);
chart.ctx.move_to (print_x, print_y - (s.axis_x.date_format == "" ? 0 : text_t.height + s.axis_x.font.vspacing)); chart.ctx.move_to (print_x, print_y - (s.axis_x.date_format == "" ? 0 : text_t.height + s.axis_x.font.vspacing));
if (s.axis_x.time_format != "") time_text_t.show(); if (s.axis_x.time_format != "") time_text_t.show();
break; break;
@ -303,9 +303,9 @@ namespace CairoChart {
// show joint Y value // show joint Y value
if (chart.joint_y) { if (chart.joint_y) {
var s = chart.series[chart.zoom_1st_idx]; var s = chart.series[chart.zoom_1st_idx];
var y = s.axis_y.get_real_y(rel2scr_y(c.y)); var y = s.axis_y.axis_val(rel2scr_y(c.y));
var text_t = new Text(chart, s.axis_y.format.printf((LongDouble)y, s.axis_y.font)); var text_t = new Text(chart, s.axis_y.format.printf((LongDouble)y, s.axis_y.font));
var print_y = s.axis_y.compact_rec_y_pos (y, text_t); var print_y = s.axis_y.compact_rec_pos (y, text_t);
var print_x = 0.0; var print_x = 0.0;
switch (s.axis_y.position) { switch (s.axis_y.position) {
case Axis.Position.LOW: case Axis.Position.LOW:
@ -392,12 +392,12 @@ namespace CairoChart {
if (chart.series.length == 0) return false; if (chart.series.length == 0) return false;
if (list.length() + (is_cursor_active ? 1 : 0) != 2) return false; if (list.length() + (is_cursor_active ? 1 : 0) != 2) return false;
if (chart.joint_x && style.orientation == Orientation.VERTICAL) { if (chart.joint_x && style.orientation == Orientation.VERTICAL) {
Float128 val1 = chart.series[chart.zoom_1st_idx].axis_x.get_real_x(rel2scr_x(list.nth_data(0).x)); Float128 val1 = chart.series[chart.zoom_1st_idx].axis_x.axis_val(rel2scr_x(list.nth_data(0).x));
Float128 val2 = 0; Float128 val2 = 0;
if (is_cursor_active) if (is_cursor_active)
val2 = chart.series[chart.zoom_1st_idx].axis_x.get_real_x(rel2scr_x(active_cursor.x)); val2 = chart.series[chart.zoom_1st_idx].axis_x.axis_val(rel2scr_x(active_cursor.x));
else else
val2 = chart.series[chart.zoom_1st_idx].axis_x.get_real_x(rel2scr_x(list.nth_data(1).x)); val2 = chart.series[chart.zoom_1st_idx].axis_x.axis_val(rel2scr_x(list.nth_data(1).x));
if (val2 > val1) if (val2 > val1)
delta = val2 - val1; delta = val2 - val1;
else else
@ -405,12 +405,12 @@ namespace CairoChart {
return true; return true;
} }
if (chart.joint_y && style.orientation == Orientation.HORIZONTAL) { if (chart.joint_y && style.orientation == Orientation.HORIZONTAL) {
Float128 val1 = chart.series[chart.zoom_1st_idx].axis_y.get_real_y(rel2scr_y(list.nth_data(0).y)); Float128 val1 = chart.series[chart.zoom_1st_idx].axis_y.axis_val(rel2scr_y(list.nth_data(0).y));
Float128 val2 = 0; Float128 val2 = 0;
if (is_cursor_active) if (is_cursor_active)
val2 = chart.series[chart.zoom_1st_idx].axis_y.get_real_y(rel2scr_y(active_cursor.y)); val2 = chart.series[chart.zoom_1st_idx].axis_y.axis_val(rel2scr_y(active_cursor.y));
else else
val2 = chart.series[chart.zoom_1st_idx].axis_y.get_real_y(rel2scr_y(list.nth_data(1).y)); val2 = chart.series[chart.zoom_1st_idx].axis_y.axis_val(rel2scr_y(list.nth_data(1).y));
if (val2 > val1) if (val2 > val1)
delta = val2 - val1; delta = val2 - val1;
else else

8
src/Series.vala
View File

@ -96,8 +96,8 @@ namespace CairoChart {
public Series (Chart chart) { public Series (Chart chart) {
this.chart = chart; this.chart = chart;
title = new Text(chart); title = new Text(chart);
axis_x = new Axis(chart, this); axis_x = new Axis(chart, this, true);
axis_y = new Axis(chart, this); axis_y = new Axis(chart, this, false);
this.marker = new Marker(chart); this.marker = new Marker(chart);
} }
@ -152,7 +152,7 @@ namespace CairoChart {
* @param p real ``Series`` (X;Y) value. * @param p real ``Series`` (X;Y) value.
*/ */
public virtual Point get_scr_point (Point128 p) { public virtual Point get_scr_point (Point128 p) {
return Point(axis_x.get_scr_x(p.x), axis_y.get_scr_y(p.y)); return Point(axis_x.scr_pos(p.x), axis_y.scr_pos(p.y));
} }
/** /**
@ -160,7 +160,7 @@ namespace CairoChart {
* @param p (X;Y) screen point. * @param p (X;Y) screen point.
*/ */
public virtual Point128 get_real_point (Point p) { public virtual Point128 get_real_point (Point p) {
return Point128 (axis_x.get_real_x(p.x), axis_y.get_real_y(p.y)); return Point128 (axis_x.axis_val(p.x), axis_y.axis_val(p.y));
} }
/** /**