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

Fall back to default color palette on failure to load color palette.

Browse source
This commit is contained in:
AdenKoperczak 2025-02-28 12:20:12 -05:00
parent b4f888ad15
commit 8be9cc72de
1 changed files with 32 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

34
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -1866,26 +1866,48 @@ void MapWidgetImpl::InitializeNewRadarProductView(
const std::string& colorPalette) const std::string& colorPalette)
{ {
boost::asio::post(threadPool_, boost::asio::post(threadPool_,
[=, this]() [colorPalette, this]()
{ {
try try
{ {
auto radarProductView = auto radarProductView =
context_->radar_product_view(); context_->radar_product_view();
auto& paletteSetting =
settings::PaletteSettings::Instance().palette(
colorPalette);
std::string colorTableFile = std::string colorTableFile =
settings::PaletteSettings::Instance() paletteSetting.GetValue();
.palette(colorPalette) if (colorTableFile.empty())
.GetValue();
if (!colorTableFile.empty())
{ {
colorTableFile = paletteSetting.GetDefault();
}
std::unique_ptr<std::istream> colorTableStream = std::unique_ptr<std::istream> colorTableStream =
util::OpenFile(colorTableFile); util::OpenFile(colorTableFile);
if (colorTableStream->fail())
{
logger_->warn("Could not open color table {}",
colorTableFile);
colorTableStream =
util::OpenFile(paletteSetting.GetDefault());
}
std::shared_ptr<common::ColorTable> colorTable = std::shared_ptr<common::ColorTable> colorTable =
common::ColorTable::Load(*colorTableStream); common::ColorTable::Load(*colorTableStream);
radarProductView->LoadColorTable(colorTable); if (!colorTable->IsValid())
{
logger_->warn("Could not load color table {}",
colorTableFile);
colorTableStream =
util::OpenFile(paletteSetting.GetDefault());
colorTable =
common::ColorTable::Load(*colorTableStream);
} }
radarProductView->LoadColorTable(colorTable);
radarProductView->Initialize(); radarProductView->Initialize();
} }
catch (const std::exception& ex) catch (const std::exception& ex)