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

Perform level 2 data moment remapping when smoothing

Browse source
This commit is contained in:
Dan Paulat 2024-12-07 23:46:06 -06:00
parent ac48ac24ab
commit c492f11466
1 changed files with 64 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -114,6 +114,10 @@ public:
void UpdateOtherUnits(const std::string& name); void UpdateOtherUnits(const std::string& name);
void UpdateSpeedUnits(const std::string& name); void UpdateSpeedUnits(const std::string& name);
void ComputeEdgeValue();
template<typename T>
inline T RemapDataMoment(T dataMoment) const;
static bool IsRadarDataIncomplete( static bool IsRadarDataIncomplete(
const std::shared_ptr<const wsr88d::rda::ElevationScan>& radarData); const std::shared_ptr<const wsr88d::rda::ElevationScan>& radarData);
static units::degrees<float> NormalizeAngle(units::degrees<float> angle); static units::degrees<float> NormalizeAngle(units::degrees<float> angle);
@ -138,6 +142,7 @@ public:
std::vector<uint8_t> dataMoments8_ {}; std::vector<uint8_t> dataMoments8_ {};
std::vector<uint16_t> dataMoments16_ {}; std::vector<uint16_t> dataMoments16_ {};
std::vector<uint8_t> cfpMoments_ {}; std::vector<uint8_t> cfpMoments_ {};
std::uint16_t edgeValue_ {};
float latitude_; float latitude_;
float longitude_; float longitude_;
@ -633,6 +638,13 @@ void Level2ProductView::ComputeSweep()
// Start radial is always 0, as coordinates are calculated for each sweep // Start radial is always 0, as coordinates are calculated for each sweep
constexpr std::uint16_t startRadial = 0u; constexpr std::uint16_t startRadial = 0u;
// For most products other than reflectivity, the edge should not go to the
// bottom of the color table
if (smoothingEnabled)
{
p->ComputeEdgeValue();
}
for (auto it = radarData->cbegin(); it != radarData->cend(); ++it) for (auto it = radarData->cbegin(); it != radarData->cend(); ++it)
{ {
const auto& radialPair = *it; const auto& radialPair = *it;
@ -796,12 +808,12 @@ void Level2ProductView::ComputeSweep()
} }
// The order must match the store vertices section below // The order must match the store vertices section below
dataMoments8[mIndex++] = dm1; dataMoments8[mIndex++] = p->RemapDataMoment(dm1);
dataMoments8[mIndex++] = dm2; dataMoments8[mIndex++] = p->RemapDataMoment(dm2);
dataMoments8[mIndex++] = dm4; dataMoments8[mIndex++] = p->RemapDataMoment(dm4);
dataMoments8[mIndex++] = dm1; dataMoments8[mIndex++] = p->RemapDataMoment(dm1);
dataMoments8[mIndex++] = dm3; dataMoments8[mIndex++] = p->RemapDataMoment(dm3);
dataMoments8[mIndex++] = dm4; dataMoments8[mIndex++] = p->RemapDataMoment(dm4);
// cfpMoments is unused, so not populated here // cfpMoments is unused, so not populated here
} }
@ -853,12 +865,12 @@ void Level2ProductView::ComputeSweep()
} }
// The order must match the store vertices section below // The order must match the store vertices section below
dataMoments16[mIndex++] = dm1; dataMoments16[mIndex++] = p->RemapDataMoment(dm1);
dataMoments16[mIndex++] = dm2; dataMoments16[mIndex++] = p->RemapDataMoment(dm2);
dataMoments16[mIndex++] = dm4; dataMoments16[mIndex++] = p->RemapDataMoment(dm4);
dataMoments16[mIndex++] = dm1; dataMoments16[mIndex++] = p->RemapDataMoment(dm1);
dataMoments16[mIndex++] = dm3; dataMoments16[mIndex++] = p->RemapDataMoment(dm3);
dataMoments16[mIndex++] = dm4; dataMoments16[mIndex++] = p->RemapDataMoment(dm4);
// cfpMoments is unused, so not populated here // cfpMoments is unused, so not populated here
} }
@ -970,6 +982,46 @@ void Level2ProductView::ComputeSweep()
Q_EMIT SweepComputed(); Q_EMIT SweepComputed();
} }
void Level2ProductView::Impl::ComputeEdgeValue()
{
const float offset = momentDataBlock0_->offset();
switch (dataBlockType_)
{
case wsr88d::rda::DataBlockType::MomentVel:
case wsr88d::rda::DataBlockType::MomentZdr:
edgeValue_ = offset;
break;
case wsr88d::rda::DataBlockType::MomentSw:
case wsr88d::rda::DataBlockType::MomentPhi:
edgeValue_ = 2;
break;
case wsr88d::rda::DataBlockType::MomentRho:
edgeValue_ = 255;
break;
case wsr88d::rda::DataBlockType::MomentRef:
default:
edgeValue_ = 0;
break;
}
}
template<typename T>
T Level2ProductView::Impl::RemapDataMoment(T dataMoment) const
{
if (dataMoment != 0)
{
return dataMoment;
}
else
{
return edgeValue_;
}
}
void Level2ProductView::Impl::ComputeCoordinates( void Level2ProductView::Impl::ComputeCoordinates(
const std::shared_ptr<wsr88d::rda::ElevationScan>& radarData, const std::shared_ptr<wsr88d::rda::ElevationScan>& radarData,
bool smoothingEnabled) bool smoothingEnabled)