From b26745aa1b4d6022e7df31db5d28b71e0bf244ec Mon Sep 17 00:00:00 2001 From: leo Date: Sat, 28 Oct 2023 17:07:40 +0200 Subject: [PATCH] fix flow and syringe display --- Core/Src/PSE_unit_edit_screen.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Core/Src/PSE_unit_edit_screen.c b/Core/Src/PSE_unit_edit_screen.c index 0c129b6..53c7fec 100644 --- a/Core/Src/PSE_unit_edit_screen.c +++ b/Core/Src/PSE_unit_edit_screen.c @@ -70,7 +70,7 @@ lv_obj_t* flow_widget_label; static void update_flow(keypad_data* data){ pse_unit* unit = data->user_data; unit->flow = data->value; - lv_label_set_text_fmt(flow_widget_label, "Debit : \n%lu.%lu\nmL/mn", unit->flow / 1000, unit->flow % 1000); + lv_label_set_text_fmt(flow_widget_label, "Debit : \n%lu.%03lu\nmL/mn", unit->flow / 1000, unit->flow % 1000); } static void flow_edit_handler(lv_event_t* e){ lv_event_code_t code = lv_event_get_code(e); @@ -92,12 +92,13 @@ static lv_obj_t* flow_widget(lv_obj_t* parent, pse_unit* unit){ lv_obj_set_size(cont, lv_pct(24), lv_pct(100)); lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); lv_obj_add_event_cb(cont, flow_edit_handler, LV_EVENT_ALL, unit); + lv_obj_set_style_pad_all(cont, 5, 0); // flow setting lv_obj_t* flow = lv_label_create(cont); lv_obj_set_width(flow, lv_pct(100)); lv_obj_set_flex_grow(flow, 1); - lv_label_set_text_fmt(flow, "Debit : \n%lu.%lu\nmL/mn", unit->flow / 1000, unit->flow % 1000); + lv_label_set_text_fmt(flow, "Debit : \n%lu.%03lu\nmL/mn", unit->flow / 1000, unit->flow % 1000); flow_widget_label = flow; return cont; } @@ -138,6 +139,7 @@ static lv_obj_t* volume_widget(lv_obj_t* parent, pse_unit* unit){ lv_obj_set_size(cont, lv_pct(24), lv_pct(100)); lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); lv_obj_add_event_cb(cont, volume_edit_handler, LV_EVENT_ALL, unit); + lv_obj_set_style_pad_all(cont, 5, 0); // volume setting lv_obj_t* vol = lv_label_create(cont); @@ -164,7 +166,7 @@ static void update_syringe(keypad_data* data){ pse_unit* unit = data->user_data; unit->syringe->diameter = data->value; pse_syringe* syringe = unit->syringe; - lv_label_set_text_fmt(syringe_widget_label, "Seringue : \n%s\nD %d.%d mm", syringe->name, syringe->diameter/1000, syringe->diameter%1000); + lv_label_set_text_fmt(syringe_widget_label, "Seringue D :\n%d.%03d mm", syringe->diameter/1000, syringe->diameter%1000); } static void syringe_edit_handler(lv_event_t* e){ lv_event_code_t code = lv_event_get_code(e); @@ -184,14 +186,15 @@ static lv_obj_t* syringe_widget(lv_obj_t* parent, pse_unit* unit){ lv_obj_t* cont = lv_obj_create(parent); lv_obj_set_size(cont, lv_pct(24), lv_pct(100)); lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); - lv_obj_add_event_cb(cont, syringe_edit_handler, LV_EVENT_ALL, unit); + lv_obj_add_event_cb(cont, syringe_edit_handler, LV_EVENT_ALL, unit); + lv_obj_set_style_pad_all(cont, 5, 0); pse_syringe* syringe = unit->syringe; // syringe setting lv_obj_t* vol = lv_label_create(cont); lv_obj_set_width(vol, lv_pct(100)); lv_obj_set_flex_grow(vol, 1); - lv_label_set_text_fmt(vol, "Seringue : \n%s\nD %d.%d mm", syringe->name, syringe->diameter/1000, syringe->diameter%1000); + lv_label_set_text_fmt(vol, "Seringue D :\n%d.%03d mm", syringe->diameter/1000, syringe->diameter%1000); syringe_widget_label = vol; return cont; }