GFX Develop Branch
This commit is contained in:
@ -9,10 +9,8 @@
|
||||
#include <gui/driverview_screen/DriverViewPresenter.hpp>
|
||||
#include <touchgfx/widgets/Box.hpp>
|
||||
#include <touchgfx/containers/Container.hpp>
|
||||
#include <touchgfx/containers/progress_indicators/LineProgress.hpp>
|
||||
#include <touchgfx/widgets/canvas/PainterRGB565.hpp>
|
||||
#include <touchgfx/widgets/TextAreaWithWildcard.hpp>
|
||||
#include <touchgfx/widgets/canvas/Line.hpp>
|
||||
#include <touchgfx/widgets/canvas/PainterRGB565.hpp>
|
||||
#include <gui/containers/Temperature.hpp>
|
||||
#include <touchgfx/widgets/TextArea.hpp>
|
||||
#include <touchgfx/containers/scrollers/ScrollWheel.hpp>
|
||||
@ -21,6 +19,8 @@
|
||||
#include <touchgfx/containers/ListLayout.hpp>
|
||||
#include <gui/containers/DriverViewStatusItem.hpp>
|
||||
#include <touchgfx/containers/progress_indicators/BoxProgress.hpp>
|
||||
#include <touchgfx/widgets/TextAreaWithWildcard.hpp>
|
||||
#include <touchgfx/containers/progress_indicators/LineProgress.hpp>
|
||||
#include <gui/containers/ErrorPopup.hpp>
|
||||
|
||||
class DriverViewViewBase : public touchgfx::View<DriverViewPresenter>
|
||||
@ -69,10 +69,6 @@ protected:
|
||||
* Member Declarations
|
||||
*/
|
||||
touchgfx::Box __background;
|
||||
touchgfx::Container SoC;
|
||||
touchgfx::LineProgress soc;
|
||||
touchgfx::PainterRGB565 socPainter;
|
||||
touchgfx::TextAreaWithOneWildcard socLabel;
|
||||
touchgfx::Container brakeTemps;
|
||||
touchgfx::Line btDivVert;
|
||||
touchgfx::PainterRGB565 btDivVertPainter;
|
||||
@ -102,6 +98,10 @@ protected:
|
||||
touchgfx::TextArea prechargeLabel;
|
||||
touchgfx::TextArea r2dLabel;
|
||||
touchgfx::TextAreaWithOneWildcard r2dProgressLabel;
|
||||
touchgfx::Container SoC;
|
||||
touchgfx::LineProgress soc;
|
||||
touchgfx::PainterRGB565 socPainter;
|
||||
touchgfx::TextAreaWithOneWildcard socLabel;
|
||||
ErrorPopup errorPopup;
|
||||
|
||||
private:
|
||||
|
||||
Reference in New Issue
Block a user