blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 22:10:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch level2 incoming elevation to optional

Browse source
This commit is contained in:
AdenKoperczak 2025-04-20 10:56:50 -04:00
parent f481d57ed1
commit e10ebdeb5e
No known key found for this signature in database
GPG key ID: 9843017036F62EE7
9 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

21
scwx-qt/source/scwx/qt/ui/level2_settings_widget.cpp
View file

@ -242,11 +242,19 @@ void Level2SettingsWidget::UpdateElevationSelection(float elevation)
p->currentElevationButton_ = newElevationButton;
}
void Level2SettingsWidget::UpdateIncomingElevation(float incomingElevation)
void Level2SettingsWidget::UpdateIncomingElevation(
std::optional<float> incomingElevation)
{
p->incomingElevationLabel_->setText(
"Incoming Elevation: " + QString::number(incomingElevation, 'f', 1) +
common::Characters::DEGREE);
if (incomingElevation.has_value())
{
p->incomingElevationLabel_->setText(
"Incoming Elevation: " + QString::number(*incomingElevation, 'f', 1) +
common::Characters::DEGREE);
}
else
{
p->incomingElevationLabel_->setText("Incoming Elevation: None");
}
}
void Level2SettingsWidget::UpdateSettings(map::MapWidget* activeMap)
@ -254,8 +262,9 @@ void Level2SettingsWidget::UpdateSettings(map::MapWidget* activeMap)
std::optional<float> currentElevationOption = activeMap->GetElevation();
const float currentElevation =
currentElevationOption.has_value() ? *currentElevationOption : 0.0f;
const std::vector<float> elevationCuts = activeMap->GetElevationCuts();
const float incomingElevation = activeMap->GetIncomingLevel2Elevation();
const std::vector<float> elevationCuts = activeMap->GetElevationCuts();
const std::optional<float> incomingElevation =
activeMap->GetIncomingLevel2Elevation();
if (p->elevationCuts_ != elevationCuts)
{