From b2fbfa0deeef086bb1357c74fcbba34caf47d1ac Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 3 Apr 2022 18:43:59 -0500 Subject: [PATCH] Make sure RadarProductView usage is consistent --- scwx-qt/source/scwx/qt/map/radar_product_layer.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp index 64f62ab9..aad94b14 100644 --- a/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/radar_product_layer.cpp @@ -154,8 +154,10 @@ void RadarProductLayer::UpdateSweep() boost::timer::cpu_timer timer; - const std::vector& vertices = - context()->radarProductView_->vertices(); + std::shared_ptr radarProductView = + context()->radarProductView_; + + const std::vector& vertices = radarProductView->vertices(); // Bind a vertex array object gl.glBindVertexArray(p->vao_); @@ -180,8 +182,7 @@ void RadarProductLayer::UpdateSweep() size_t componentSize; GLenum type; - std::tie(data, dataSize, componentSize) = - context()->radarProductView_->GetMomentData(); + std::tie(data, dataSize, componentSize) = radarProductView->GetMomentData(); if (componentSize == 1) { @@ -209,7 +210,7 @@ void RadarProductLayer::UpdateSweep() GLenum cfpType; std::tie(cfpData, cfpDataSize, cfpComponentSize) = - context()->radarProductView_->GetCfpMomentData(); + radarProductView->GetCfpMomentData(); if (cfpData != nullptr) {