From 3461c3fcf0ad1f6f76ceeeb649bb33bcea26d1ec Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 30 Oct 2026 16:20:59 +0000 Subject: [PATCH] Optimise performance of GUI components. --- sdrbase/CMakeLists.txt | 2 ++ sdrgui/gui/glspectrumview.cpp | 6 ++++-- sdrgui/gui/levelmeter.cpp | 19 ++++++++++++------- sdrgui/gui/levelmeter.h | 6 ++++++ 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/sdrbase/CMakeLists.txt b/sdrbase/CMakeLists.txt index e447a114b..323ffc7f4 100644 --- a/sdrbase/CMakeLists.txt +++ b/sdrbase/CMakeLists.txt @@ -225,6 +225,7 @@ set(sdrbase_SOURCES util/airlines.cpp util/ais.cpp util/android.cpp + util/asset3dmanifest.cpp util/aprsfi.cpp util/aviationweather.cpp util/ax25.cpp @@ -512,6 +513,7 @@ set(sdrbase_HEADERS util/airlines.h util/ais.h util/android.h + util/asset3dmanifest.h util/aprsfi.h util/aurora.h util/aviationweather.h diff --git a/sdrgui/gui/glspectrumview.cpp b/sdrgui/gui/glspectrumview.cpp index 866013713..74ab32175 100644 --- a/sdrgui/gui/glspectrumview.cpp +++ b/sdrgui/gui/glspectrumview.cpp @@ -5427,8 +5427,10 @@ void GLSpectrumView::leaveEvent(QEvent* event) void GLSpectrumView::tick() { - // Update scroll bar to account for changes to m_spectrumBuffer and waterfall size changes - updateScrollBar(); + // Update scroll bar to account for changes to m_spectrumBuffer and waterfall size changes. + if (m_scrollBar && !m_scrollBar->visibleRegion().isEmpty()) { + updateScrollBar(); + } if (m_displayChanged) { diff --git a/sdrgui/gui/levelmeter.cpp b/sdrgui/gui/levelmeter.cpp index f5cd748dc..62b8a6bbc 100644 --- a/sdrgui/gui/levelmeter.cpp +++ b/sdrgui/gui/levelmeter.cpp @@ -118,8 +118,8 @@ void LevelMeter::requestUpdate() return; } // A hidden meter is still fed by its channel's tick. Qt would discard the repaint, - // but asking for it still marks the window dirty - if (!isVisible()) { + // but asking for it still marks the window dirty. + if (!isVisible() || visibleRegion().isEmpty()) { return; } if ((levelPixel(m_avgLevel) == m_paintedAvg) @@ -150,11 +150,12 @@ void LevelMeter::levelChanged(qreal avgLevel, qreal peakLevel, int numSamples) m_peakHoldLevelChanged.start(); } - // The redraw timer exists to animate the peak decaying between readings. A reading - // has just arrived, so restart it rather than let it free run: otherwise its ticks - // interleave with these and the meter asks for half as many repaints again as there - // is new data to show - m_redrawTimer->start(RedrawInterval); + // The redraw timer exists to animate the peak decaying between readings, so it only + // needs starting when there is a peak to decay or hold and it has stopped. + m_lastReading.start(); + if (!m_redrawTimer->isActive() && ((m_decayedPeakLevel > 0.0) || (m_peakHoldLevel > 0.0))) { + m_redrawTimer->start(RedrawInterval); + } requestUpdate(); } @@ -179,6 +180,10 @@ void LevelMeter::redrawTimerExpired() m_redrawTimer->stop(); } + if (m_lastReading.isValid() && (m_lastReading.elapsed() < RedrawInterval)) { + return; + } + requestUpdate(); } diff --git a/sdrgui/gui/levelmeter.h b/sdrgui/gui/levelmeter.h index 4b799442b..dfe2d2594 100644 --- a/sdrgui/gui/levelmeter.h +++ b/sdrgui/gui/levelmeter.h @@ -162,6 +162,12 @@ protected: */ uint32_t m_avgSmoothing; + /** + * Time at which the last reading arrived, so the redraw timer can leave the + * repaint to it while readings are coming in. + */ + QElapsedTimer m_lastReading; + QTimer *m_redrawTimer; QColor m_avgColor;