diff --git a/bin/language-en.txt b/bin/language-en.txt index f361f0e7..908efffc 100644 --- a/bin/language-en.txt +++ b/bin/language-en.txt @@ -63,9 +63,9 @@ radarARPATrialTab="Trial" parallelIndex="Parallel index" PIrange="Range Nm" PIbearing="Brg" -northUp="North" -courseUp="Course" -headUp="Head" +northUp="North Up" +courseUp="Course Up" +headUp="Head Up" increaserange="Range\n +" decreaserange="Range\n -" contact="Contact" diff --git a/src/GUIMain.cpp b/src/GUIMain.cpp index cf2fe47f..cbf84dab 100644 --- a/src/GUIMain.cpp +++ b/src/GUIMain.cpp @@ -1239,6 +1239,7 @@ guiTideHeight = guiData->tideHeight; radarHeadUp = guiData->headUp; + radarStabilised = guiData->stabilised; //update EBL Data this->guiRadarEBLBrg = guiData->guiRadarEBLBrg; @@ -1409,7 +1410,18 @@ guiTideHeight = guiData->tideHeight; displayText = language->translate("range"); displayText.append(f32To1dp(guiRadarRangeNm).c_str()); displayText.append(language->translate("nm")); - displayText.append(L"\n"); + + displayText.append(" ("); + + if (radarHeadUp && radarStabilised) { + displayText.append(language->translate("courseUp")); + } else if (radarHeadUp) { + displayText.append(language->translate("headUp")); + } else { + displayText.append(language->translate("northUp")); + } + + displayText.append(L")\n"); displayText.append(language->translate("vrm")); displayText.append(f32To2dp(guiRadarEBLRangeNm).c_str()); diff --git a/src/GUIMain.hpp b/src/GUIMain.hpp index a96ebe4c..54888720 100644 --- a/src/GUIMain.hpp +++ b/src/GUIMain.hpp @@ -75,6 +75,7 @@ struct GUIData { bool paused; bool collided; bool headUp; + bool stabilised; bool pump1On; bool pump2On; // DEE_NOV22 Azimuth Drive related gui items @@ -380,6 +381,7 @@ class GUIMain //Create, build and update GUI irr::f32 guiRadarCursorBrg; irr::f32 guiRadarCursorRangeNm; bool radarHeadUp; + bool radarStabilised; bool radarLarge; irr::core::rect radarLargeRect; irr::s32 largeRadarScreenCentreX; diff --git a/src/RadarCalculation.cpp b/src/RadarCalculation.cpp index 80276e01..11789244 100644 --- a/src/RadarCalculation.cpp +++ b/src/RadarCalculation.cpp @@ -588,6 +588,11 @@ bool RadarCalculation::getHeadUp() const//Head or course up return headUp; } +bool RadarCalculation::getStabilised() const +{ + return stabilised; +} + void RadarCalculation::toggleRadarOn() { radarOn = !radarOn; diff --git a/src/RadarCalculation.hpp b/src/RadarCalculation.hpp index 41b48cea..2fc6dfff 100644 --- a/src/RadarCalculation.hpp +++ b/src/RadarCalculation.hpp @@ -148,6 +148,7 @@ class RadarCalculation void setCourseUp(); void setHeadUp(); bool getHeadUp() const; //Head or course up + bool getStabilised() const; void toggleRadarOn(); bool isRadarOn() const; int getArpaMode() const; diff --git a/src/SimulationModel.cpp b/src/SimulationModel.cpp index 800b28cc..8b882a85 100644 --- a/src/SimulationModel.cpp +++ b/src/SimulationModel.cpp @@ -2047,6 +2047,7 @@ SimulationModel::~SimulationModel() guiData->paused = paused; guiData->collided = collided; guiData->headUp = radarCalculation.getHeadUp(); + guiData->stabilised = radarCalculation.getStabilised(); guiData->radarOn = radarCalculation.isRadarOn(); guiData->pump1On = ownShip.getRudderPumpState(1); guiData->pump2On = ownShip.getRudderPumpState(2);