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

Infrastructure updates for multiple elevations

Browse source
This commit is contained in:
Dan Paulat 2021-11-14 14:20:24 -06:00
parent 87581892a7
commit 19f1207384
8 changed files with 85 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -180,17 +180,19 @@ void RadarProductManager::LoadLevel2Data(const std::string& filename)
emit Level2DataLoaded();
}
std::shared_ptr<wsr88d::rda::ElevationScan>
std::pair<float, std::shared_ptr<wsr88d::rda::ElevationScan>>
RadarProductManager::GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
uint16_t elevation,
float elevation,
std::chrono::system_clock::time_point time)
{
std::shared_ptr<wsr88d::rda::ElevationScan> radarData = nullptr;
float elevationFound = 0.0f;
std::shared_ptr<wsr88d::rda::ElevationScan> radarData = nullptr;
if (p->level2VolumeScans_.size() > 0)
{
radarData = p->level2VolumeScans_.crbegin()->second->GetElevationScan(
dataBlockType, elevation, time);
std::tie(elevationFound, radarData) =
p->level2VolumeScans_.crbegin()->second->GetElevationScan(
dataBlockType, elevation, time);
}
else
{
@ -203,7 +205,7 @@ RadarProductManager::GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
});
}
return radarData;
return std::make_pair(elevationFound, radarData);
}
} // namespace manager

4
scwx-qt/source/scwx/qt/manager/radar_product_manager.hpp
View file

@ -33,9 +33,9 @@ public:
void Initialize();
void LoadLevel2Data(const std::string& filename);
std::shared_ptr<wsr88d::rda::ElevationScan>
std::pair<float, std::shared_ptr<wsr88d::rda::ElevationScan>>
GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
uint16_t elevation,
float elevation,
std::chrono::system_clock::time_point time = {});
signals: