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

imporve arc drawing

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-02-10 00:38:16 +01:00
parent 0381cc60c5
commit 35774188a0
1 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/lv_draw/lv_draw_arc.c
View File

@ -31,6 +31,8 @@ typedef struct {
lv_draw_rect_dsc_t * draw_dsc;
const lv_area_t * draw_area;
const lv_area_t * clip_area;
uint16_t angle_mask_id;
lv_draw_mask_angle_param_t * angle_mask_param;
}quarter_draw_dsc_t;
@ -81,10 +83,6 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, uin
cir_dsc.border_width = dsc->width;
cir_dsc.border_blend_mode = dsc->blend_mode;
lv_draw_mask_angle_param_t mask_angle_param;
lv_draw_mask_angle_init(&mask_angle_param, center_x, center_y, start_angle, end_angle);
int16_t mask_angle_id = lv_draw_mask_add(&mask_angle_param, NULL);
lv_area_t area;
area.x1 = center_x - radius;
@ -94,10 +92,14 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, uin
/*Draw a full ring*/
if(start_angle + 360 == end_angle) {
lv_draw_rect(&area, clip_area, dsc);
lv_draw_rect(&area, clip_area, &cir_dsc);
return;
}
lv_draw_mask_angle_param_t mask_angle_param;
lv_draw_mask_angle_init(&mask_angle_param, center_x, center_y, start_angle, end_angle);
int16_t mask_angle_id = lv_draw_mask_add(&mask_angle_param, NULL);
int32_t angle_gap;
if(end_angle > start_angle) {
angle_gap = 360 - (end_angle - start_angle);
@ -118,15 +120,18 @@ void lv_draw_arc(lv_coord_t center_x, lv_coord_t center_y, uint16_t radius, uin
q_dsc.draw_dsc = &cir_dsc;
q_dsc.draw_area = &area;
q_dsc.clip_area = clip_area;
q_dsc.angle_mask_id = mask_angle_id;
q_dsc.angle_mask_param = &mask_angle_param;
draw_quarter_0(&q_dsc);
draw_quarter_1(&q_dsc);
draw_quarter_2(&q_dsc);
draw_quarter_3(&q_dsc);
lv_draw_mask_remove_id(q_dsc.angle_mask_id);
} else {
lv_draw_rect(&area, clip_area, &cir_dsc);
lv_draw_mask_remove_id(mask_angle_id);
}
lv_draw_mask_remove_id(mask_angle_id);
if(dsc->round_start || dsc->round_end) {
cir_dsc.bg_color = dsc->color;
@ -210,7 +215,12 @@ static void draw_quarter_0(quarter_draw_dsc_t * q)
quarter_area.y2 = q->center_y + q->radius;
bool ok = lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
if(ok) {
/*It's a simple quarter border. Angle mask is not required*/
lv_draw_mask_remove_id(q->angle_mask_id);
lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
q->angle_mask_id = lv_draw_mask_add(q->angle_mask_param, NULL);
}
}
}
@ -263,7 +273,12 @@ static void draw_quarter_1(quarter_draw_dsc_t * q)
quarter_area.y2 = q->center_y + q->radius;
bool ok = lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
if(ok) {
/*It's a simple quarter border. Angle mask is not required*/
lv_draw_mask_remove_id(q->angle_mask_id);
lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
q->angle_mask_id = lv_draw_mask_add(q->angle_mask_param, NULL);
}
}
}
@ -316,7 +331,12 @@ static void draw_quarter_2(quarter_draw_dsc_t * q)
quarter_area.y2 = q->center_y - 1;
bool ok = lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
if(ok) {
/*It's a simple quarter border. Angle mask is not required*/
lv_draw_mask_remove_id(q->angle_mask_id);
lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
q->angle_mask_id = lv_draw_mask_add(q->angle_mask_param, NULL);
}
}
}
@ -370,7 +390,12 @@ static void draw_quarter_3(quarter_draw_dsc_t * q)
quarter_area.y2 = q->center_y - 1;
bool ok = lv_area_intersect(&quarter_area, &quarter_area, q->clip_area);
if(ok) lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
if(ok) {
/*It's a simple quarter border. Angle mask is not required*/
lv_draw_mask_remove_id(q->angle_mask_id);
lv_draw_rect(q->draw_area, &quarter_area, q->draw_dsc);
q->angle_mask_id = lv_draw_mask_add(q->angle_mask_param, NULL);
}
}
}