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

Hide the radar sweep if no data is available

Browse source
This commit is contained in:
Dan Paulat 2025-08-30 18:26:10 -05:00
parent a306fb4363
commit f679f37fc1
1 changed files with 49 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

71
scwx-qt/source/scwx/qt/map/radar_product_layer.cpp
View file

@ -146,6 +146,21 @@ void RadarProductLayer::Initialize(
&view::RadarProductView::SweepComputed, &view::RadarProductView::SweepComputed,
this, this,
[this]() { p->sweepNeedsUpdate_ = true; }); [this]() { p->sweepNeedsUpdate_ = true; });
connect(radarProductView.get(),
&view::RadarProductView::SweepNotComputed,
this,
[this](types::NoUpdateReason reason)
{
if (reason == types::NoUpdateReason::NotAvailable)
{
// Ensure the radar product is hidden by re-rendering
Q_EMIT NeedsRendering();
}
if (reason == types::NoUpdateReason::NoChange)
{
Q_EMIT NeedsRendering();
}
});
} }
void RadarProductLayer::UpdateSweep( void RadarProductLayer::UpdateSweep(
@ -281,34 +296,46 @@ void RadarProductLayer::Render(
UpdateSweep(mapContext); UpdateSweep(mapContext);
} }
const float scale = std::pow(2.0, params.zoom) * 2.0f * std::shared_ptr<view::RadarProductView> radarProductView =
mbgl::util::tileSize_D / mbgl::util::DEGREES_MAX; mapContext->radar_product_view();
const float xScale = scale / params.width;
const float yScale = scale / params.height;
glm::mat4 uMVPMatrix(1.0f); const bool sweepVisible =
uMVPMatrix = glm::scale(uMVPMatrix, glm::vec3(xScale, yScale, 1.0f)); radarProductView != nullptr &&
uMVPMatrix = glm::rotate(uMVPMatrix, radarProductView->load_status() !=
glm::radians<float>(params.bearing), types::RadarProductLoadStatus::ProductNotAvailable;
glm::vec3(0.0f, 0.0f, 1.0f));
glUniform2fv(p->uMapScreenCoordLocation_, if (sweepVisible)
1, {
glm::value_ptr(util::maplibre::LatLongToScreenCoordinate( const float scale = std::pow(2.0, params.zoom) * 2.0f *
{params.latitude, params.longitude}))); mbgl::util::tileSize_D / mbgl::util::DEGREES_MAX;
const float xScale = scale / params.width;
const float yScale = scale / params.height;
glUniformMatrix4fv( glm::mat4 uMVPMatrix(1.0f);
p->uMVPMatrixLocation_, 1, GL_FALSE, glm::value_ptr(uMVPMatrix)); uMVPMatrix = glm::scale(uMVPMatrix, glm::vec3(xScale, yScale, 1.0f));
uMVPMatrix = glm::rotate(uMVPMatrix,
glm::radians<float>(params.bearing),
glm::vec3(0.0f, 0.0f, 1.0f));
glUniform1i(p->uCFPEnabledLocation_, p->cfpEnabled_ ? 1 : 0); glUniform2fv(p->uMapScreenCoordLocation_,
1,
glm::value_ptr(util::maplibre::LatLongToScreenCoordinate(
{params.latitude, params.longitude})));
glUniform1ui(p->uDataMomentOffsetLocation_, p->rangeMin_); glUniformMatrix4fv(
glUniform1f(p->uDataMomentScaleLocation_, p->scale_); p->uMVPMatrixLocation_, 1, GL_FALSE, glm::value_ptr(uMVPMatrix));
glActiveTexture(GL_TEXTURE0); glUniform1i(p->uCFPEnabledLocation_, p->cfpEnabled_ ? 1 : 0);
glBindTexture(GL_TEXTURE_1D, p->texture_);
glBindVertexArray(p->vao_); glUniform1ui(p->uDataMomentOffsetLocation_, p->rangeMin_);
glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(p->numVertices_)); glUniform1f(p->uDataMomentScaleLocation_, p->scale_);
glActiveTexture(GL_TEXTURE0);
glBindTexture(GL_TEXTURE_1D, p->texture_);
glBindVertexArray(p->vao_);
glDrawArrays(GL_TRIANGLES, 0, static_cast<GLsizei>(p->numVertices_));
}
if (wireframeEnabled) if (wireframeEnabled)
{ {