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

Return SettingsVariable objects instead of values

Browse source
This commit is contained in:
Dan Paulat 2022-12-19 00:32:35 -06:00
parent 891b6c839f
commit 7522162095
10 changed files with 58 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

16
scwx-qt/source/scwx/qt/main/main_window.cpp
View file

@ -76,8 +76,9 @@ public:
}
}
std::string mapboxApiKey =
manager::SettingsManager::general_settings().mapbox_api_key();
std::string mapboxApiKey = manager::SettingsManager::general_settings()
.mapbox_api_key()
.GetValue();
settings_.resetToTemplate(QMapLibreGL::Settings::MapboxSettings);
settings_.setApiKey(QString {mapboxApiKey.c_str()});
@ -172,7 +173,7 @@ MainWindow::MainWindow(QWidget* parent) :
ui->actionAlerts->setVisible(false);
ui->menuDebug->menuAction()->setVisible(
manager::SettingsManager::general_settings().debug_enabled());
manager::SettingsManager::general_settings().debug_enabled().GetValue());
// Configure Resource Explorer Dock
ui->resourceExplorerDock->setVisible(false);
@ -215,8 +216,9 @@ MainWindow::MainWindow(QWidget* parent) :
for (size_t i = 0; i < p->maps_.size(); i++)
{
p->SelectRadarProduct(p->maps_.at(i),
mapSettings.radar_product_group(i),
mapSettings.radar_product(i),
common::GetRadarProductGroup(
mapSettings.radar_product_group(i).GetValue()),
mapSettings.radar_product(i).GetValue(),
0);
}
@ -367,8 +369,8 @@ void MainWindowImpl::ConfigureMapLayout()
{
auto& generalSettings = manager::SettingsManager::general_settings();
const int64_t gridWidth = generalSettings.grid_width();
const int64_t gridHeight = generalSettings.grid_height();
const int64_t gridWidth = generalSettings.grid_width().GetValue();
const int64_t gridHeight = generalSettings.grid_height().GetValue();
const int64_t mapCount = gridWidth * gridHeight;
size_t mapIndex = 0;