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

Allow radar product manager to be updated in a view

Browse source
This commit is contained in:
Dan Paulat 2022-10-08 23:06:46 -05:00
parent c9936a5ea4
commit 5dd1a327c8
11 changed files with 87 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

31
scwx-qt/source/scwx/qt/manager/radar_product_manager.cpp
View file

@ -67,12 +67,15 @@ class RadarProductManagerImpl
public:
struct ProviderManager
{
explicit ProviderManager(common::RadarProductGroup group) :
ProviderManager(group, "???")
explicit ProviderManager(const std::string& radarId,
common::RadarProductGroup group) :
ProviderManager(radarId, group, "???")
{
}
explicit ProviderManager(common::RadarProductGroup group,
explicit ProviderManager(const std::string& radarId,
common::RadarProductGroup group,
const std::string& product) :
radarId_ {radarId},
group_ {group},
product_ {product},
refreshEnabled_ {false},
@ -87,6 +90,7 @@ public:
void Disable();
const std::string radarId_;
const common::RadarProductGroup group_;
const std::string product_;
bool refreshEnabled_;
@ -108,8 +112,8 @@ public:
level3ProductRecordsMap_ {},
level2ProductRecordMutex_ {},
level3ProductRecordMutex_ {},
level2ProviderManager_ {
std::make_shared<ProviderManager>(common::RadarProductGroup::Level2)},
level2ProviderManager_ {std::make_shared<ProviderManager>(
radarId_, common::RadarProductGroup::Level2)},
level3ProviderManagerMap_ {},
level3ProviderManagerMutex_ {},
initializeMutex_ {},
@ -173,9 +177,9 @@ public:
std::shared_ptr<request::NexradFileRequest> request,
std::mutex& mutex);
std::string radarId_;
bool initialized_;
bool level3ProductsInitialized_;
const std::string radarId_;
bool initialized_;
bool level3ProductsInitialized_;
std::shared_ptr<config::RadarSite> radarSite_;
@ -215,12 +219,15 @@ std::string RadarProductManagerImpl::ProviderManager::name() const
if (group_ == common::RadarProductGroup::Level3)
{
name = std::format(
"{}, {}", common::GetRadarProductGroupName(group_), product_);
name = std::format("{}, {}, {}",
radarId_,
common::GetRadarProductGroupName(group_),
product_);
}
else
{
name = common::GetRadarProductGroupName(group_);
name = std::format(
"{}, {}", radarId_, common::GetRadarProductGroupName(group_));
}
return name;
@ -380,7 +387,7 @@ RadarProductManagerImpl::GetLevel3ProviderManager(const std::string& product)
std::forward_as_tuple(product),
std::forward_as_tuple(
std::make_shared<RadarProductManagerImpl::ProviderManager>(
common::RadarProductGroup::Level3, product)));
radarId_, common::RadarProductGroup::Level3, product)));
level3ProviderManagerMap_.at(product)->provider_ =
provider::NexradDataProviderFactory::CreateLevel3DataProvider(radarId_,
product);