Restructure DriverView into containers
This commit is contained in:
@ -8,17 +8,18 @@
|
||||
#include <mvp/View.hpp>
|
||||
#include <gui/driverview_screen/DriverViewPresenter.hpp>
|
||||
#include <touchgfx/widgets/Box.hpp>
|
||||
#include <touchgfx/containers/progress_indicators/LineProgress.hpp>
|
||||
#include <touchgfx/widgets/canvas/PainterRGB565.hpp>
|
||||
#include <touchgfx/widgets/TextArea.hpp>
|
||||
#include <gui/containers/ErrorPopup.hpp>
|
||||
#include <touchgfx/containers/Container.hpp>
|
||||
#include <gui/containers/Temperature.hpp>
|
||||
#include <touchgfx/widgets/canvas/Line.hpp>
|
||||
#include <touchgfx/widgets/canvas/PainterRGB565.hpp>
|
||||
#include <touchgfx/containers/progress_indicators/LineProgress.hpp>
|
||||
#include <gui/containers/DriverViewField.hpp>
|
||||
#include <touchgfx/containers/scrollers/ScrollWheel.hpp>
|
||||
#include <gui/containers/DriverViewFieldSelection.hpp>
|
||||
#include <gui/containers/DriverViewField.hpp>
|
||||
#include <touchgfx/containers/progress_indicators/BoxProgress.hpp>
|
||||
#include <touchgfx/widgets/TextAreaWithWildcard.hpp>
|
||||
#include <gui/containers/ErrorPopup.hpp>
|
||||
|
||||
class DriverViewViewBase : public touchgfx::View<DriverViewPresenter>
|
||||
{
|
||||
@ -66,6 +67,14 @@ protected:
|
||||
* Member Declarations
|
||||
*/
|
||||
touchgfx::Box __background;
|
||||
touchgfx::LineProgress tsSoC;
|
||||
touchgfx::PainterRGB565 tsSoCPainter;
|
||||
touchgfx::LineProgress lvSoC;
|
||||
touchgfx::PainterRGB565 lvSoCPainter;
|
||||
touchgfx::TextArea tsSoCLabel;
|
||||
touchgfx::TextArea lvSoCLabel;
|
||||
ErrorPopup errorPopup;
|
||||
touchgfx::Container drivetrainTemps;
|
||||
touchgfx::TextArea motorTempLabel;
|
||||
Temperature motorTempL;
|
||||
Temperature motorTempR;
|
||||
@ -76,6 +85,7 @@ protected:
|
||||
Temperature invTempR;
|
||||
Temperature invTempL;
|
||||
touchgfx::TextArea invTempLabel;
|
||||
touchgfx::Container tireTemps;
|
||||
touchgfx::Line ttDivVert;
|
||||
touchgfx::PainterRGB565 ttDivVertPainter;
|
||||
touchgfx::Line ttDivHoriz;
|
||||
@ -84,23 +94,18 @@ protected:
|
||||
Temperature tireTempFR;
|
||||
Temperature tireTempRL;
|
||||
Temperature tireTempFL;
|
||||
touchgfx::LineProgress tsSoC;
|
||||
touchgfx::PainterRGB565 tsSoCPainter;
|
||||
touchgfx::LineProgress lvSoC;
|
||||
touchgfx::PainterRGB565 lvSoCPainter;
|
||||
touchgfx::TextArea tireLabel;
|
||||
touchgfx::TextArea tsSoCLabel;
|
||||
touchgfx::TextArea lvSoCLabel;
|
||||
DriverViewField field1;
|
||||
DriverViewField field2;
|
||||
DriverViewField field3;
|
||||
touchgfx::Container dataFields;
|
||||
touchgfx::ScrollWheel fieldTypeSelection;
|
||||
touchgfx::DrawableListItems<DriverViewFieldSelection, 10> fieldTypeSelectionListItems;
|
||||
DriverViewField field3;
|
||||
DriverViewField field2;
|
||||
DriverViewField field1;
|
||||
touchgfx::Container statusBar;
|
||||
touchgfx::BoxProgress progressBar;
|
||||
touchgfx::TextArea prechargeLabel;
|
||||
touchgfx::TextArea r2dLabel;
|
||||
touchgfx::TextAreaWithOneWildcard r2dProgressLabel;
|
||||
ErrorPopup errorPopup;
|
||||
|
||||
private:
|
||||
|
||||
|
||||
Reference in New Issue
Block a user