Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions bin/language-en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
14 changes: 13 additions & 1 deletion src/GUIMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1239,6 +1239,7 @@ guiTideHeight = guiData->tideHeight;


radarHeadUp = guiData->headUp;
radarStabilised = guiData->stabilised;

//update EBL Data
this->guiRadarEBLBrg = guiData->guiRadarEBLBrg;
Expand Down Expand Up @@ -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());
Expand Down
2 changes: 2 additions & 0 deletions src/GUIMain.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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<irr::s32> radarLargeRect;
irr::s32 largeRadarScreenCentreX;
Expand Down
5 changes: 5 additions & 0 deletions src/RadarCalculation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/RadarCalculation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions src/SimulationModel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading