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

Enable loading color palettes from embedded Qt resources

Browse source
This commit is contained in:
Dan Paulat 2023-01-02 00:23:46 -06:00
parent 1f9392e9f6
commit 1d597eb120
8 changed files with 88 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@
#include <scwx/qt/map/radar_product_layer.hpp>
#include <scwx/qt/map/radar_range_layer.hpp>
#include <scwx/qt/model/imgui_context_model.hpp>
#include <scwx/qt/util/file.hpp>
#include <scwx/qt/view/radar_product_view_factory.hpp>
#include <scwx/util/logger.hpp>
#include <scwx/util/threads.hpp>
@ -415,7 +416,7 @@ void MapWidget::SelectRadarProduct(
radarId,
common::GetRadarProductGroupName(group),
product,
util::TimeString(time));
scwx::util::TimeString(time));
p->SetRadarSite(radarId);
p->selectedTime_ = time;
@ -796,7 +797,7 @@ void MapWidgetImpl::RadarProductManagerConnect()
});
// Load file
util::async(
scwx::util::async(
[=]()
{
if (group == common::RadarProductGroup::Level2)
@ -830,7 +831,7 @@ void MapWidgetImpl::RadarProductManagerDisconnect()
void MapWidgetImpl::InitializeNewRadarProductView(
const std::string& colorPalette)
{
util::async(
scwx::util::async(
[=]()
{
auto radarProductView = context_->radar_product_view();
@ -841,8 +842,10 @@ void MapWidgetImpl::InitializeNewRadarProductView(
.GetValue();
if (!colorTableFile.empty())
{
std::unique_ptr<std::istream> colorTableStream =
util::OpenFile(colorTableFile);
std::shared_ptr<common::ColorTable> colorTable =
common::ColorTable::Load(colorTableFile);
common::ColorTable::Load(*colorTableStream);
radarProductView->LoadColorTable(colorTable);
}