Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-27 11:45:58 +08:00
Code Issues Actions 37 Packages Projects Releases Wiki Activity

perf(arc_label): optimization enhancement of arc label algorithm

Browse Source
This commit is contained in:
Benign X
2025-01-16 15:37:36 +08:00
committed by Felipe Neves
parent 1dc268ea67
commit b49bba5fcf
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/arc_label/lv_arc_label.c
+22 -23
View File
@@ -19,7 +19,11 @@
#include "../../misc/lv_text_private.h" #include "../../misc/lv_text_private.h"
#if LV_USE_FLOAT #if LV_USE_FLOAT
#include <math.h> #include <math.h>
#endif
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif #endif
/********************* /*********************
@@ -350,12 +354,8 @@ static void lv_arc_label_event(const lv_obj_class_t * class_p, lv_event_t * e)
if(res != LV_RESULT_OK) return; if(res != LV_RESULT_OK) return;
const lv_event_code_t code = lv_event_get_code(e); const lv_event_code_t code = lv_event_get_code(e);
lv_obj_t * obj = lv_event_get_current_target(e);
if((code == LV_EVENT_STYLE_CHANGED) || (code == LV_EVENT_SIZE_CHANGED)) { if(code == LV_EVENT_DRAW_MAIN) {
// lv_label_refr_text(obj);
}
else if(code == LV_EVENT_DRAW_MAIN) {
arc_label_draw_main(e); arc_label_draw_main(e);
} }
} }
@@ -411,29 +411,28 @@ static void arc_label_draw_main(lv_event_t * e)
uint32_t word_i = 0; uint32_t word_i = 0;
uint32_t processed_word_count = 0; uint32_t processed_word_count = 0;
lv_value_precise_t prev_letter_w = 0; lv_value_precise_t prev_letter_w = 0;
while(angle_start <= arc_label->angle_size) { lv_value_precise_t total_arc_length = arc_label->angle_size * M_PI / 180 * arc_r;
lv_value_precise_t curr_total_arc_length = angle_start * M_PI / 180 * arc_r;
while(curr_total_arc_length <= total_arc_length) {
uint32_t letter; uint32_t letter;
uint32_t letter_next; uint32_t letter_next;
lv_text_encoded_letter_next_2(arc_label->text, &letter, &letter_next, &word_i); lv_text_encoded_letter_next_2(arc_label->text, &letter, &letter_next, &word_i);
const lv_value_precise_t letter_w = lv_font_get_glyph_width(font, letter, letter_next); const lv_value_precise_t letter_w = lv_font_get_glyph_width(font, letter, letter_next);
if(processed_word_count > 0) { if(processed_word_count > 0) {
const lv_value_precise_t angle_offset = (prev_letter_w + letter_w) * 180 / 3.141592653589f / arc_r / 2; const lv_value_precise_t arc_offset = (prev_letter_w + letter_w) / (lv_value_precise_t)2;
angle_start += angle_offset; curr_total_arc_length += arc_offset;
if(angle_start > arc_label->angle_size) {
break;
}
} }
const lv_value_precise_t curr_angle = arc_label->angle_start + (arc_label->dir == LV_ARC_LABEL_DIR_CLOCKWISE ? const lv_value_precise_t curr_angle = arc_label->angle_start + (arc_label->dir == LV_ARC_LABEL_DIR_CLOCKWISE ?
angle_start : curr_total_arc_length :
-angle_start); -curr_total_arc_length) * 180 / M_PI / arc_r;
#if LV_USE_FLOAT #if LV_USE_FLOAT
const lv_value_precise_t x = cos(curr_angle * M_PI / 180) * arc_r; const lv_value_precise_t x = cos(curr_angle * M_PI / 180) * arc_r;
const lv_value_precise_t y = sin(curr_angle * M_PI / 180) * arc_r; const lv_value_precise_t y = sin(curr_angle * M_PI / 180) * arc_r;
#else #else
const lv_value_precise_t x = lv_trigo_cos(curr_angle) * arc_r / (lv_value_precise_t)32767; const lv_value_precise_t x = lv_trigo_cos(curr_angle) * arc_r / 32767;
const lv_value_precise_t y = lv_trigo_sin(curr_angle) * arc_r / (lv_value_precise_t)32767; const lv_value_precise_t y = lv_trigo_sin(curr_angle) * arc_r / 32767;
#endif #endif
lv_point_t point = { lv_point_t point = {
@@ -484,10 +483,10 @@ static lv_value_precise_t calc_arc_text_total_angle(const char * text, const lv_
uint32_t word_i = 0; uint32_t word_i = 0;
uint32_t processed_letter_count = 0; uint32_t processed_letter_count = 0;
lv_value_precise_t prev_letter_w = 0; lv_value_precise_t prev_letter_w = 0;
const lv_value_precise_t angle_size_in_arc_length = angle_size * 3.141592653589f / 180 * radius; const lv_value_precise_t angle_size_in_arc_length = angle_size * M_PI / 180 * radius;
lv_value_precise_t total_angle_in_arc_length = 0; lv_value_precise_t total_arc_length = 0;
while(total_angle_in_arc_length < angle_size_in_arc_length) { while(total_arc_length < angle_size_in_arc_length) {
if(total_angle_in_arc_length > angle_size_in_arc_length) { if(total_arc_length > angle_size_in_arc_length) {
break; break;
} }
@@ -500,9 +499,9 @@ static lv_value_precise_t calc_arc_text_total_angle(const char * text, const lv_
processed_letter_count++; processed_letter_count++;
continue; continue;
} }
const lv_value_precise_t angle_offset = (prev_letter_w + letter_w) / 2.0; const lv_value_precise_t arc_offset = (prev_letter_w + letter_w) / (lv_value_precise_t)2;
total_angle_in_arc_length += angle_offset; total_arc_length += arc_offset;
if(letter == 0) { if(letter == 0) {
break; break;
@@ -512,7 +511,7 @@ static lv_value_precise_t calc_arc_text_total_angle(const char * text, const lv_
processed_letter_count++; processed_letter_count++;
} }
return total_angle_in_arc_length * 180 / 3.141592653589f / radius; return total_arc_length * 180 / M_PI / radius;
} }
#endif #endif