Inheriting MapSettings and PaletteSettings from SettingsCategory, updating SettingsManager initialization

This commit is contained in:
Dan Paulat 2022-12-18 08:44:31 -06:00
parent c93e776137
commit 891b6c839f
14 changed files with 231 additions and 269 deletions

View file

@ -81,7 +81,7 @@ public:
prevPitch_ {0.0}
{
SetRadarSite(scwx::qt::manager::SettingsManager::general_settings()
->default_radar_site());
.default_radar_site());
// Create ImGui Context
static size_t currentMapId_ {0u};
@ -835,7 +835,7 @@ void MapWidgetImpl::InitializeNewRadarProductView(
auto radarProductView = context_->radar_product_view();
std::string colorTableFile =
manager::SettingsManager::palette_settings()->palette(colorPalette);
manager::SettingsManager::palette_settings().palette(colorPalette);
if (!colorTableFile.empty())
{
std::shared_ptr<common::ColorTable> colorTable =