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 18:27:09 +03:00
parent ea84cb3a0c
commit 6336779adc
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Axis.vala
View File

@ -499,8 +499,8 @@ namespace CairoChart {
if (is_x && chart.joint_x || !is_x && chart.joint_y) { if (is_x && chart.joint_x || !is_x && chart.joint_y) {
chart.color = chart.joint_color; chart.color = chart.joint_color;
ser.grid.style.color = Color(0, 0, 0, 0.5); ser.grid.style.color = Color(0, 0, 0, 0.5);
} } else
else chart.color = color; chart.color = color;
string text = "", time_text = ""; var time_text_t = new Text(chart); var crpt = 0.0; string text = "", time_text = ""; var time_text_t = new Text(chart); var crpt = 0.0;
switch (dtype) { switch (dtype) {
case Axis.DType.NUMBERS: text = format.printf((LongDouble)v); break; case Axis.DType.NUMBERS: text = format.printf((LongDouble)v); break;
@ -526,14 +526,12 @@ namespace CairoChart {
if (dtype == Axis.DType.DATE_TIME) if (dtype == Axis.DType.DATE_TIME)
{ chart.ctx.move_to (crpt, print_y - dtf); time_text_t.show(); } { chart.ctx.move_to (crpt, print_y - dtf); time_text_t.show(); }
ser.grid.style.apply(chart); ser.grid.style.apply(chart);
double y = ey1 - max_rec_size - tthv; double y = ey1 - max_rec_size - tthv; chart.ctx.move_to (scr_v, y);
chart.ctx.move_to (scr_v, y);
if (chart.joint_x) chart.ctx.line_to (scr_v, py0); if (chart.joint_x) chart.ctx.line_to (scr_v, py0);
else chart.ctx.line_to (scr_v, double.min (y, py0 + ph * (1 - ser.axis_y.place.zmax))); else chart.ctx.line_to (scr_v, double.min (y, py0 + ph * (1 - ser.axis_y.place.zmax)));
} else { } else {
chart.ctx.move_to (ex0 + max_rec_size - text_t.width + ttwh, compact_rec_pos (v, text_t)); chart.ctx.move_to (ex0 + max_rec_size - text_t.width + ttwh, compact_rec_pos (v, text_t));
text_t.show(); text_t.show(); ser.grid.style.apply(chart);
ser.grid.style.apply(chart);
double x = ex0 + max_rec_size + ttwh; double x = ex0 + max_rec_size + ttwh;
chart.ctx.move_to (x, scr_v); chart.ctx.move_to (x, scr_v);
if (chart.joint_y) chart.ctx.line_to (px1, scr_v); if (chart.joint_y) chart.ctx.line_to (px1, scr_v);
@ -551,14 +549,12 @@ namespace CairoChart {
break; break;
} }
ser.grid.style.apply(chart); ser.grid.style.apply(chart);
double y = ey0 + max_rec_size + tthv; double y = ey0 + max_rec_size + tthv; chart.ctx.move_to (scr_v, y);
chart.ctx.move_to (scr_v, y);
if (chart.joint_x) chart.ctx.line_to (scr_v, py1); if (chart.joint_x) chart.ctx.line_to (scr_v, py1);
else chart.ctx.line_to (scr_v, double.max (y, py0 + ph * (1 - ser.axis_y.place.zmin))); else chart.ctx.line_to (scr_v, double.max (y, py0 + ph * (1 - ser.axis_y.place.zmin)));
} else { } else {
chart.ctx.move_to (ex1 - text_t.width - ttwh, compact_rec_pos (v, text_t)); chart.ctx.move_to (ex1 - text_t.width - ttwh, compact_rec_pos (v, text_t));
text_t.show(); text_t.show(); ser.grid.style.apply(chart);
ser.grid.style.apply(chart);
double x = ex1 - max_rec_size - ttwh; double x = ex1 - max_rec_size - ttwh;
chart.ctx.move_to (x, scr_v); chart.ctx.move_to (x, scr_v);
if (chart.joint_y) chart.ctx.line_to (px0, scr_v); if (chart.joint_y) chart.ctx.line_to (px0, scr_v);