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

Store elevation scans as a shared pointer to avoid needless copying

Browse source
This commit is contained in:
Dan Paulat 2021-11-13 00:59:57 -06:00
parent efeb87baaa
commit ab616b0c62
6 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -180,12 +180,12 @@ void RadarProductManager::LoadLevel2Data(const std::string& filename)
emit Level2DataLoaded();
}
std::map<uint16_t, std::shared_ptr<wsr88d::rda::DigitalRadarData>>
std::shared_ptr<wsr88d::rda::ElevationScan>
RadarProductManager::GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
uint8_t elevationIndex,
std::chrono::system_clock::time_point time)
{
std::map<uint16_t, std::shared_ptr<wsr88d::rda::DigitalRadarData>> radarData;
std::shared_ptr<wsr88d::rda::ElevationScan> radarData = nullptr;
if (p->level2VolumeScans_.size() > 0)
{

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

@ -33,7 +33,7 @@ public:
void Initialize();
void LoadLevel2Data(const std::string& filename);
std::map<uint16_t, std::shared_ptr<wsr88d::rda::DigitalRadarData>>
std::shared_ptr<wsr88d::rda::ElevationScan>
GetLevel2Data(wsr88d::rda::DataBlockType dataBlockType,
uint8_t elevationIndex,
std::chrono::system_clock::time_point time = {});

15
scwx-qt/source/scwx/qt/view/level2_product_view.cpp
View file

@ -237,18 +237,20 @@ void Level2ProductView::ComputeSweep()
// TODO: Pick this based on view settings
auto radarData =
p->radarProductManager_->GetLevel2Data(p->dataBlockType_, 0);
if (radarData.size() == 0)
if (radarData == nullptr)
{
return;
}
const common::RadialSize radialSize = (radarData.size() == 720) ?
common::RadialSize::_0_5Degree :
common::RadialSize::_1Degree;
const size_t radials = radarData->size();
const common::RadialSize radialSize =
(radials == common::MAX_0_5_DEGREE_RADIALS) ?
common::RadialSize::_0_5Degree :
common::RadialSize::_1Degree;
const std::vector<float>& coordinates =
p->radarProductManager_->coordinates(radialSize);
auto radarData0 = radarData[0];
auto radarData0 = (*radarData)[0];
auto momentData0 = radarData0->moment_data_block(p->dataBlockType_);
p->momentDataBlock0_ = momentData0;
@ -270,7 +272,6 @@ void Level2ProductView::ComputeSweep()
// Setup vertex vector
std::vector<float>& vertices = p->vertices_;
const size_t radials = radarData.size();
const uint32_t gates = momentData0->number_of_data_moment_gates();
size_t vIndex = 0;
vertices.clear();
@ -311,7 +312,7 @@ void Level2ProductView::ComputeSweep()
const float startAngle = radarData0->azimuth_angle();
const uint16_t startRadial = std::lroundf(startAngle * radialMultiplier);
for (auto radialPair : radarData)
for (auto radialPair : *radarData)
{
uint16_t radial = radialPair.first;
auto radialData = radialPair.second;