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

Merge branch '#146_draw_grid_optimization' into develop

This commit is contained in:
Kolan Sh 2018-02-20 18:30:00 +03:00
parent ef1c12b2d1 394758bd73
commit 306019cf6a
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Axis.vala
View File

@ -156,7 +156,7 @@ namespace CairoChart {
/** /**
* ``Axis`` line style. * ``Axis`` line style.
*/ */
public LineStyle grid_style = LineStyle (Color(), 1, {2, 3}); public LineStyle grid_style = LineStyle(Color(0, 0, 0, 0.25)); // Color(), 1, {2, 3});
/** /**
* Number of equally placed points to evaluate records sizes. * Number of equally placed points to evaluate records sizes.
@ -516,8 +516,9 @@ namespace CairoChart {
for (Float128 v = min; Math.point_belong (v, min, range.zmax); v += step) { for (Float128 v = min; Math.point_belong (v, min, range.zmax); v += step) {
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.axis_x.grid_style.color = Color(0, 0, 0, 0.5); grid_style.color.red = chart.joint_color.red;
ser.axis_y.grid_style.color = Color(0, 0, 0, 0.5); grid_style.color.green = chart.joint_color.green;
grid_style.color.blue = chart.joint_color.blue;
} 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;

2
src/Chart.vala
View File

@ -400,8 +400,8 @@ namespace CairoChart {
} }
protected virtual void draw_plarea_border () { protected virtual void draw_plarea_border () {
LineStyle().apply(this);
color = border_color; color = border_color;
ctx.set_dash(null, 0);
ctx.rectangle(plarea.x0, plarea.y0, plarea.width, plarea.height); ctx.rectangle(plarea.x0, plarea.y0, plarea.width, plarea.height);
ctx.stroke (); ctx.stroke ();
} }

7
src/Series.vala
View File

@ -73,10 +73,9 @@ namespace CairoChart {
line_style.color = value; line_style.color = value;
axis_x.color = value; axis_x.color = value;
axis_y.color = value; axis_y.color = value;
axis_x.grid_style.color = value; axis_x.grid_style.color.red = axis_y.grid_style.color.red = value.red;
axis_x.grid_style.color.alpha = 0.5; axis_x.grid_style.color.green = axis_y.grid_style.color.green = value.green;
axis_y.grid_style.color = value; axis_x.grid_style.color.blue = axis_y.grid_style.color.blue = value.blue;
axis_y.grid_style.color.alpha = 0.5;
} }
default = Color (0, 0, 0, 1); default = Color (0, 0, 0, 1);
} }