FaSTTUBe/steering-wheel
56
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename backToMissionSelect to canChangeFromMissionSelect

Browse Source
This commit is contained in:
Leonard Gies 2025-04-17 15:09:24 +02:00
parent 5464fc074d
commit 80e38cc036
Signed by: l.gies
GPG Key ID: 6F6FB9338EE44F71
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
TouchGFX/gui/include/gui/common/FrontendApplication.hpp
View File

@ -17,11 +17,11 @@ public:
model.tick(); model.tick();
} }
void setBackToMissionSelect(bool backToMissionSelect); void setCanChangeFromMissionSelect(bool canChangeFromMissionSelect);
bool getBackToMissionSelect() const; bool getCanChangeFromMissionSelect() const;
private: private:
bool backToMissionSelect; bool canChangeFromMissionSelect;
}; };
#endif // FRONTENDAPPLICATION_HPP #endif // FRONTENDAPPLICATION_HPP

12
TouchGFX/gui/src/common/FrontendApplication.cpp
View File

@ -3,14 +3,16 @@
#include "gui/common/NamedField.hpp" #include "gui/common/NamedField.hpp"
FrontendApplication::FrontendApplication(Model &m, FrontendHeap &heap) FrontendApplication::FrontendApplication(Model &m, FrontendHeap &heap)
: FrontendApplicationBase(m, heap), backToMissionSelect(false) { : FrontendApplicationBase(m, heap), canChangeFromMissionSelect(false) {
namedFieldSort(); namedFieldSort();
} }
void FrontendApplication::setBackToMissionSelect(bool backToMissionSelect) { void FrontendApplication::setCanChangeFromMissionSelect(
this->backToMissionSelect = backToMissionSelect; bool canChangeFromMissionSelect) {
this->canChangeFromMissionSelect = canChangeFromMissionSelect;
} }
bool FrontendApplication::getBackToMissionSelect() const { // controls if next screen button works on mission select screen
return backToMissionSelect; bool FrontendApplication::getCanChangeFromMissionSelect() const {
return canChangeFromMissionSelect;
} }

6
TouchGFX/gui/src/debugview_screen/DebugViewPresenter.cpp
View File

@ -11,8 +11,6 @@ void DebugViewPresenter::deactivate() {}
void DebugViewPresenter::vehicleStateUpdated() { view.updateFieldValues(); } void DebugViewPresenter::vehicleStateUpdated() { view.updateFieldValues(); }
void DebugViewPresenter::nextScreen() { void DebugViewPresenter::nextScreen() {
FrontendApplication *app = static_cast<FrontendApplication *>(Application::getInstance())
static_cast<FrontendApplication *>(Application::getInstance()); ->gotoMissionSelectScreenNoTransition();
app->setBackToMissionSelect(true);
app->gotoMissionSelectScreenNoTransition();
} }

8
TouchGFX/gui/src/missionselect_screen/MissionSelectPresenter.cpp
View File

@ -18,9 +18,9 @@ void MissionSelectPresenter::deactivate() {}
void MissionSelectPresenter::vehicleStateUpdated() { void MissionSelectPresenter::vehicleStateUpdated() {
FrontendApplication *app = FrontendApplication *app =
static_cast<FrontendApplication *>(FrontendApplication::getInstance()); static_cast<FrontendApplication *>(FrontendApplication::getInstance());
if (app->getBackToMissionSelect() && // if screen will be changed, set canChangeFromMissionSelect to true
vehicle_state.active_mission == initialMission) { if (vehicle_state.active_mission != initialMission) {
return; app->setCanChangeFromMissionSelect(true);
} }
switch (vehicle_state.active_mission) { switch (vehicle_state.active_mission) {
case MISSION_NONE: case MISSION_NONE:
@ -37,7 +37,7 @@ void MissionSelectPresenter::vehicleStateUpdated() {
void MissionSelectPresenter::nextScreen() { void MissionSelectPresenter::nextScreen() {
FrontendApplication *app = FrontendApplication *app =
static_cast<FrontendApplication *>(FrontendApplication::getInstance()); static_cast<FrontendApplication *>(FrontendApplication::getInstance());
if (app->getBackToMissionSelect()) { if (app->getCanChangeFromMissionSelect()) {
if (vehicle_state.active_mission == MISSION_MANUAL) { if (vehicle_state.active_mission == MISSION_MANUAL) {
app->gotoDriverViewScreenNoTransition(); app->gotoDriverViewScreenNoTransition();
} else { } else {