feat(colorlcd): Improve trainer page layout, use Add/Replace instead of +=/:= (#3104)
* Adjust trainer setup layout to better use space and avoid scrolling. * Adjust padding for landscape layout. * Change text for trainer mode to 'Add' and 'Replace' instead of '+=' and ':='. Adjust layout to fit. Copy translations from TR_VMLTPX strings.
This commit is contained in:
@@ -30,13 +30,15 @@ RadioTrainerPage::RadioTrainerPage():
|
||||
{
|
||||
}
|
||||
|
||||
static const lv_coord_t col_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(2),
|
||||
#if LCD_W > LCD_H
|
||||
static const lv_coord_t col_dsc[] = {LV_GRID_FR(7), LV_GRID_FR(13), LV_GRID_FR(10), LV_GRID_FR(10), LV_GRID_FR(10),
|
||||
LV_GRID_TEMPLATE_LAST};
|
||||
|
||||
#if LCD_H >= LCD_W
|
||||
static const lv_coord_t col4_dsc[] = {LV_GRID_FR(1), LV_GRID_FR(1),
|
||||
LV_GRID_FR(1), LV_GRID_FR(1),
|
||||
LV_GRID_TEMPLATE_LAST};
|
||||
|
||||
#define MULT_COL_CNT 3
|
||||
#else
|
||||
static const lv_coord_t col_dsc[] = {LV_GRID_FR(7), LV_GRID_FR(15), LV_GRID_FR(9), LV_GRID_FR(9),
|
||||
LV_GRID_TEMPLATE_LAST};
|
||||
#define MULT_COL_CNT 2
|
||||
#endif
|
||||
|
||||
static const lv_coord_t row_dsc[] = {LV_GRID_CONTENT, LV_GRID_TEMPLATE_LAST};
|
||||
@@ -51,66 +53,61 @@ void RadioTrainerPage::build(FormWindow * form)
|
||||
{
|
||||
FlexGridLayout grid(col_dsc, row_dsc, 2);
|
||||
form->setFlexLayout();
|
||||
form->padAll(4);
|
||||
#if LCD_W > LCD_H
|
||||
form->padLeft(8);
|
||||
form->padRight(8);
|
||||
#endif
|
||||
|
||||
for (uint8_t i = 0; i < NUM_STICKS; i++) {
|
||||
uint8_t chan = channelOrder(i + 1);
|
||||
TrainerMix* td = &g_eeGeneral.trainer.mix[chan - 1];
|
||||
|
||||
auto line = form->newLine(&grid);
|
||||
|
||||
new StaticText(line, rect_t{}, STR_VSRCRAW[chan], 0, COLOR_THEME_PRIMARY1);
|
||||
|
||||
auto box = new FormGroup(line, rect_t{});
|
||||
box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(4));
|
||||
auto box_obj = box->getLvObj();
|
||||
lv_obj_set_width(box_obj, LV_SIZE_CONTENT);
|
||||
lv_obj_set_style_flex_cross_place(box_obj, LV_FLEX_ALIGN_CENTER, 0);
|
||||
|
||||
new Choice(box, rect_t{}, STR_TRNMODE, 0, 2, GET_SET_DEFAULT(td->mode));
|
||||
new Choice(box, rect_t{}, STR_TRNCHN, 0, 3, GET_SET_DEFAULT(td->srcChn));
|
||||
auto weight = new NumberEdit(box, rect_t{}, -125, 125,
|
||||
new Choice(line, rect_t{}, STR_TRNMODE, 0, 2, GET_SET_DEFAULT(td->mode));
|
||||
new Choice(line, rect_t{}, STR_TRNCHN, 0, 3, GET_SET_DEFAULT(td->srcChn));
|
||||
auto weight = new NumberEdit(line, rect_t{}, -125, 125,
|
||||
GET_SET_DEFAULT(td->studWeight));
|
||||
weight->setSuffix("%");
|
||||
|
||||
#if LCD_W > LCD_H
|
||||
new DynamicNumber<int16_t>(box, rect_t{},
|
||||
#if LCD_H > LCD_W
|
||||
line = form->newLine(&grid);
|
||||
line->padLeft(30);
|
||||
line->padBottom(8);
|
||||
#endif
|
||||
|
||||
auto d = new DynamicNumber<int16_t>(line, rect_t{},
|
||||
[=]() { return (ppmInput[i] - g_eeGeneral.trainer.calib[i]) * 2; },
|
||||
LEFT | PPM_PRECISION | COLOR_THEME_PRIMARY1);
|
||||
#endif
|
||||
}
|
||||
|
||||
#if LCD_H >= LCD_W
|
||||
{
|
||||
FlexGridLayout grid4(col4_dsc, row_dsc, 2);
|
||||
auto line = form->newLine(&grid4);
|
||||
|
||||
for (uint8_t i = 0; i < NUM_STICKS; i++) {
|
||||
new DynamicNumber<int16_t>(line, rect_t{},
|
||||
[=]() { return (ppmInput[i] - g_eeGeneral.trainer.calib[i]) * 2; },
|
||||
CENTERED | PPM_PRECISION | COLOR_THEME_PRIMARY1);
|
||||
}
|
||||
}
|
||||
auto line = form->newLine(&grid);
|
||||
line->padTop(10);
|
||||
|
||||
// Trainer multiplier
|
||||
auto lbl = new StaticText(line, rect_t{}, STR_MULTIPLIER, 0, COLOR_THEME_PRIMARY1);
|
||||
lbl->padRight(4);
|
||||
lv_obj_set_grid_cell(lbl->getLvObj(), LV_GRID_ALIGN_END, 0, MULT_COL_CNT, LV_GRID_ALIGN_CENTER, 0, 1);
|
||||
auto multiplier = new NumberEdit(line, rect_t{}, -10, 40,
|
||||
GET_SET_DEFAULT(g_eeGeneral.PPM_Multiplier));
|
||||
multiplier->setDisplayHandler(
|
||||
[](int32_t value) { return formatNumberAsString(value + 10, PREC1); });
|
||||
lv_obj_set_grid_cell(multiplier->getLvObj(), LV_GRID_ALIGN_START, MULT_COL_CNT, 1, LV_GRID_ALIGN_CENTER, 0, 1);
|
||||
|
||||
#if LCD_H > LCD_W
|
||||
line = form->newLine(&grid);
|
||||
line->padTop(10);
|
||||
#endif
|
||||
|
||||
// Trainer calibration
|
||||
auto line = form->newLine(&grid);
|
||||
auto btn = new TextButton(line, rect_t{}, std::string(STR_CAL), [=]() -> uint8_t {
|
||||
auto btn = new TextButton(line, rect_t{0, 0, 0, 30}, std::string(STR_CAL), [=]() -> uint8_t {
|
||||
memcpy(g_eeGeneral.trainer.calib, ppmInput,
|
||||
sizeof(g_eeGeneral.trainer.calib));
|
||||
SET_DIRTY();
|
||||
return 0;
|
||||
});
|
||||
lv_obj_set_style_min_width(btn->getLvObj(), 2*LV_DPI_DEF/3, 0);
|
||||
|
||||
// Trainer multiplier
|
||||
auto box = new FormGroup(line, rect_t{});
|
||||
box->setFlexLayout(LV_FLEX_FLOW_ROW, lv_dpx(4));
|
||||
auto box_obj = box->getLvObj();
|
||||
lv_obj_set_width(box_obj, LV_SIZE_CONTENT);
|
||||
lv_obj_set_style_flex_cross_place(box_obj, LV_FLEX_ALIGN_CENTER, 0);
|
||||
|
||||
new StaticText(box, rect_t{}, STR_MULTIPLIER, 0, COLOR_THEME_PRIMARY1);
|
||||
auto multiplier = new NumberEdit(box, rect_t{}, -10, 40,
|
||||
GET_SET_DEFAULT(g_eeGeneral.PPM_Multiplier));
|
||||
multiplier->setDisplayHandler(
|
||||
[](int32_t value) { return formatNumberAsString(value + 10, PREC1); });
|
||||
lv_obj_set_grid_cell(btn->getLvObj(), LV_GRID_ALIGN_STRETCH, MULT_COL_CNT+1, 1, LV_GRID_ALIGN_CENTER, 0, 1);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user