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 17:38:51 +03:00
parent a0fd760218
commit 72c2be67d4
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Axis.vala
View File

@ -219,8 +219,6 @@ namespace CairoChart {
range.zoom_out(); range.zoom_out();
place.zoom_out(); place.zoom_out();
} }
//--------------------------------------------------------------------
/** /**
* Joins equal axes. * Joins equal axes.
@ -516,15 +514,13 @@ namespace CairoChart {
case Axis.Position.LOW: case Axis.Position.LOW:
if (is_x) { if (is_x) {
var print_y = chart.evarea.y1 - font.vspacing - tthv; var print_y = chart.evarea.y1 - font.vspacing - tthv;
var print_x = compact_rec_pos (v, text_t); chart.ctx.move_to (compact_rec_pos (v, text_t), print_y);
chart.ctx.move_to (print_x, print_y);
switch (dtype) { switch (dtype) {
case Axis.DType.NUMBERS: text_t.show(); break; case Axis.DType.NUMBERS: text_t.show(); break;
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_pos (v, time_text_t); chart.ctx.move_to (compact_rec_pos (v, time_text_t), print_y - (date_format == "" ? 0 : text_t.height + font.vspacing));
chart.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;
} }
@ -549,15 +545,13 @@ namespace CairoChart {
case Axis.Position.HIGH: case Axis.Position.HIGH:
if (is_x) { if (is_x) {
var print_y = chart.evarea.y0 + max_rec_size + font.vspacing + tthv; var print_y = chart.evarea.y0 + max_rec_size + font.vspacing + tthv;
var print_x = compact_rec_pos (v, text_t); chart.ctx.move_to (compact_rec_pos (v, text_t), print_y);
chart.ctx.move_to (print_x, print_y);
switch (dtype) { switch (dtype) {
case Axis.DType.NUMBERS: text_t.show(); break; case Axis.DType.NUMBERS: text_t.show(); break;
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_pos (v, time_text_t); chart.ctx.move_to (compact_rec_pos (v, time_text_t), print_y - (date_format == "" ? 0 : text_t.height + font.vspacing));
chart.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;
} }