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

Font style fixed in Text() calls.

This commit is contained in:
Kolan Sh 2017-12-15 17:15:15 +03:00
parent 90e17fbd16
commit f80401bd76
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/Chart.vala
View File

@ -471,8 +471,7 @@ namespace Gtk.CairoChart {
Float128 x = (int64)(axis.zoom_min + (axis.zoom_max - axis.zoom_min) / axis_rec_npoints * i) + 1.0/3.0; Float128 x = (int64)(axis.zoom_min + (axis.zoom_max - axis.zoom_min) / axis_rec_npoints * i) + 1.0/3.0;
switch (axis.type) { switch (axis.type) {
case Axis.Type.NUMBERS: case Axis.Type.NUMBERS:
var text = new Text (axis.format.printf((LongDouble)x) + (is_horizontal ? "_" : "")); var text = new Text (axis.format.printf((LongDouble)x) + (is_horizontal ? "_" : ""), axis.font_style);
text.style = axis.font_style;
max_rec_width = double.max (max_rec_width, text.get_width(context)); max_rec_width = double.max (max_rec_width, text.get_width(context));
max_rec_height = double.max (max_rec_height, text.get_height(context)); max_rec_height = double.max (max_rec_height, text.get_height(context));
break; break;
@ -480,17 +479,14 @@ namespace Gtk.CairoChart {
string date, time; string date, time;
format_date_time(axis, x, out date, out time); format_date_time(axis, x, out date, out time);
var text = new Text("");
var h = 0.0; var h = 0.0;
if (axis.date_format != "") { if (axis.date_format != "") {
text = new Text (date + (is_horizontal ? "_" : "")); var text = new Text (date + (is_horizontal ? "_" : ""), axis.font_style);
text.style = axis.font_style;
max_rec_width = double.max (max_rec_width, text.get_width(context)); max_rec_width = double.max (max_rec_width, text.get_width(context));
h = text.get_height(context); h = text.get_height(context);
} }
if (axis.time_format != "") { if (axis.time_format != "") {
text = new Text (time + (is_horizontal ? "_" : "")); var text = new Text (time + (is_horizontal ? "_" : ""), axis.font_style);
text.style = axis.font_style;
max_rec_width = double.max (max_rec_width, text.get_width(context)); max_rec_width = double.max (max_rec_width, text.get_width(context));
h += text.get_height(context); h += text.get_height(context);
} }
@ -932,9 +928,9 @@ namespace Gtk.CairoChart {
var text_t = new Text(text, s.axis_y.font_style, s.axis_y.color); var text_t = new Text(text, s.axis_y.font_style, s.axis_y.color);
switch (s.axis_y.position) { switch (s.axis_y.position) {
case Axis.Position.LOW: case Axis.Position.LOW:
context.move_to (cur_x_min + max_rec_width - (new Text(text)).get_width(context) + s.axis_y.font_indent - text_t.get_x_bearing(context) context.move_to (cur_x_min + max_rec_width - text_t.get_width(context) + s.axis_y.font_indent - text_t.get_x_bearing(context)
+ (s.axis_y.title.text == "" ? 0 : s.axis_y.title.get_width(context) + s.axis_y.font_indent), + (s.axis_y.title.text == "" ? 0 : s.axis_y.title.get_width(context) + s.axis_y.font_indent),
compact_rec_y_pos (s, y, new Text(text))); compact_rec_y_pos (s, y, text_t));
show_text(text_t); show_text(text_t);
// 6. Draw grid lines to the s.place.zoom_x_low. // 6. Draw grid lines to the s.place.zoom_x_low.
var line_style = s.grid.line_style; var line_style = s.grid.line_style;
@ -948,9 +944,9 @@ namespace Gtk.CairoChart {
context.line_to (double.max (x, plot_area_x_min + (plot_area_x_max - plot_area_x_min) * s.place.zoom_x_high), scr_y); context.line_to (double.max (x, plot_area_x_min + (plot_area_x_max - plot_area_x_min) * s.place.zoom_x_high), scr_y);
break; break;
case Axis.Position.HIGH: case Axis.Position.HIGH:
context.move_to (cur_x_max - (new Text(text)).get_width(context) - s.axis_y.font_indent - text_t.get_x_bearing(context) context.move_to (cur_x_max - text_t.get_width(context) - s.axis_y.font_indent - text_t.get_x_bearing(context)
- (s.axis_y.title.text == "" ? 0 : s.axis_y.title.get_width(context) + s.axis_y.font_indent), - (s.axis_y.title.text == "" ? 0 : s.axis_y.title.get_width(context) + s.axis_y.font_indent),
compact_rec_y_pos (s, y, new Text(text))); compact_rec_y_pos (s, y, text_t));
show_text(text_t); show_text(text_t);
// 6. Draw grid lines to the s.place.zoom_x_high. // 6. Draw grid lines to the s.place.zoom_x_high.
var line_style = s.grid.line_style; var line_style = s.grid.line_style;
@ -1541,7 +1537,7 @@ namespace Gtk.CairoChart {
if (common_y_axes) { if (common_y_axes) {
var s = series[zoom_first_show]; var s = series[zoom_first_show];
var y = get_real_y(s, rel2scr_y(c.y)); var y = get_real_y(s, rel2scr_y(c.y));
var text_t = new Text(s.axis_y.format.printf((LongDouble)y)); var text_t = new Text(s.axis_y.format.printf((LongDouble)y, s.axis_y.font_style));
var print_y = compact_rec_y_pos (s, y, text_t); var print_y = compact_rec_y_pos (s, y, text_t);
var print_x = 0.0; var print_x = 0.0;
switch (s.axis_y.position) { switch (s.axis_y.position) {
@ -1581,7 +1577,7 @@ namespace Gtk.CairoChart {
if (show_x) { if (show_x) {
set_source_rgba(s.axis_x.color); set_source_rgba(s.axis_x.color);
var text_t = new Text(s.axis_x.format.printf((LongDouble)point.x)); var text_t = new Text(s.axis_x.format.printf((LongDouble)point.x), s.axis_x.font_style);
context.move_to (svp.x - size.x / 2, svp.y + text_t.get_height(context) / 2); context.move_to (svp.x - size.x / 2, svp.y + text_t.get_height(context) / 2);
show_text(text_t); show_text(text_t);
context.stroke(); context.stroke();
@ -1591,7 +1587,7 @@ namespace Gtk.CairoChart {
set_source_rgba(s.axis_x.color); set_source_rgba(s.axis_x.color);
string date = "", time = ""; string date = "", time = "";
format_date_time(s.axis_x, point.x, out date, out time); format_date_time(s.axis_x, point.x, out date, out time);
var text_t = new Text(time); var text_t = new Text(time, s.axis_x.font_style);
var y = svp.y + text_t.get_height(context) / 2; var y = svp.y + text_t.get_height(context) / 2;
if (show_date) y -= text_t.get_height(context) / 2 + s.axis_x.font_indent / 2; if (show_date) y -= text_t.get_height(context) / 2 + s.axis_x.font_indent / 2;
context.move_to (svp.x - size.x / 2, y); context.move_to (svp.x - size.x / 2, y);
@ -1603,7 +1599,7 @@ namespace Gtk.CairoChart {
set_source_rgba(s.axis_x.color); set_source_rgba(s.axis_x.color);
string date = "", time = ""; string date = "", time = "";
format_date_time(s.axis_x, point.x, out date, out time); format_date_time(s.axis_x, point.x, out date, out time);
var text_t = new Text(date); var text_t = new Text(date, s.axis_x.font_style);
var y = svp.y + text_t.get_height(context) / 2; var y = svp.y + text_t.get_height(context) / 2;
if (show_time) y += text_t.get_height(context) / 2 + s.axis_x.font_indent / 2; if (show_time) y += text_t.get_height(context) / 2 + s.axis_x.font_indent / 2;
context.move_to (svp.x - size.x / 2, y); context.move_to (svp.x - size.x / 2, y);
@ -1613,7 +1609,7 @@ namespace Gtk.CairoChart {
if (show_y) { if (show_y) {
set_source_rgba(s.axis_y.color); set_source_rgba(s.axis_y.color);
var text_t = new Text(s.axis_y.format.printf((LongDouble)point.y)); var text_t = new Text(s.axis_y.format.printf((LongDouble)point.y), s.axis_y.font_style);
context.move_to (svp.x + size.x / 2 - text_t.get_width(context), svp.y + text_t.get_height(context) / 2); context.move_to (svp.x + size.x / 2 - text_t.get_width(context), svp.y + text_t.get_height(context) / 2);
show_text(text_t); show_text(text_t);
context.stroke(); context.stroke();

4
src/FontStyle.vala
View File

@ -15,11 +15,13 @@ namespace Gtk.CairoChart {
public FontStyle (string family = "Sans", public FontStyle (string family = "Sans",
Cairo.FontSlant slant = Cairo.FontSlant.NORMAL, Cairo.FontSlant slant = Cairo.FontSlant.NORMAL,
Cairo.FontWeight weight = Cairo.FontWeight.NORMAL, Cairo.FontWeight weight = Cairo.FontWeight.NORMAL,
double size = 10) { double size = 10,
FontOrient orientation = FontOrient.HORIZONTAL) {
this.family = family; this.family = family;
this.slant = slant; this.slant = slant;
this.weight = weight; this.weight = weight;
this.size = size; this.size = size;
this.orientation = orientation;
} }
} }
} }