j.marmier/stw24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Leave 15px free to the edges

Browse Source
This commit is contained in:
Jasper Blanckenburg
2023-04-04 17:22:41 +02:00
parent e83afdc75c
commit 8d701669e4
32 changed files with 2353 additions and 4832 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TouchGFX/generated/gui_generated/include/gui_generated/debugview_screen/DebugViewViewBase.hpp
View File

@ -38,6 +38,10 @@ protected:
touchgfx::DrawableListItems<DebugViewLine, 13> listListItems;
touchgfx::Line line1;
touchgfx::PainterRGB565 line1Painter;
touchgfx::Line line1_2;
touchgfx::PainterRGB565 line1_2Painter;
touchgfx::Line line1_1;
touchgfx::PainterRGB565 line1_1Painter;
private:

4
TouchGFX/generated/gui_generated/include/gui_generated/driverview_screen/DriverViewViewBase.hpp
View File

@ -8,7 +8,6 @@
#include <mvp/View.hpp>
#include <gui/driverview_screen/DriverViewPresenter.hpp>
#include <touchgfx/widgets/Box.hpp>
#include <touchgfx/widgets/Image.hpp>
#include <gui/containers/TireTemp.hpp>
#include <touchgfx/widgets/canvas/Line.hpp>
#include <touchgfx/widgets/canvas/PainterRGB565.hpp>
@ -65,7 +64,6 @@ protected:
* Member Declarations
*/
touchgfx::Box __background;
touchgfx::Image logo;
TireTemp tireTempRR;
TireTemp tireTempFR;
TireTemp tireTempRL;
@ -85,7 +83,7 @@ protected:
DriverViewField field2;
DriverViewField field3;
touchgfx::ScrollWheel fieldTypeSelection;
touchgfx::DrawableListItems<DriverViewFieldSelection, 11> fieldTypeSelectionListItems;
touchgfx::DrawableListItems<DriverViewFieldSelection, 10> fieldTypeSelectionListItems;
touchgfx::BoxProgress prechargeProgress;
touchgfx::TextArea prechargeLabel;

2
TouchGFX/generated/gui_generated/src/ami_screen/AMIViewBase.cpp
View File

@ -12,7 +12,7 @@ AMIViewBase::AMIViewBase()
__background.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
add(__background);
logo.setXY(160, 263);
logo.setXY(160, 266);
logo.setBitmap(touchgfx::Bitmap(BITMAP_LOGO_DV_SMALL_WHITE_ID));
add(logo);

6
TouchGFX/generated/gui_generated/src/containers/DebugViewItemBase.cpp
View File

@ -7,15 +7,15 @@
DebugViewItemBase::DebugViewItemBase()
{
setWidth(240);
setWidth(225);
setHeight(26);
label.setPosition(5, 0, 105, 25);
label.setPosition(2, 0, 111, 25);
label.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
label.setLinespacing(0);
label.setTypedText(touchgfx::TypedText(T_DEBUGVIEWFIELD_TITLE));
add(label);
value.setPosition(110, 0, 125, 25);
value.setPosition(113, 0, 110, 25);
value.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
value.setLinespacing(0);
value.setTypedText(touchgfx::TypedText(T_DEFAULTWILDCARD_RIGHTALIGNED));

10
TouchGFX/generated/gui_generated/src/containers/DebugViewLineBase.cpp
View File

@ -6,13 +6,13 @@
DebugViewLineBase::DebugViewLineBase()
{
setWidth(480);
setWidth(450);
setHeight(26);
bg.setPosition(0, 0, 480, 26);
bg.setPosition(0, 0, 450, 26);
bg.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
add(bg);
line1.setPosition(240, 0, 1, 26);
line1.setPosition(225, 0, 1, 26);
line1Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line1.setPainter(line1Painter);
line1.setStart(0, 0);
@ -21,7 +21,7 @@ DebugViewLineBase::DebugViewLineBase()
line1.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(line1);
line2.setPosition(0, 25, 480, 1);
line2.setPosition(0, 25, 450, 1);
line2Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line2.setPainter(line2Painter);
line2.setStart(0, 0);
@ -33,7 +33,7 @@ DebugViewLineBase::DebugViewLineBase()
item1.setXY(0, 0);
add(item1);
item2.setXY(240, 0);
item2.setXY(225, 0);
add(item2);
}

8
TouchGFX/generated/gui_generated/src/containers/DriverViewFieldBase.cpp
View File

@ -7,21 +7,21 @@
DriverViewFieldBase::DriverViewFieldBase()
{
setWidth(160);
setWidth(150);
setHeight(80);
box.setPosition(0, 0, 160, 80);
box.setPosition(0, 0, 150, 80);
box.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
box.setBorderColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
box.setBorderSize(3);
add(box);
title.setPosition(0, 0, 160, 25);
title.setPosition(0, 0, 150, 25);
title.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
title.setLinespacing(0);
title.setTypedText(touchgfx::TypedText(T_DRIVERVIEWFIELD_TITLE));
add(title);
value.setPosition(0, 20, 160, 57);
value.setPosition(0, 20, 150, 57);
value.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
value.setLinespacing(0);
value.setTypedText(touchgfx::TypedText(T_NUMBERWILDCARD));

10
TouchGFX/generated/gui_generated/src/containers/DriverViewFieldSelectionBase.cpp
View File

@ -7,19 +7,19 @@
DriverViewFieldSelectionBase::DriverViewFieldSelectionBase()
{
setWidth(160);
setWidth(150);
setHeight(26);
bg.setPosition(0, 0, 160, 25);
bg.setPosition(0, 0, 150, 25);
bg.setColor(touchgfx::Color::getColorFromRGB(34, 34, 34));
add(bg);
name.setPosition(0, 0, 160, 25);
name.setPosition(0, 0, 150, 25);
name.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
name.setLinespacing(0);
name.setTypedText(touchgfx::TypedText(T_DRIVERVIEWFIELD_TITLE));
add(name);
line1.setPosition(0, 25, 160, 1);
line1.setPosition(0, 25, 150, 1);
line1Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line1.setPainter(line1Painter);
line1.setStart(0, 0);
@ -37,7 +37,7 @@ DriverViewFieldSelectionBase::DriverViewFieldSelectionBase()
line2.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(line2);
line2_1.setPosition(159, 0, 1, 26);
line2_1.setPosition(149, 0, 1, 26);
line2_1Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line2_1.setPainter(line2_1Painter);
line2_1.setStart(0, 0);

24
TouchGFX/generated/gui_generated/src/debugview_screen/DebugViewViewBase.cpp
View File

@ -14,7 +14,7 @@ DebugViewViewBase::DebugViewViewBase() :
__background.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
add(__background);
list.setPosition(0, 4, 480, 312);
list.setPosition(15, 15, 450, 290);
list.setHorizontal(false);
list.setCircular(true);
list.setEasingEquation(touchgfx::EasingEquations::backEaseOut);
@ -27,14 +27,32 @@ DebugViewViewBase::DebugViewViewBase() :
list.setDrawables(listListItems, updateItemCallback);
add(list);
line1.setPosition(0, 3, 480, 1);
line1.setPosition(15, 15, 1, 290);
line1Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line1.setPainter(line1Painter);
line1.setStart(0, 0);
line1.setEnd(480, 0);
line1.setEnd(0, 290);
line1.setLineWidth(10);
line1.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(line1);
line1_2.setPosition(465, 15, 1, 290);
line1_2Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line1_2.setPainter(line1_2Painter);
line1_2.setStart(0, 0);
line1_2.setEnd(0, 290);
line1_2.setLineWidth(10);
line1_2.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(line1_2);
line1_1.setPosition(15, 14, 450, 1);
line1_1Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line1_1.setPainter(line1_1Painter);
line1_1.setStart(0, 0);
line1_1.setEnd(480, 0);
line1_1.setLineWidth(10);
line1_1.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(line1_1);
}
DebugViewViewBase::~DebugViewViewBase()

38
TouchGFX/generated/gui_generated/src/driverview_screen/DriverViewViewBase.cpp
View File

@ -16,23 +16,19 @@ DriverViewViewBase::DriverViewViewBase() :
__background.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
add(__background);
logo.setXY(160, 265);
logo.setBitmap(touchgfx::Bitmap(BITMAP_FASTTUBE_LOGO_SMALL_WHITE_ID));
add(logo);
tireTempRR.setXY(240, 182);
tireTempRR.setXY(240, 197);
add(tireTempRR);
tireTempFR.setXY(240, 107);
tireTempFR.setXY(240, 122);
add(tireTempFR);
tireTempRL.setXY(165, 182);
tireTempRL.setXY(165, 197);
add(tireTempRL);
tireTempFL.setXY(165, 107);
tireTempFL.setXY(165, 122);
add(tireTempFL);
ttDivVert.setPosition(239, 107, 3, 150);
ttDivVert.setPosition(239, 122, 3, 150);
ttDivVertPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
ttDivVert.setPainter(ttDivVertPainter);
ttDivVert.setStart(0, 0);
@ -41,7 +37,7 @@ DriverViewViewBase::DriverViewViewBase() :
ttDivVert.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(ttDivVert);
ttDivHoriz.setPosition(165, 181, 150, 3);
ttDivHoriz.setPosition(165, 196, 150, 3);
ttDivHorizPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
ttDivHoriz.setPainter(ttDivHorizPainter);
ttDivHoriz.setStart(0, 0);
@ -50,7 +46,7 @@ DriverViewViewBase::DriverViewViewBase() :
ttDivHoriz.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(ttDivHoriz);
tsSoC.setXY(10, 107);
tsSoC.setXY(15, 122);
tsSoC.setProgressIndicatorPosition(0, 0, 40, 150);
tsSoC.setRange(0, 100);
tsSoC.setBackground(touchgfx::Bitmap(BITMAP_BAT_BAR_BG_ID));
@ -63,7 +59,7 @@ DriverViewViewBase::DriverViewViewBase() :
tsSoC.setValue(60);
add(tsSoC);
lvSoC.setXY(430, 107);
lvSoC.setXY(425, 122);
lvSoC.setProgressIndicatorPosition(0, 0, 40, 150);
lvSoC.setRange(0, 100);
lvSoC.setBackground(touchgfx::Bitmap(BITMAP_BAT_BAR_BG_ID));
@ -76,34 +72,34 @@ DriverViewViewBase::DriverViewViewBase() :
lvSoC.setValue(80);
add(lvSoC);
tireLabel.setPosition(165, 82, 150, 25);
tireLabel.setPosition(165, 97, 150, 25);
tireLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
tireLabel.setLinespacing(0);
tireLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_H6UX));
add(tireLabel);
tsSoCLabel.setPosition(10, 82, 40, 25);
tsSoCLabel.setPosition(15, 97, 40, 25);
tsSoCLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
tsSoCLabel.setLinespacing(0);
tsSoCLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_PHFD));
add(tsSoCLabel);
lvSoCLabel.setPosition(430, 82, 40, 25);
lvSoCLabel.setPosition(425, 97, 40, 25);
lvSoCLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
lvSoCLabel.setLinespacing(0);
lvSoCLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_4OBM));
add(lvSoCLabel);
field1.setXY(0, 0);
field1.setXY(15, 15);
add(field1);
field2.setXY(160, 0);
field2.setXY(165, 15);
add(field2);
field3.setXY(320, 0);
field3.setXY(315, 15);
add(field3);
fieldTypeSelection.setPosition(0, 80, 160, 240);
fieldTypeSelection.setPosition(15, 95, 150, 225);
fieldTypeSelection.setHorizontal(false);
fieldTypeSelection.setCircular(true);
fieldTypeSelection.setEasingEquation(touchgfx::EasingEquations::backEaseOut);
@ -117,7 +113,7 @@ DriverViewViewBase::DriverViewViewBase() :
fieldTypeSelection.setVisible(false);
add(fieldTypeSelection);
prechargeProgress.setXY(0, 265);
prechargeProgress.setXY(15, 280);
prechargeProgress.setProgressIndicatorPosition(0, 0, 480, 55);
prechargeProgress.setRange(0, 100);
prechargeProgress.setDirection(touchgfx::AbstractDirectionProgress::RIGHT);
@ -127,7 +123,7 @@ DriverViewViewBase::DriverViewViewBase() :
prechargeProgress.setVisible(false);
add(prechargeProgress);
prechargeLabel.setXY(105, 274);
prechargeLabel.setXY(105, 275);
prechargeLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
prechargeLabel.setLinespacing(0);
prechargeLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_HMH2));

4
TouchGFX/generated/gui_generated/src/missionselect_screen/MissionSelectViewBase.cpp
View File

@ -15,7 +15,7 @@ MissionSelectViewBase::MissionSelectViewBase()
__background.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
add(__background);
prompt.setXY(41, 0);
prompt.setXY(41, 15);
prompt.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
prompt.setLinespacing(0);
prompt.setTypedText(touchgfx::TypedText(T___SINGLEUSE_6GPV));
@ -50,7 +50,7 @@ MissionSelectViewBase::MissionSelectViewBase()
add(missionList);
logo.setXY(160, 263);
logo.setXY(160, 266);
logo.setBitmap(touchgfx::Bitmap(BITMAP_LOGO_DV_SMALL_WHITE_ID));
add(logo);
}