Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-31 07:56:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor(chart): add 'series' keyword in value setters/getters for consistency

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2025-01-13 22:07:16 +01:00
parent 9cc9e7b503
commit 5f2888d93a
21 changed files with 102 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
demos/ebike/lv_demo_ebike_stats.c
+6 -6
View File
@@ -435,16 +435,16 @@ static void chart_mode_observer_cb(lv_observer_t * observer, lv_subject_t * subj
switch(lv_subject_get_int(&subject_mode)) {
case MODE_AVG_SPEED:
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 30);
lv_chart_set_ext_y_array(chart, ser, avg_speed_values);
lv_chart_set_axis_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 30);
lv_chart_set_series_ext_y_array(chart, ser, avg_speed_values);
break;
case MODE_TOP_SPEED:
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 50);
lv_chart_set_ext_y_array(chart, ser, top_speed_values);
lv_chart_set_axis_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 50);
lv_chart_set_series_ext_y_array(chart, ser, top_speed_values);
break;
case MODE_DISTANCE:
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 90);
lv_chart_set_ext_y_array(chart, ser, distance_values);
lv_chart_set_axis_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 90);
lv_chart_set_series_ext_y_array(chart, ser, distance_values);
break;
default:
break;
demos/high_res/lv_demo_high_res_app_ev_charging.c
+2 -2
View File
@@ -374,7 +374,7 @@ static void create_widget2(lv_demo_high_res_ctx_t * c, lv_obj_t * widgets)
lv_obj_set_style_pad_all(chart, 0, 0);
lv_obj_set_grid_cell(chart, LV_GRID_ALIGN_STRETCH, 0, 1, LV_GRID_ALIGN_START, 0, 1);
lv_chart_set_type(chart, LV_CHART_TYPE_BAR);
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 96);
lv_chart_set_axis_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 96);
lv_chart_set_div_line_count(chart, 3, 0);
lv_obj_set_style_line_opa(chart, LV_OPA_40, 0);
lv_obj_set_style_line_color(chart, lv_color_black(), 0);
@@ -382,7 +382,7 @@ static void create_widget2(lv_demo_high_res_ctx_t * c, lv_obj_t * widgets)
lv_obj_set_style_line_dash_gap(chart, 1, 0);
lv_chart_series_t * ser = lv_chart_add_series(chart, lv_color_white(), LV_CHART_AXIS_PRIMARY_Y);
static const int32_t chart_values[] = {45, 14, 78, 95, 45, 52, 78, 34, 63, 52, 38, 83, 63, 19, LV_CHART_POINT_NONE};
lv_chart_set_ext_y_array(chart, ser, (int32_t *)chart_values);
lv_chart_set_series_ext_y_array(chart, ser, (int32_t *)chart_values);
lv_chart_set_point_count(chart, sizeof(chart_values) / sizeof(*chart_values));
lv_chart_refresh(chart);
demos/high_res/lv_demo_high_res_app_smart_meter.c
+4 -4
View File
@@ -460,7 +460,7 @@ static void create_widget2(lv_demo_high_res_ctx_t * c, lv_obj_t * widgets)
lv_obj_set_grid_cell(chart, LV_GRID_ALIGN_STRETCH, 0, 1, LV_GRID_ALIGN_START, 0, 1);
lv_chart_set_type(chart, LV_CHART_TYPE_BAR);
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 101);
lv_chart_set_axis_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 101);
lv_chart_set_div_line_count(chart, 3, 0);
lv_obj_set_style_line_opa(chart, LV_OPA_40, 0);
lv_obj_set_style_line_color(chart, lv_color_black(), 0);
@@ -468,7 +468,7 @@ static void create_widget2(lv_demo_high_res_ctx_t * c, lv_obj_t * widgets)
lv_obj_set_style_line_dash_gap(chart, 1, 0);
lv_chart_series_t * ser = lv_chart_add_series(chart, lv_color_white(), LV_CHART_AXIS_PRIMARY_Y);
static const int32_t chart_values[] = {45, 14, 45, 52, 69, 52, 63};
lv_chart_set_ext_y_array(chart, ser, (int32_t *)chart_values);
lv_chart_set_series_ext_y_array(chart, ser, (int32_t *)chart_values);
lv_chart_set_point_count(chart, sizeof(chart_values) / sizeof(*chart_values));
lv_chart_refresh(chart);
@@ -565,7 +565,7 @@ static void widget3_chart_selected_day_observer_cb(lv_observer_t * observer, lv_
lv_obj_add_event_cb(chart, widget3_chart_free_anim_values, LV_EVENT_DELETE, NULL);
lv_chart_series_t * ser = lv_chart_get_series_next(chart, NULL);
lv_chart_set_ext_y_array(chart, ser, anim_values->current);
lv_chart_set_series_ext_y_array(chart, ser, anim_values->current);
}
lv_memcpy(anim_values->start, anim_values->current, sizeof(anim_values->current));
@@ -651,7 +651,7 @@ static void create_widget3(lv_demo_high_res_ctx_t * c, lv_obj_t * widgets)
lv_obj_set_style_pad_all(chart, 5, 0);
lv_obj_set_grid_cell(chart, LV_GRID_ALIGN_STRETCH, 0, 1, LV_GRID_ALIGN_START, 0, 1);
lv_chart_set_type(chart, LV_CHART_TYPE_BAR);
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, -125, 125);
lv_chart_set_axis_range(chart, LV_CHART_AXIS_PRIMARY_Y, -125, 125);
lv_chart_set_div_line_count(chart, 3, 0);
lv_obj_set_style_line_opa(chart, LV_OPA_40, 0);
lv_obj_set_style_line_color(chart, lv_color_black(), 0);
demos/high_res/lv_demo_high_res_app_thermostat.c
+2 -2
View File
@@ -183,7 +183,7 @@ static void create_widget1(lv_demo_high_res_ctx_t * c, lv_obj_t * widgets)
lv_obj_set_style_pad_all(chart, 0, 0);
lv_obj_set_grid_cell(chart, LV_GRID_ALIGN_STRETCH, 0, 1, LV_GRID_ALIGN_START, 0, 1);
lv_chart_set_type(chart, LV_CHART_TYPE_BAR);
lv_chart_set_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 109);
lv_chart_set_axis_range(chart, LV_CHART_AXIS_PRIMARY_Y, 0, 109);
lv_chart_set_div_line_count(chart, 3, 0);
lv_obj_set_style_line_opa(chart, LV_OPA_40, 0);
lv_obj_set_style_line_color(chart, lv_color_black(), 0);
@@ -191,7 +191,7 @@ static void create_widget1(lv_demo_high_res_ctx_t * c, lv_obj_t * widgets)
lv_obj_set_style_line_dash_gap(chart, 1, 0);
lv_chart_series_t * ser = lv_chart_add_series(chart, lv_color_white(), LV_CHART_AXIS_PRIMARY_Y);
static const int32_t chart_values[] = {14, 95, 52, 34, 52, 83, 19};
lv_chart_set_ext_y_array(chart, ser, (int32_t *)chart_values);
lv_chart_set_series_ext_y_array(chart, ser, (int32_t *)chart_values);
lv_chart_set_point_count(chart, sizeof(chart_values) / sizeof(*chart_values));
lv_chart_refresh(chart);
demos/widgets/lv_demo_widgets.c
+1 -1
View File
@@ -1505,7 +1505,7 @@ static void chart_event_cb(lv_event_t * e)
}
char buf[8];
lv_snprintf(buf, sizeof(buf), "%"LV_PRId32, lv_chart_get_y_array(obj, (lv_chart_series_t *)ser)[base_dsc->id2]);
lv_snprintf(buf, sizeof(buf), "%"LV_PRId32, lv_chart_get_series_y_array(obj, (lv_chart_series_t *)ser)[base_dsc->id2]);
lv_point_t text_size;
lv_text_get_size(&text_size, buf, font_normal, 0, 0, LV_COORD_MAX, LV_TEXT_FLAG_NONE);