github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

line draw bugfix: skew lines' width was incorrect

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2018-09-13 00:56:25 +02:00
parent 89e946cc51
commit d6793e792d
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lv_draw/lv_draw_arc.c
View File

@@ -52,7 +52,7 @@ static bool deg_test_inv(uint16_t deg, uint16_t start, uint16_t end);
void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, const lv_area_t * mask, void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, const lv_area_t * mask,
uint16_t start_angle, uint16_t end_angle, const lv_style_t * style, lv_opa_t opa_scale) uint16_t start_angle, uint16_t end_angle, const lv_style_t * style, lv_opa_t opa_scale)
{ {
lv_coord_t thickness = style->body.thickness; lv_coord_t thickness = style->line.width;
if(thickness > radius) thickness = radius; if(thickness > radius) thickness = radius;
lv_coord_t r_out = radius; lv_coord_t r_out = radius;

24
lv_draw/lv_draw_line.c
View File

@@ -184,15 +184,10 @@ static void line_draw_skew(line_draw_t * main_line, const lv_area_t * mask, cons
{ {
lv_coord_t width; lv_coord_t width;
width = style->line.width; width = style->line.width;
lv_coord_t width_safe = width;
lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->line.opa : (uint16_t)((uint16_t) style->line.opa * opa_scale) >> 8;
#if LV_ANTIALIAS #if LV_ANTIALIAS
width--; lv_coord_t width_safe = width; /*`width_safe` is always >=1*/
if(width == 0) width_safe = 1;
else width_safe = width;
#endif #endif
lv_opa_t opa = opa_scale == LV_OPA_COVER ? style->line.opa : (uint16_t)((uint16_t) style->line.opa * opa_scale) >> 8;
lv_point_t vect_main, vect_norm; lv_point_t vect_main, vect_norm;
vect_main.x = main_line->p2.x - main_line->p1.x; vect_main.x = main_line->p2.x - main_line->p1.x;
@@ -234,10 +229,23 @@ static void line_draw_skew(line_draw_t * main_line, const lv_area_t * mask, cons
lv_point_t p0 = {0, 0}; lv_point_t p0 = {0, 0};
line_init(&pattern_line, &p0, &vect_norm); line_init(&pattern_line, &p0, &vect_norm);
for(i = 0; i < width; i ++) { uint32_t width_sqr = width * width;
for(i = 0; i < width * 2; i ++) { /*Run until a big number. Meanwhile the real width will be determined as well*/
pattern[i].x = pattern_line.p_act.x; pattern[i].x = pattern_line.p_act.x;
pattern[i].y = pattern_line.p_act.y; pattern[i].y = pattern_line.p_act.y;
/*Finish the pattern line if it's length equal to the desired width (Use Pythagoras theorem)*/
int32_t sqr = pattern_line.p_act.x * pattern_line.p_act.x + pattern_line.p_act.y * pattern_line.p_act.y;
if(sqr >= width_sqr) {
width = i;
#if LV_ANTIALIAS
width--;
if(width == 0) width_safe = 1;
else width_safe = width;
#endif
break;
}
line_next(&pattern_line); line_next(&pattern_line);
} }
} else { } else {