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

Merge pull request #422 from AdenKoperczak/fix_level2_bin_azimuth

Browse source
This commit is contained in:
Dan Paulat 2025-04-24 00:24:58 -05:00 • committed by GitHub
commit ef731038a2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1131,7 +1131,7 @@ void Level2ProductView::Impl::ComputeCoordinates(
units::degrees<float> angle {}; units::degrees<float> angle {};
auto radialData = radarData->find(radial); auto radialData = radarData->find(radial);
if (radialData != radarData->cend() && !smoothingEnabled) if (radialData != radarData->cend() && smoothingEnabled)
{ {
angle = radialData->second->azimuth_angle(); angle = radialData->second->azimuth_angle();
} }
@ -1143,7 +1143,7 @@ void Level2ProductView::Impl::ComputeCoordinates(
(radial >= 2) ? radial - 2 : numRadials - (2 - radial)); (radial >= 2) ? radial - 2 : numRadials - (2 - radial));
if (radialData != radarData->cend() && if (radialData != radarData->cend() &&
prevRadial1 != radarData->cend() && smoothingEnabled) prevRadial1 != radarData->cend() && !smoothingEnabled)
{ {
const units::degrees<float> currentAngle = const units::degrees<float> currentAngle =
radialData->second->azimuth_angle(); radialData->second->azimuth_angle();
@ -1154,13 +1154,13 @@ void Level2ProductView::Impl::ComputeCoordinates(
const units::degrees<float> deltaAngle = const units::degrees<float> deltaAngle =
NormalizeAngle(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 end of the
// bin, because smoothing is enabled // bin, because smoothing is not enabled
constexpr float deltaScale = 0.5f; constexpr float deltaScale = 0.5f;
angle = currentAngle + deltaAngle * deltaScale; angle = currentAngle - deltaAngle * deltaScale;
} }
else if (radialData != radarData->cend() && smoothingEnabled) else if (radialData != radarData->cend() && !smoothingEnabled)
{ {
const units::degrees<float> currentAngle = const units::degrees<float> currentAngle =
radialData->second->azimuth_angle(); radialData->second->azimuth_angle();
@ -1169,11 +1169,11 @@ void Level2ProductView::Impl::ComputeCoordinates(
// to determine a delta angle // to determine a delta angle
constexpr units::degrees<float> deltaAngle {0.5f}; constexpr units::degrees<float> deltaAngle {0.5f};
// Delta scale is half the delta angle to reach the center of the // Delta scale is half the delta angle to reach the edge of the
// bin, because smoothing is enabled // bin, because smoothing is enabled
constexpr float deltaScale = 0.5f; constexpr float deltaScale = 0.5f;
angle = currentAngle + deltaAngle * deltaScale; angle = currentAngle - deltaAngle * deltaScale;
} }
else if (prevRadial1 != radarData->cend() && else if (prevRadial1 != radarData->cend() &&
prevRadial2 != radarData->cend()) prevRadial2 != radarData->cend())
@ -1189,11 +1189,12 @@ void Level2ProductView::Impl::ComputeCoordinates(
const float deltaScale = const float deltaScale =
(smoothingEnabled) ? (smoothingEnabled) ?
// Delta scale is 1.5x the delta angle to reach the center // Delta scale is 1.0x the delta angle to reach the center
// of the next bin, because smoothing is enabled // of the next bin, because smoothing is enabled
1.5f : 1.0f :
// Delta scale is 1.0x the delta angle // Delta scale is 0.5x the delta angle to reach the edge of
1.0f; // the next bin
0.5f;
angle = prevAngle1 + deltaAngle * deltaScale; angle = prevAngle1 + deltaAngle * deltaScale;
} }
@ -1208,11 +1209,12 @@ void Level2ProductView::Impl::ComputeCoordinates(
const float deltaScale = const float deltaScale =
(smoothingEnabled) ? (smoothingEnabled) ?
// Delta scale is 1.5x the delta angle to reach the center // Delta scale is 1.0x the delta angle to reach the center
// of the next bin, because smoothing is enabled // of the next bin, because smoothing is enabled
1.5f : 1.0f :
// Delta scale is 1.0x the delta angle // Delta scale is 0.5x the delta angle to reach the edge of
1.0f; // the next bin
0.5f;
angle = prevAngle1 + deltaAngle * deltaScale; angle = prevAngle1 + deltaAngle * deltaScale;
} }
@ -1368,6 +1370,13 @@ Level2ProductView::GetBinLevel(const common::Coordinate& coordinate) const
if (nextRadial != radarData->cend()) if (nextRadial != radarData->cend())
{ {
nextAngle = nextRadial->second->azimuth_angle(); nextAngle = nextRadial->second->azimuth_angle();
// Level 2 angles are the center of the bins.
const units::degrees<float> deltaAngle =
common::GetAngleDelta(startAngle, nextAngle);
startAngle -= deltaAngle / 2;
nextAngle -= deltaAngle / 2;
hasNextAngle = true; hasNextAngle = true;
} }
else else
@ -1384,7 +1393,9 @@ Level2ProductView::GetBinLevel(const common::Coordinate& coordinate) const
const units::degrees<float> deltaAngle = const units::degrees<float> deltaAngle =
common::GetAngleDelta(startAngle, prevAngle); common::GetAngleDelta(startAngle, prevAngle);
nextAngle = startAngle + deltaAngle; // Level 2 angles are the center of the bins.
nextAngle = startAngle + deltaAngle / 2;
startAngle -= deltaAngle / 2;
hasNextAngle = true; hasNextAngle = true;
} }
} }