From 272cefc395574d98f4ef98a9f1a72a29c5f56245 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Fri, 19 Jan 2018 10:52:06 +0300 Subject: [PATCH] In progress... --- src/Axis.vala | 4 +-- src/Chart.vala | 18 +++++----- src/Cursor.vala | 38 ++++++++++----------- src/Legend.vala | 6 ++-- src/Series.vala | 90 ++++++++++++++++++++++++------------------------- 5 files changed, 78 insertions(+), 78 deletions(-) diff --git a/src/Axis.vala b/src/Axis.vala index 7da63ab..34aac0e 100644 --- a/src/Axis.vala +++ b/src/Axis.vala @@ -75,7 +75,7 @@ namespace CairoChart { public Font.Style font_style = Font.Style (); public Color color = Color (); public Line.Style line_style = Line.Style (); - public double font_indent = 5; + public double font_spacing = 5; public virtual Axis copy () { var axis = new Axis (); @@ -84,7 +84,7 @@ namespace CairoChart { axis._format = this._format; axis._time_format = this._time_format; axis.color = this.color; - axis.font_indent = this.font_indent; + axis.font_spacing = this.font_spacing; axis.font_style = this.font_style; axis.line_style = this.line_style; axis.max = this.max; diff --git a/src/Chart.vala b/src/Chart.vala index 83435a4..f8beae1 100644 --- a/src/Chart.vala +++ b/src/Chart.vala @@ -98,10 +98,10 @@ namespace CairoChart { } /** - * TODO: remove all indent fields / evaluate automatically. + * TODO: remove all spacing fields / evaluate automatically. */ [Version (deprecated = true)] - public double title_indent = 4; + public double title_spacing = 4; /** * Constructs a new ``Chart``. @@ -129,7 +129,7 @@ namespace CairoChart { chart.selection_style = this.selection_style; chart.series = this.series; chart.title = this.title.copy(); - chart.title_indent = this.title_indent; + chart.title_spacing = this.title_spacing; chart.zoom = this.zoom; chart.zoom_1st_idx = this.zoom_1st_idx; return chart; @@ -314,10 +314,10 @@ namespace CairoChart { } protected virtual void eval_plarea () { - plarea.x = evarea.x + legend.indent; - plarea.width = evarea.width - 2 * legend.indent; - plarea.y = evarea.y + legend.indent; - plarea.height = evarea.height - 2 * legend.indent; + plarea.x = evarea.x + legend.spacing; + plarea.width = evarea.width - 2 * legend.spacing; + plarea.y = evarea.y + legend.spacing; + plarea.height = evarea.height - 2 * legend.spacing; // Check for joint axes joint_x = joint_y = true; @@ -350,11 +350,11 @@ namespace CairoChart { } protected virtual void draw_title () { var sz = title.get_size(ctx); - var title_height = sz.height + (legend.position == Legend.Position.TOP ? title_indent * 2 : title_indent); + var title_height = sz.height + (legend.position == Legend.Position.TOP ? title_spacing * 2 : title_spacing); evarea.y += title_height; evarea.height -= title_height; color = title.color; - ctx.move_to (area.width/2 - sz.width/2, sz.height + title_indent); + ctx.move_to (area.width/2 - sz.width/2, sz.height + title_spacing); title.show(ctx); } protected virtual void draw_haxes () { diff --git a/src/Cursor.vala b/src/Cursor.vala index eced020..fe6f2dd 100644 --- a/src/Cursor.vala +++ b/src/Cursor.vala @@ -232,8 +232,8 @@ namespace CairoChart { if (show_date) { var sz = date_t.get_size(chart.ctx); size.x = sz.width; h_x = sz.height; } if (show_time) { var sz = time_t.get_size(chart.ctx); size.x = double.max(size.x, sz.width); h_x += sz.height; } if (show_y) { var sz = y_t.get_size(chart.ctx); size.x += sz.width; h_y = sz.height; } - if ((show_x || show_date || show_time) && show_y) size.x += double.max(s.axis_x.font_indent, s.axis_y.font_indent); - if (show_date && show_time) h_x += s.axis_x.font_indent; + if ((show_x || show_date || show_time) && show_y) size.x += double.max(s.axis_x.font_spacing, s.axis_y.font_spacing); + if (show_date && show_time) h_x += s.axis_x.font_spacing; size.y = double.max (h_x, h_y); } @@ -261,21 +261,21 @@ namespace CairoChart { if (chart.joint_x) { switch (s.axis_x.position) { - case Axis.Position.LOW: high.y = chart.plarea.y + chart.plarea.height + s.axis_x.font_indent; break; - case Axis.Position.HIGH: low.y = chart.plarea.y - s.axis_x.font_indent; break; + case Axis.Position.LOW: high.y = chart.plarea.y + chart.plarea.height + s.axis_x.font_spacing; break; + case Axis.Position.HIGH: low.y = chart.plarea.y - s.axis_x.font_spacing; break; case Axis.Position.BOTH: - high.y = chart.plarea.y + chart.plarea.height + s.axis_x.font_indent; - low.y = chart.plarea.y - s.axis_x.font_indent; + high.y = chart.plarea.y + chart.plarea.height + s.axis_x.font_spacing; + low.y = chart.plarea.y - s.axis_x.font_spacing; break; } } if (chart.joint_y) { switch (s.axis_y.position) { - case Axis.Position.LOW: low.x = chart.plarea.x - s.axis_y.font_indent; break; - case Axis.Position.HIGH: high.x = chart.plarea.x + chart.plarea.width + s.axis_y.font_indent; break; + case Axis.Position.LOW: low.x = chart.plarea.x - s.axis_y.font_spacing; break; + case Axis.Position.HIGH: high.x = chart.plarea.x + chart.plarea.width + s.axis_y.font_spacing; break; case Axis.Position.BOTH: - low.x = chart.plarea.x - s.axis_y.font_indent; - high.x = chart.plarea.x + chart.plarea.width + s.axis_y.font_indent; + low.x = chart.plarea.x - s.axis_y.font_spacing; + high.x = chart.plarea.x + chart.plarea.width + s.axis_y.font_spacing; break; } } @@ -312,13 +312,13 @@ namespace CairoChart { var time_text_t = new Text(time_text, s.axis_x.font_style, s.axis_x.color); var print_y = 0.0; switch (s.axis_x.position) { - case Axis.Position.LOW: print_y = chart.area.y + chart.area.height - s.axis_x.font_indent + case Axis.Position.LOW: print_y = chart.area.y + chart.area.height - s.axis_x.font_spacing - (chart.legend.position == Legend.Position.BOTTOM ? chart.legend.height : 0); break; case Axis.Position.HIGH: var title_height = chart.title.get_height(chart.ctx) + (chart.legend.position == Legend.Position.TOP ? - chart.title_indent * 2 : chart.title_indent); - print_y = chart.area.y + title_height + s.axis_x.font_indent + chart.title_spacing * 2 : chart.title_spacing); + print_y = chart.area.y + title_height + s.axis_x.font_spacing + (chart.legend.position == Legend.Position.TOP ? chart.legend.height : 0); switch (s.axis_x.type) { case Axis.Type.NUMBERS: @@ -327,7 +327,7 @@ namespace CairoChart { case Axis.Type.DATE_TIME: print_y += (s.axis_x.date_format == "" ? 0 : sz.height) + (s.axis_x.time_format == "" ? 0 : time_text_t.get_height(chart.ctx)) - + (s.axis_x.date_format == "" || s.axis_x.time_format == "" ? 0 : s.axis_x.font_indent); + + (s.axis_x.date_format == "" || s.axis_x.time_format == "" ? 0 : s.axis_x.font_spacing); break; } break; @@ -342,7 +342,7 @@ namespace CairoChart { case Axis.Type.DATE_TIME: if (s.axis_x.date_format != "") text_t.show(chart.ctx); print_x = s.compact_rec_x_pos (x, time_text_t); - chart.ctx.move_to (print_x, print_y - (s.axis_x.date_format == "" ? 0 : sz.height + s.axis_x.font_indent)); + chart.ctx.move_to (print_x, print_y - (s.axis_x.date_format == "" ? 0 : sz.height + s.axis_x.font_spacing)); if (s.axis_x.time_format != "") time_text_t.show(chart.ctx); break; } @@ -362,11 +362,11 @@ namespace CairoChart { var print_x = 0.0; switch (s.axis_y.position) { case Axis.Position.LOW: - print_x = chart.area.x + s.axis_y.font_indent + print_x = chart.area.x + s.axis_y.font_spacing + (chart.legend.position == Legend.Position.LEFT ? chart.legend.width : 0); break; case Axis.Position.HIGH: - print_x = chart.area.x + chart.area.width - text_t.get_width(chart.ctx) - s.axis_y.font_indent + print_x = chart.area.x + chart.area.width - text_t.get_width(chart.ctx) - s.axis_y.font_spacing - (chart.legend.position == Legend.Position.RIGHT ? chart.legend.width : 0); break; } @@ -408,7 +408,7 @@ namespace CairoChart { var text_t = new Text(time, s.axis_x.font_style); var sz = text_t.get_size(chart.ctx); var y = svp.y + sz.height / 2; - if (show_date) y -= sz.height / 2 + s.axis_x.font_indent / 2; + if (show_date) y -= sz.height / 2 + s.axis_x.font_spacing / 2; chart.ctx.move_to (svp.x - size.x / 2, y); if (chart.joint_x) chart.color = chart.joint_color; text_t.show(chart.ctx); @@ -421,7 +421,7 @@ namespace CairoChart { var text_t = new Text(date, s.axis_x.font_style); var sz = text_t.get_size(chart.ctx); var y = svp.y + sz.height / 2; - if (show_time) y += sz.height / 2 + s.axis_x.font_indent / 2; + if (show_time) y += sz.height / 2 + s.axis_x.font_spacing / 2; chart.ctx.move_to (svp.x - size.x / 2, y); if (chart.joint_x) chart.color = chart.joint_color; text_t.show(chart.ctx); diff --git a/src/Legend.vala b/src/Legend.vala index 538e15a..7787321 100644 --- a/src/Legend.vala +++ b/src/Legend.vala @@ -13,7 +13,7 @@ namespace CairoChart { public Font.Style font_style = Font.Style(); public Color bg_color = Color(1, 1, 1); public Line.Style border_style = Line.Style (); - public double indent = 5; + public double spacing = 5; public double width = 0; public double height = 0; public double line_length = 30.0; @@ -26,7 +26,7 @@ namespace CairoChart { legend.position = this.position; legend.font_style = this.font_style; legend.bg_color = this.bg_color; - legend.indent = this.indent; + legend.spacing = this.spacing; legend.height = this.height; legend.line_length = this.line_length; legend.text_hspace = this.text_hspace; @@ -53,7 +53,7 @@ namespace CairoChart { case Position.TOP: x0 = (chart.area.width - width) / 2; var title_height = chart.title.get_height(chart.ctx) + (chart.legend.position == Legend.Position.TOP ? - chart.title_indent * 2 : chart.title_indent); + chart.title_spacing * 2 : chart.title_spacing); y0 = title_height; break; diff --git a/src/Series.vala b/src/Series.vala index 57d999f..9493c79 100644 --- a/src/Series.vala +++ b/src/Series.vala @@ -122,14 +122,14 @@ namespace CairoChart { if (nskip != 0) {--nskip; return;} double max_rec_width = 0; double max_rec_height = 0; axis.calc_rec_sizes (chart, out max_rec_width, out max_rec_height, is_x); - var max_font_indent = axis.font_indent; - var max_axis_font_width = axis.title.text == "" ? 0 : axis.title.get_width(chart.ctx) + axis.font_indent; - var max_axis_font_height = axis.title.text == "" ? 0 : axis.title.get_height(chart.ctx) + axis.font_indent; + var max_font_spacing = axis.font_spacing; + var max_axis_font_width = axis.title.text == "" ? 0 : axis.title.get_width(chart.ctx) + axis.font_spacing; + var max_axis_font_height = axis.title.text == "" ? 0 : axis.title.get_height(chart.ctx) + axis.font_spacing; if (is_x) - s.join_relative_x_axes (si, true, ref max_rec_width, ref max_rec_height, ref max_font_indent, ref max_axis_font_height, ref nskip); + s.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); else - s.join_relative_y_axes (si, true, ref max_rec_width, ref max_rec_height, ref max_font_indent, ref max_axis_font_width, ref nskip); + s.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); // for 4.2. Cursor values for joint X axis if (si == chart.zoom_1st_idx && chart.cursors.cursors_crossings.length != 0) { @@ -137,9 +137,9 @@ namespace CairoChart { case Cursors.Orientation.VERTICAL: if (is_x && chart.joint_x) switch (axis.position) { - case Axis.Position.LOW: chart.plarea.height -= max_rec_height + axis.font_indent; break; + case Axis.Position.LOW: chart.plarea.height -= max_rec_height + axis.font_spacing; break; case Axis.Position.HIGH: - var tmp = max_rec_height + axis.font_indent; + var tmp = max_rec_height + axis.font_spacing; chart.plarea.y += tmp; chart.plarea.height -= tmp; break; } @@ -148,29 +148,29 @@ namespace CairoChart { if (!is_x && chart.joint_y) switch (s.axis_y.position) { case Axis.Position.LOW: - var tmp = max_rec_width + s.axis_y.font_indent; + var tmp = max_rec_width + s.axis_y.font_spacing; chart.plarea.x += tmp; chart.plarea.width -= tmp; break; - case Axis.Position.HIGH: chart.plarea.width -= max_rec_width + s.axis_y.font_indent; break; + case Axis.Position.HIGH: chart.plarea.width -= max_rec_width + s.axis_y.font_spacing; break; } break; } } if (is_x && (!chart.joint_x || si == chart.zoom_1st_idx)) switch (axis.position) { - case Axis.Position.LOW: chart.plarea.height -= max_rec_height + max_font_indent + max_axis_font_height; break; + case Axis.Position.LOW: chart.plarea.height -= max_rec_height + max_font_spacing + max_axis_font_height; break; case Axis.Position.HIGH: - var tmp = max_rec_height + max_font_indent + max_axis_font_height; + var tmp = max_rec_height + max_font_spacing + max_axis_font_height; chart.plarea.y += tmp; chart.plarea.height -= tmp; break; } if (!is_x && (!chart.joint_y || si == chart.zoom_1st_idx)) switch (s.axis_y.position) { case Axis.Position.LOW: - var tmp = max_rec_width + max_font_indent + max_axis_font_width; + var tmp = max_rec_width + max_font_spacing + max_axis_font_width; chart.plarea.x += tmp; chart.plarea.width -= tmp; break; - case Axis.Position.HIGH: chart.plarea.width -= max_rec_width + max_font_indent + max_axis_font_width; break; + case Axis.Position.HIGH: chart.plarea.width -= max_rec_width + max_font_spacing + max_axis_font_width; break; } } @@ -178,7 +178,7 @@ namespace CairoChart { bool calc_max_values, ref double max_rec_width, ref double max_rec_height, - ref double max_font_indent, + ref double max_font_spacing, ref double max_axis_font_height, ref int nskip) { for (int sj = si - 1; sj >= 0; --sj) { @@ -201,9 +201,9 @@ namespace CairoChart { s2.axis_x.calc_rec_sizes (chart, out tmp_max_rec_width, out tmp_max_rec_height, true); max_rec_width = double.max (max_rec_width, tmp_max_rec_width); max_rec_height = double.max (max_rec_height, tmp_max_rec_height); - max_font_indent = double.max (max_font_indent, s2.axis_x.font_indent); + max_font_spacing = double.max (max_font_spacing, s2.axis_x.font_spacing); max_axis_font_height = double.max (max_axis_font_height, s2.axis_x.title.text == "" ? 0 : - s2.axis_x.title.get_height(chart.ctx) + this.axis_x.font_indent); + s2.axis_x.title.get_height(chart.ctx) + this.axis_x.font_spacing); } ++nskip; } else { @@ -216,7 +216,7 @@ namespace CairoChart { bool calc_max_values, ref double max_rec_width, ref double max_rec_height, - ref double max_font_indent, + ref double max_font_spacing, ref double max_axis_font_width, ref int nskip) { for (int sj = si - 1; sj >= 0; --sj) { @@ -238,9 +238,9 @@ namespace CairoChart { s2.axis_y.calc_rec_sizes (chart, out tmp_max_rec_width, out tmp_max_rec_height, false); max_rec_width = double.max (max_rec_width, tmp_max_rec_width); max_rec_height = double.max (max_rec_height, tmp_max_rec_height); - max_font_indent = double.max (max_font_indent, s2.axis_y.font_indent); + max_font_spacing = double.max (max_font_spacing, s2.axis_y.font_spacing); max_axis_font_width = double.max (max_axis_font_width, s2.axis_y.title.text == "" ? 0 - : s2.axis_y.title.get_width(chart.ctx) + this.axis_y.font_indent); + : s2.axis_y.title.get_width(chart.ctx) + this.axis_y.font_spacing); ++nskip; } else { break; @@ -271,7 +271,7 @@ namespace CairoChart { switch (axis_x.position) { case Axis.Position.LOW: - var print_y = chart.evarea.y + chart.evarea.height - axis_x.font_indent - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); + var print_y = chart.evarea.y + chart.evarea.height - axis_x.font_spacing - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_spacing); var print_x = compact_rec_x_pos (x, text_t); ctx.move_to (print_x, print_y); switch (axis_x.type) { @@ -282,7 +282,7 @@ namespace CairoChart { if (axis_x.date_format != "") text_t.show(ctx); var time_text_t = new Text(time_text, axis_x.font_style, axis_x.color); print_x = compact_rec_x_pos (x, time_text_t); - ctx.move_to (print_x, print_y - (axis_x.date_format == "" ? 0 : text_t.get_height(ctx) + axis_x.font_indent)); + ctx.move_to (print_x, print_y - (axis_x.date_format == "" ? 0 : text_t.get_height(ctx) + axis_x.font_spacing)); if (axis_x.time_format != "") time_text_t.show(ctx); break; } @@ -290,7 +290,7 @@ namespace CairoChart { var line_style = grid.line_style; if (joint_x) line_style.color = Color(0, 0, 0, 0.5); line_style.set(chart); - double y = chart.evarea.y + chart.evarea.height - max_rec_height - axis_x.font_indent - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); + double y = chart.evarea.y + chart.evarea.height - max_rec_height - axis_x.font_spacing - (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_spacing); ctx.move_to (scr_x, y); if (joint_x) ctx.line_to (scr_x, chart.plarea.y); @@ -298,7 +298,7 @@ namespace CairoChart { ctx.line_to (scr_x, double.min (y, chart.plarea.y + chart.plarea.height * (1.0 - place.zoom_y_max))); break; case Axis.Position.HIGH: - var print_y = chart.evarea.y + max_rec_height + axis_x.font_indent + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); + var print_y = chart.evarea.y + max_rec_height + axis_x.font_spacing + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_spacing); var print_x = compact_rec_x_pos (x, text_t); ctx.move_to (print_x, print_y); @@ -310,7 +310,7 @@ namespace CairoChart { if (axis_x.date_format != "") text_t.show(ctx); var time_text_t = new Text(time_text, axis_x.font_style, axis_x.color); print_x = compact_rec_x_pos (x, time_text_t); - ctx.move_to (print_x, print_y - (axis_x.date_format == "" ? 0 : text_t.get_height(ctx) + axis_x.font_indent)); + ctx.move_to (print_x, print_y - (axis_x.date_format == "" ? 0 : text_t.get_height(ctx) + axis_x.font_spacing)); if (axis_x.time_format != "") time_text_t.show(ctx); break; } @@ -318,7 +318,7 @@ namespace CairoChart { var line_style = grid.line_style; if (joint_x) line_style.color = Color(0, 0, 0, 0.5); line_style.set(chart); - double y = chart.evarea.y + max_rec_height + axis_x.font_indent + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_indent); + double y = chart.evarea.y + max_rec_height + axis_x.font_spacing + (axis_x.title.text == "" ? 0 : sz.height + axis_x.font_spacing); ctx.move_to (scr_x, y); if (joint_x) ctx.line_to (scr_x, chart.plarea.y + chart.plarea.height); @@ -361,8 +361,8 @@ namespace CairoChart { // 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) { switch (s.axis_x.position) { - case Axis.Position.LOW: chart.evarea.height -= max_rec_height + s.axis_x.font_indent; break; - case Axis.Position.HIGH: var tmp = max_rec_height + s.axis_x.font_indent; chart.evarea.y += tmp; chart.evarea.height -= tmp; break; + case Axis.Position.LOW: chart.evarea.height -= max_rec_height + s.axis_x.font_spacing; break; + case Axis.Position.HIGH: var tmp = max_rec_height + s.axis_x.font_spacing; chart.evarea.y += tmp; chart.evarea.height -= tmp; break; } } @@ -373,8 +373,8 @@ namespace CairoChart { var scr_x = chart.plarea.x + chart.plarea.width * (s.place.zoom_x_min + s.place.zoom_x_max) / 2.0; double scr_y = 0.0; switch (s.axis_x.position) { - case Axis.Position.LOW: scr_y = chart.evarea.y + chart.evarea.height - s.axis_x.font_indent; break; - case Axis.Position.HIGH: scr_y = chart.evarea.y + s.axis_x.font_indent + sz.height; break; + case Axis.Position.LOW: scr_y = chart.evarea.y + chart.evarea.height - s.axis_x.font_spacing; break; + case Axis.Position.HIGH: scr_y = chart.evarea.y + s.axis_x.font_spacing + sz.height; break; } chart.ctx.move_to(scr_x - sz.width / 2.0, scr_y); chart.color = s.axis_x.color; @@ -393,11 +393,11 @@ namespace CairoChart { switch (s.axis_x.position) { case Axis.Position.LOW: - chart.evarea.height -= max_rec_height + s.axis_x.font_indent - + (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_indent); + chart.evarea.height -= max_rec_height + s.axis_x.font_spacing + + (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_spacing); break; case Axis.Position.HIGH: - var tmp = max_rec_height + s.axis_x.font_indent + (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_indent); + var tmp = max_rec_height + s.axis_x.font_spacing + (s.axis_x.title.text == "" ? 0 : sz.height + s.axis_x.font_spacing); chart.evarea.y += tmp; chart.evarea.height -= tmp; break; } @@ -419,15 +419,15 @@ namespace CairoChart { switch (axis_y.position) { case Axis.Position.LOW: - ctx.move_to (chart.evarea.x + max_rec_width - text_sz.width + axis_y.font_indent - + (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent), + ctx.move_to (chart.evarea.x + max_rec_width - text_sz.width + axis_y.font_spacing + + (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_spacing), compact_rec_y_pos (y, text_t)); text_t.show(ctx); // 6. Draw grid lines to the place.zoom_x_min. var line_style = grid.line_style; if (joint_y) line_style.color = Color(0, 0, 0, 0.5); line_style.set(chart); - double x = chart.evarea.x + max_rec_width + axis_y.font_indent + (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent); + double x = chart.evarea.x + max_rec_width + axis_y.font_spacing + (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_spacing); ctx.move_to (x, scr_y); if (joint_y) ctx.line_to (chart.plarea.x + chart.plarea.width, scr_y); @@ -435,15 +435,15 @@ namespace CairoChart { ctx.line_to (double.max (x, chart.plarea.x + chart.plarea.width * place.zoom_x_max), scr_y); break; case Axis.Position.HIGH: - ctx.move_to (chart.evarea.x + chart.evarea.width - text_sz.width - axis_y.font_indent - - (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent), + ctx.move_to (chart.evarea.x + chart.evarea.width - text_sz.width - axis_y.font_spacing + - (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_spacing), compact_rec_y_pos (y, text_t)); text_t.show(ctx); // 6. Draw grid lines to the place.zoom_x_max. var line_style = grid.line_style; if (joint_y) line_style.color = Color(0, 0, 0, 0.5); line_style.set(chart); - double x = chart.evarea.x + chart.evarea.width - max_rec_width - axis_y.font_indent - (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_indent); + double x = chart.evarea.x + chart.evarea.width - max_rec_width - axis_y.font_spacing - (axis_y.title.text == "" ? 0 : sz.width + axis_y.font_spacing); ctx.move_to (x, scr_y); if (joint_y) ctx.line_to (chart.plarea.x, scr_y); @@ -485,8 +485,8 @@ namespace CairoChart { // 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) { switch (s.axis_y.position) { - case Axis.Position.LOW: var tmp = max_rec_width + s.axis_y.font_indent; chart.evarea.x += tmp; chart.evarea.width -= tmp; break; - case Axis.Position.HIGH: chart.evarea.width -= max_rec_width + s.axis_y.font_indent; break; + case Axis.Position.LOW: var tmp = max_rec_width + s.axis_y.font_spacing; chart.evarea.x += tmp; chart.evarea.width -= tmp; break; + case Axis.Position.HIGH: chart.evarea.width -= max_rec_width + s.axis_y.font_spacing; break; } } @@ -497,11 +497,11 @@ namespace CairoChart { var scr_y = chart.plarea.y + chart.plarea.height * (1.0 - (s.place.zoom_y_min + s.place.zoom_y_max) / 2.0); switch (s.axis_y.position) { case Axis.Position.LOW: - var scr_x = chart.evarea.x + s.axis_y.font_indent + sz.width; + var scr_x = chart.evarea.x + s.axis_y.font_spacing + sz.width; chart.ctx.move_to(scr_x, scr_y + sz.height / 2.0); break; case Axis.Position.HIGH: - var scr_x = chart.evarea.x + chart.evarea.width - s.axis_y.font_indent; + var scr_x = chart.evarea.x + chart.evarea.width - s.axis_y.font_spacing; chart.ctx.move_to(scr_x, scr_y + sz.height / 2.0); break; } @@ -521,12 +521,12 @@ namespace CairoChart { switch (s.axis_y.position) { case Axis.Position.LOW: - var tmp = max_rec_width + s.axis_y.font_indent + (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent); + var tmp = max_rec_width + s.axis_y.font_spacing + (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_spacing); chart.evarea.x += tmp; chart.evarea.width -= tmp; break; case Axis.Position.HIGH: - chart.evarea.width -= max_rec_width + s.axis_y.font_indent - + (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent); break; + chart.evarea.width -= max_rec_width + s.axis_y.font_spacing + + (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_spacing); break; } }