piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: colorlcd - Add channel bar to Output Edit Screen and us values to outputs table on wide displays (#1664)

Browse Source 
* feat: Add channel bar to Output Edit Screen
Resolves #1385

* Wide colorlcd, show channel val on outputs table
I've also add commented code for those who want percentage instead of us
This commit is contained in:
Peter Feerick
2022-03-11 20:05:08 +10:00
committed by GitHub
parent 44a1733f0b
commit 9b830ac12e
1 changed files with 48 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/model_outputs.cpp
+48
View File
@@ -24,10 +24,43 @@
#include "opentx.h"
#include "libopenui.h"
#include "channel_bar.h"
#include "gvar_numberedit.h"
#define SET_DIRTY() storageDirty(EE_MODEL)
#if (LCD_W > LCD_H)
#define OUTPUT_EDIT_STATUS_BAR_WIDTH 250
#define OUTPUT_EDIT_STATUS_BAR_MARGIN 3
#define OUTPUT_EDIT_RIGHT_MARGIN 0
#else
#define OUTPUT_EDIT_STATUS_BAR_WIDTH 180
#define OUTPUT_EDIT_STATUS_BAR_MARGIN 0
#define OUTPUT_EDIT_RIGHT_MARGIN 3
#endif
class OutputEditStatusBar : public Window
{
public:
OutputEditStatusBar(Window *parent, const rect_t &rect, int8_t channel) :
Window(parent, rect), _channel(channel)
{
channelBar = new ComboChannelBar(this, {OUTPUT_EDIT_STATUS_BAR_MARGIN, 0, rect.w - (OUTPUT_EDIT_STATUS_BAR_MARGIN * 2), rect.h}, channel);
channelBar->setLeftMargin(0);
channelBar->setTextColor(COLOR_THEME_PRIMARY2);
channelBar->setOutputChannelBarLimitColor(COLOR_THEME_EDIT);
}
void paint(BitmapBuffer *dc) override
{
// dc->clear(COLOR_THEME_SECONDARY2);
}
protected:
ComboChannelBar *channelBar;
int8_t _channel;
};
class OutputEditWindow : public Page
{
public:
@@ -45,6 +78,7 @@ class OutputEditWindow : public Page
int chanZero = 0;
StaticText *minText;
StaticText *maxText;
OutputEditStatusBar *statusBar = nullptr;
void checkEvents() override
{
@@ -74,6 +108,10 @@ class OutputEditWindow : public Page
LCD_W - PAGE_TITLE_LEFT, PAGE_LINE_HEIGHT},
getSourceString(MIXSRC_CH1 + channel), 0,
COLOR_THEME_PRIMARY2);
statusBar = new OutputEditStatusBar(
window, {window->getRect().w - OUTPUT_EDIT_STATUS_BAR_WIDTH - OUTPUT_EDIT_RIGHT_MARGIN, 0, OUTPUT_EDIT_STATUS_BAR_WIDTH, MENU_HEADER_HEIGHT + 3},
channel);
}
void buildBody(FormWindow *window)
@@ -205,6 +243,16 @@ class OutputLineButton : public Button
dc->drawText(228, FIELD_PADDING_TOP, output->symetrical ? "=" : "\210",
textColor);
#if LCD_W > LCD_H
char chval[10];
// #if defined(PPM_UNIT_US)
snprintf(chval, sizeof(chval), "%d%s", PPM_CH_CENTER(channel) + channelOutputs[channel] / 2, STR_US);
// #else
// snprintf(chval, sizeof(chval), "%d%s", calcRESXto100(channelOutputs[channel]), "%");
// #endif
dc->drawText(260, FIELD_PADDING_TOP, chval, LEFT | textColor);
#endif
// second line
if (output->revert) {
dc->drawTextAtIndex(4, PAGE_LINE_HEIGHT + FIELD_PADDING_TOP, STR_MMMINV,