Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

lv_chart: fix axis tick postions

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-06-28 22:15:11 +02:00
parent d3d83f4991
commit c1072a6289
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/lv_objx/lv_chart.c
View File

@ -24,8 +24,6 @@
#define LV_CHART_AXIS_TO_LABEL_DISTANCE 4 #define LV_CHART_AXIS_TO_LABEL_DISTANCE 4
#define LV_CHART_AXIS_MAJOR_TICK_LEN_COE 1 / 15 #define LV_CHART_AXIS_MAJOR_TICK_LEN_COE 1 / 15
#define LV_CHART_AXIS_MINOR_TICK_LEN_COE 2 / 3 #define LV_CHART_AXIS_MINOR_TICK_LEN_COE 2 / 3
#define LV_CHART_AXIS_X_TICK_OFFSET_FIX 1
#define LV_CHART_AXIS_Y_TICK_OFFSET_FIX 0
/********************** /**********************
* TYPEDEFS * TYPEDEFS
@ -685,13 +683,13 @@ static void lv_chart_draw_div(lv_obj_t * chart, const lv_area_t * mask)
uint8_t div_i_start; uint8_t div_i_start;
lv_point_t p1; lv_point_t p1;
lv_point_t p2; lv_point_t p2;
lv_coord_t w = lv_obj_get_width(chart) - 1; lv_coord_t w = lv_obj_get_width(chart);
lv_coord_t h = lv_obj_get_height(chart) - 1; lv_coord_t h = lv_obj_get_height(chart);
lv_coord_t x_ofs = chart->coords.x1; lv_coord_t x_ofs = chart->coords.x1;
lv_coord_t y_ofs = chart->coords.y1; lv_coord_t y_ofs = chart->coords.y1;
if(ext->hdiv_cnt != 0) { if(ext->hdiv_cnt != 0) {
/*Draw slide lines if no border*/ /*Draw side lines if no border*/
if(style->body.border.width != 0) { if(style->body.border.width != 0) {
div_i_start = 1; div_i_start = 1;
div_i_end = ext->hdiv_cnt; div_i_end = ext->hdiv_cnt;
@ -703,18 +701,15 @@ static void lv_chart_draw_div(lv_obj_t * chart, const lv_area_t * mask)
p1.x = 0 + x_ofs; p1.x = 0 + x_ofs;
p2.x = w + x_ofs; p2.x = w + x_ofs;
for(div_i = div_i_start; div_i <= div_i_end; div_i++) { for(div_i = div_i_start; div_i <= div_i_end; div_i++) {
p1.y = (int32_t)((int32_t)h * div_i) / (ext->hdiv_cnt + 1); p1.y = (int32_t)((int32_t)(h - style->line.width) * div_i) / (ext->hdiv_cnt + 1);
p1.y += y_ofs; p1.y += y_ofs;
if(div_i == div_i_start) p1.y += (style->line.width >> 1) + 1; /*The first line might not be visible*/
if(div_i == div_i_end) p1.y -= (style->line.width >> 1) + 1; /*The last line might not be visible*/
p2.y = p1.y; p2.y = p1.y;
lv_draw_line(&p1, &p2, mask, style, opa_scale); lv_draw_line(&p1, &p2, mask, style, opa_scale);
} }
} }
if(ext->vdiv_cnt != 0) { if(ext->vdiv_cnt != 0) {
/*Draw slide lines if no border*/ /*Draw side lines if no border*/
if(style->body.border.width != 0) { if(style->body.border.width != 0) {
div_i_start = 1; div_i_start = 1;
div_i_end = ext->vdiv_cnt; div_i_end = ext->vdiv_cnt;
@ -726,10 +721,8 @@ static void lv_chart_draw_div(lv_obj_t * chart, const lv_area_t * mask)
p1.y = 0 + y_ofs; p1.y = 0 + y_ofs;
p2.y = h + y_ofs; p2.y = h + y_ofs;
for(div_i = div_i_start; div_i <= div_i_end; div_i++) { for(div_i = div_i_start; div_i <= div_i_end; div_i++) {
p1.x = (int32_t)((int32_t)w * div_i) / (ext->vdiv_cnt + 1); p1.x = (int32_t)((int32_t)(w - style->line.width) * div_i) / (ext->vdiv_cnt + 1);
p1.x += x_ofs; p1.x += x_ofs;
if(div_i == div_i_start) p1.x += (style->line.width >> 1) + 1; /*The first line might not be visible*/
if(div_i == div_i_end) p1.x -= (style->line.width >> 1) + 1; /*The last line might not be visible*/
p2.x = p1.x; p2.x = p1.x;
lv_draw_line(&p1, &p2, mask, style, opa_scale); lv_draw_line(&p1, &p2, mask, style, opa_scale);
} }
@ -1109,7 +1102,7 @@ static void lv_chart_draw_y_ticks(lv_obj_t * chart, const lv_area_t * mask)
/* draw a line at moving y position */ /* draw a line at moving y position */
p2.y = p1.y = p2.y = p1.y =
y_ofs + h - (int32_t)(((int32_t)h * i) / num_scale_ticks + 1) - LV_CHART_AXIS_Y_TICK_OFFSET_FIX; y_ofs + (int32_t)((int32_t)(h - style->line.width) * i) / num_scale_ticks;
if(i != num_scale_ticks) if(i != num_scale_ticks)
lv_draw_line(&p1, &p2, mask, style, opa_scale); lv_draw_line(&p1, &p2, mask, style, opa_scale);
@ -1148,6 +1141,7 @@ static void lv_chart_draw_y_ticks(lv_obj_t * chart, const lv_area_t * mask)
lv_draw_label(&a, mask, style, opa_scale, buf, LV_TXT_FLAG_CENTER, NULL, -1, -1, NULL); lv_draw_label(&a, mask, style, opa_scale, buf, LV_TXT_FLAG_CENTER, NULL, -1, -1, NULL);
} }
} }
} }
} }
} }
@ -1216,7 +1210,7 @@ static void lv_chart_draw_x_ticks(lv_obj_t * chart, const lv_area_t * mask)
p2.y = p1.y + minor_tick_len; /* minor tick */ p2.y = p1.y + minor_tick_len; /* minor tick */
/* draw a line at moving x position */ /* draw a line at moving x position */
p2.x = p1.x = x_ofs + (int32_t)(((int32_t)w * i) / num_scale_ticks + 1) - LV_CHART_AXIS_X_TICK_OFFSET_FIX; p2.x = p1.x = x_ofs + (int32_t)((int32_t)(w - style->line.width) * i) / num_scale_ticks;
if(i != num_scale_ticks) if(i != num_scale_ticks)
lv_draw_line(&p1, &p2, mask, style, opa_scale); lv_draw_line(&p1, &p2, mask, style, opa_scale);