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

Change radar product manager member variable initialization

Browse source
This commit is contained in:
Dan Paulat 2024-10-19 13:59:32 -05:00
parent 94bb3c9430
commit 6dbd020591
1 changed files with 22 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -91,13 +91,7 @@ public:
const std::string& radarId, const std::string& radarId,
common::RadarProductGroup group, common::RadarProductGroup group,
const std::string& product) : const std::string& product) :
radarId_ {radarId}, radarId_ {radarId}, group_ {group}, product_ {product}
group_ {group},
product_ {product},
refreshEnabled_ {false},
refreshTimer_ {threadPool_},
refreshTimerMutex_ {},
provider_ {nullptr}
{ {
connect(this, connect(this,
&ProviderManager::NewDataAvailable, &ProviderManager::NewDataAvailable,
@ -115,10 +109,10 @@ public:
const std::string radarId_; const std::string radarId_;
const common::RadarProductGroup group_; const common::RadarProductGroup group_;
const std::string product_; const std::string product_;
bool refreshEnabled_; bool refreshEnabled_ {false};
boost::asio::steady_timer refreshTimer_; boost::asio::steady_timer refreshTimer_ {threadPool_};
std::mutex refreshTimerMutex_; std::mutex refreshTimerMutex_ {};
std::shared_ptr<provider::NexradDataProvider> provider_; std::shared_ptr<provider::NexradDataProvider> provider_ {nullptr};
signals: signals:
void NewDataAvailable(common::RadarProductGroup group, void NewDataAvailable(common::RadarProductGroup group,
@ -136,24 +130,8 @@ public:
initialized_ {false}, initialized_ {false},
level3ProductsInitialized_ {false}, level3ProductsInitialized_ {false},
radarSite_ {config::RadarSite::Get(radarId)}, radarSite_ {config::RadarSite::Get(radarId)},
coordinates0_5Degree_ {},
coordinates1Degree_ {},
level2ProductRecords_ {},
level2ProductRecentRecords_ {},
level3ProductRecordsMap_ {},
level3ProductRecentRecordsMap_ {},
level2ProductRecordMutex_ {},
level3ProductRecordMutex_ {},
level2ProviderManager_ {std::make_shared<ProviderManager>( level2ProviderManager_ {std::make_shared<ProviderManager>(
self_, radarId_, common::RadarProductGroup::Level2)}, self_, radarId_, common::RadarProductGroup::Level2)}
level3ProviderManagerMap_ {},
level3ProviderManagerMutex_ {},
initializeMutex_ {},
level3ProductsInitializeMutex_ {},
loadLevel2DataMutex_ {},
loadLevel3DataMutex_ {},
availableCategoryMap_ {},
availableCategoryMutex_ {}
{ {
if (radarSite_ == nullptr) if (radarSite_ == nullptr)
{ {
@ -247,30 +225,30 @@ public:
std::shared_ptr<config::RadarSite> radarSite_; std::shared_ptr<config::RadarSite> radarSite_;
std::size_t cacheLimit_ {6u}; std::size_t cacheLimit_ {6u};
std::vector<float> coordinates0_5Degree_; std::vector<float> coordinates0_5Degree_ {};
std::vector<float> coordinates1Degree_; std::vector<float> coordinates1Degree_ {};
RadarProductRecordMap level2ProductRecords_; RadarProductRecordMap level2ProductRecords_ {};
RadarProductRecordList level2ProductRecentRecords_; RadarProductRecordList level2ProductRecentRecords_ {};
std::unordered_map<std::string, RadarProductRecordMap> std::unordered_map<std::string, RadarProductRecordMap>
level3ProductRecordsMap_; level3ProductRecordsMap_ {};
std::unordered_map<std::string, RadarProductRecordList> std::unordered_map<std::string, RadarProductRecordList>
level3ProductRecentRecordsMap_; level3ProductRecentRecordsMap_ {};
std::shared_mutex level2ProductRecordMutex_; std::shared_mutex level2ProductRecordMutex_ {};
std::shared_mutex level3ProductRecordMutex_; std::shared_mutex level3ProductRecordMutex_ {};
std::shared_ptr<ProviderManager> level2ProviderManager_; std::shared_ptr<ProviderManager> level2ProviderManager_;
std::unordered_map<std::string, std::shared_ptr<ProviderManager>> std::unordered_map<std::string, std::shared_ptr<ProviderManager>>
level3ProviderManagerMap_; level3ProviderManagerMap_ {};
std::shared_mutex level3ProviderManagerMutex_; std::shared_mutex level3ProviderManagerMutex_ {};
std::mutex initializeMutex_; std::mutex initializeMutex_ {};
std::mutex level3ProductsInitializeMutex_; std::mutex level3ProductsInitializeMutex_ {};
std::mutex loadLevel2DataMutex_; std::mutex loadLevel2DataMutex_ {};
std::mutex loadLevel3DataMutex_; std::mutex loadLevel3DataMutex_ {};
common::Level3ProductCategoryMap availableCategoryMap_; common::Level3ProductCategoryMap availableCategoryMap_ {};
std::shared_mutex availableCategoryMutex_; std::shared_mutex availableCategoryMutex_ {};
std::unordered_map<boost::uuids::uuid, std::unordered_map<boost::uuids::uuid,
std::shared_ptr<ProviderManager>, std::shared_ptr<ProviderManager>,