Add Inter Fonts

This commit is contained in:
2024-06-12 13:27:38 +02:00
parent b0ef96e390
commit 51f6fa6014
631 changed files with 117874 additions and 2514 deletions

View File

@ -21,6 +21,8 @@
#include <gui/vehicleconfig_screen/VehicleConfigPresenter.hpp>
#include <gui/sdc_screen/SDCView.hpp>
#include <gui/sdc_screen/SDCPresenter.hpp>
#include <gui/newdriverview_screen/NewDriverViewView.hpp>
#include <gui/newdriverview_screen/NewDriverViewPresenter.hpp>
using namespace touchgfx;

View File

@ -10,7 +10,7 @@ TemperatureBase::TemperatureBase()
setWidth(60);
setHeight(60);
bg.setPosition(0, 0, 60, 60);
bg.setColor(touchgfx::Color::getColorFromRGB(0, 38, 255));
bg.setColor(touchgfx::Color::getColorFromRGB(3, 78, 135));
add(bg);
value.setPosition(0, 0, 60, 50);

View File

@ -16,8 +16,8 @@ DriverViewViewBase::DriverViewViewBase() :
__background.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
add(__background);
brakeTemps.setPosition(164, 125, 152, 150);
btDivVert.setPosition(74, 25, 3, 123);
brakeTemps.setPosition(91, 125, 278, 148);
btDivVert.setPosition(215, 13, 3, 123);
btDivVertPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
btDivVert.setPainter(btDivVertPainter);
btDivVert.setStart(0, 0);
@ -26,7 +26,7 @@ DriverViewViewBase::DriverViewViewBase() :
btDivVert.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
brakeTemps.add(btDivVert);
btDivHoriz.setPosition(14, 85, 123, 3);
btDivHoriz.setPosition(155, 73, 123, 3);
btDivHorizPainter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
btDivHoriz.setPainter(btDivHorizPainter);
btDivHoriz.setStart(0, 0);
@ -35,19 +35,19 @@ DriverViewViewBase::DriverViewViewBase() :
btDivHoriz.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
brakeTemps.add(btDivHoriz);
brakeTempRR.setXY(77, 88);
brakeTempRR.setXY(218, 76);
brakeTemps.add(brakeTempRR);
brakeTempFR.setXY(77, 25);
brakeTempFR.setXY(218, 13);
brakeTemps.add(brakeTempFR);
brakeTempRL.setXY(14, 88);
brakeTempRL.setXY(155, 76);
brakeTemps.add(brakeTempRL);
brakeTempFL.setXY(14, 25);
brakeTempFL.setXY(155, 13);
brakeTemps.add(brakeTempFL);
brakeLabel.setPosition(0, 0, 150, 25);
brakeLabel.setPosition(0, 61, 150, 25);
brakeLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
brakeLabel.setLinespacing(0);
brakeLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_H6UX));
@ -56,7 +56,7 @@ DriverViewViewBase::DriverViewViewBase() :
add(brakeTemps);
dataFields.setPosition(12, 43, 456, 257);
fieldTypeSelection.setPosition(0, 80, 152, 177);
fieldTypeSelection.setPosition(2, 80, 152, 177);
fieldTypeSelection.setHorizontal(false);
fieldTypeSelection.setCircular(true);
fieldTypeSelection.setEasingEquation(touchgfx::EasingEquations::linearEaseOut);
@ -71,13 +71,13 @@ DriverViewViewBase::DriverViewViewBase() :
fieldTypeSelection.setVisible(false);
dataFields.add(fieldTypeSelection);
field3.setXY(304, 0);
field3.setXY(301, 0);
dataFields.add(field3);
field2.setXY(152, 0);
dataFields.add(field2);
field1.setXY(0, 0);
field1.setXY(2, 0);
dataFields.add(field1);
add(dataFields);
@ -135,8 +135,8 @@ DriverViewViewBase::DriverViewViewBase() :
add(statusBar);
SoC.setPosition(12, 277, 456, 33);
soc.setXY(0, -267);
SoC.setPosition(12, 5, 456, 33);
soc.setXY(0, 0);
soc.setProgressIndicatorPosition(0, 0, 456, 33);
soc.setRange(0, 100);
soc.setBackground(touchgfx::Bitmap(BITMAP_PROG_HORIZ_BG_ID));
@ -149,7 +149,7 @@ DriverViewViewBase::DriverViewViewBase() :
soc.setValue(60);
SoC.add(soc);
socLabel.setPosition(178, -263, 81, 25);
socLabel.setPosition(178, 4, 81, 25);
socLabel.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
socLabel.setLinespacing(0);
socLabel.setTypedText(touchgfx::TypedText(T___SINGLEUSE_PHFD));

View File

@ -100,10 +100,10 @@ void MissionSelectViewBase::handleKeyEvent(uint8_t key)
}
if(254 == key)
if(65 == key)
{
//DummyChangeAMI
//When hardware button 254 clicked change screen to AMI
//When hardware button 65 clicked change screen to AMI
//Go to AMI with no screen transition
application().gotoAMIScreenNoTransition();
@ -118,28 +118,28 @@ void MissionSelectViewBase::handleKeyEvent(uint8_t key)
}
if(252 == key)
if(66 == key)
{
//DummyChangeDebugView
//When hardware button 252 clicked change screen to DebugView
//When hardware button 66 clicked change screen to DebugView
//Go to DebugView with no screen transition
application().gotoDebugViewScreenNoTransition();
}
if(251 == key)
if(67 == key)
{
//DummyChangeConfigView
//When hardware button 251 clicked change screen to VehicleConfig
//When hardware button 67 clicked change screen to VehicleConfig
//Go to VehicleConfig with no screen transition
application().gotoVehicleConfigScreenNoTransition();
}
if(250 == key)
if(83 == key)
{
//DummyChangeSDCView
//When hardware button 250 clicked change screen to SDC
//When hardware button 83 clicked change screen to SDC
//Go to SDC with no screen transition
application().gotoSDCScreenNoTransition();

View File

@ -0,0 +1,44 @@
/*********************************************************************************/
/********** THIS FILE IS GENERATED BY TOUCHGFX DESIGNER, DO NOT MODIFY ***********/
/*********************************************************************************/
#include <gui_generated/newdriverview_screen/NewDriverViewViewBase.hpp>
#include <touchgfx/canvas_widget_renderer/CanvasWidgetRenderer.hpp>
#include <touchgfx/Color.hpp>
#include <images/BitmapDatabase.hpp>
NewDriverViewViewBase::NewDriverViewViewBase()
{
touchgfx::CanvasWidgetRenderer::setupBuffer(canvasBuffer, CANVAS_BUFFER_SIZE);
__background.setPosition(0, 0, 480, 320);
__background.setColor(touchgfx::Color::getColorFromRGB(0, 0, 0));
add(__background);
line1.setPosition(0, 0, 480, 320);
line1Painter.setColor(touchgfx::Color::getColorFromRGB(255, 255, 255));
line1.setPainter(line1Painter);
line1.setStart(140, 60);
line1.setEnd(140, 200);
line1.setLineWidth(3);
line1.setLineEndingStyle(touchgfx::Line::ROUND_CAP_ENDING);
add(line1);
boxProgress1.setXY(140, 17);
boxProgress1.setProgressIndicatorPosition(0, 0, 200, 18);
boxProgress1.setRange(0, 100);
boxProgress1.setDirection(touchgfx::AbstractDirectionProgress::RIGHT);
boxProgress1.setBackground(touchgfx::Bitmap(BITMAP_ALTERNATE_THEME_IMAGES_WIDGETS_BOXPROGRESS_THICK_SMALL_ID));
boxProgress1.setColor(touchgfx::Color::getColorFromRGB(255, 186, 13));
boxProgress1.setValue(60);
add(boxProgress1);
}
NewDriverViewViewBase::~NewDriverViewViewBase()
{
touchgfx::CanvasWidgetRenderer::resetBuffer();
}
void NewDriverViewViewBase::setupScreen()
{
}