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

Delta angles must be normalized before they can be scaled

Browse source
This commit is contained in:
Dan Paulat 2024-12-02 22:38:12 -06:00
parent e0cd3610a6
commit d3ae404f7a
1 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,7 @@ public:
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);
Level2ProductView* self_; Level2ProductView* self_;
@ -1042,10 +1043,9 @@ void Level2ProductView::Impl::ComputeCoordinates(
const units::degrees<float> prevAngle = const units::degrees<float> prevAngle =
prevRadial1->second->azimuth_angle(); prevRadial1->second->azimuth_angle();
// No wrapping required since angle is only used for geodesic // Calculate delta angle
// calculation
const units::degrees<float> deltaAngle = const units::degrees<float> deltaAngle =
currentAngle - prevAngle; NormalizeAngle(currentAngle - prevAngle);
// Delta scale is half the delta angle to reach the center of the // Delta scale is half the delta angle to reach the center of the
// bin, because smoothing is enabled // bin, because smoothing is enabled
@ -1076,9 +1076,9 @@ void Level2ProductView::Impl::ComputeCoordinates(
const units::degrees<float> prevAngle2 = const units::degrees<float> prevAngle2 =
prevRadial2->second->azimuth_angle(); prevRadial2->second->azimuth_angle();
// No wrapping required since angle is only used for geodesic // Calculate delta angle
// calculation const units::degrees<float> deltaAngle =
const units::degrees<float> deltaAngle = prevAngle1 - prevAngle2; NormalizeAngle(prevAngle1 - prevAngle2);
const float deltaScale = const float deltaScale =
(smoothingEnabled) ? (smoothingEnabled) ?
@ -1162,6 +1162,25 @@ bool Level2ProductView::Impl::IsRadarDataIncomplete(
return angleDelta > kIncompleteDataAngleThreshold_; return angleDelta > kIncompleteDataAngleThreshold_;
} }
units::degrees<float>
Level2ProductView::Impl::NormalizeAngle(units::degrees<float> angle)
{
constexpr auto angleLimit = units::degrees<float> {180.0f};
constexpr auto fullAngle = units::degrees<float> {360.0f};
// Normalize angle to [-180, 180)
while (angle < -angleLimit)
{
angle += fullAngle;
}
while (angle >= angleLimit)
{
angle -= fullAngle;
}
return angle;
}
std::optional<std::uint16_t> std::optional<std::uint16_t>
Level2ProductView::GetBinLevel(const common::Coordinate& coordinate) const Level2ProductView::GetBinLevel(const common::Coordinate& coordinate) const
{ {