multi_vfo: fix inactive VFO rendering

Author: vladisslav2011

src/applications/gqrx/mainwindow.cpp

@@ -1166,6 +1166,7 @@ void MainWindow::readRXSettings(int ver, double actual_rate)
     if(std::abs(offs) > actual_rate / 2)
         rx->set_filter_offset((offs > 0) ? (actual_rate / 2) : (-actual_rate / 2));
     loadRxToGUI();
+    ui->plotter->updateOverlay();
 }
 
 /**
@@ -1527,6 +1528,7 @@ void MainWindow::setFilterOffset(qint64 freq_hz)
     if (rx->is_rds_decoder_active()) {
         rx->reset_rds_parser();
     }
+    ui->plotter->updateOverlay();
 }
 
 /**
@@ -1755,6 +1757,7 @@ void MainWindow::selectDemod(Modulations::idx mode_idx)
     }
     rx->set_filter(flo, fhi, d_filter_shape);
     updateDemodGUIRanges();
+    ui->plotter->updateOverlay();
 }
 
 /**
@@ -2360,6 +2363,7 @@ void MainWindow::startIqPlayback(const QString& filename, float samprate, qint64
     uiDockRxOpt->setFilterOffsetRange((qint64)(actual_rate));
     ui->plotter->setSampleRate(actual_rate);
     ui->plotter->setSpanFreq((quint32)actual_rate);
+    ui->plotter->updateOverlay();
     if (std::abs(current_offset) > actual_rate / 2)
         on_plotter_newDemodFreq(center_freq, 0);
     else
@@ -2400,6 +2404,7 @@ void MainWindow::stopIqPlayback()
         uiDockRxOpt->setFilterOffsetRange((qint64)(actual_rate));
         ui->plotter->setSampleRate(actual_rate);
         ui->plotter->setSpanFreq((quint32)actual_rate);
+        ui->plotter->updateOverlay();
         remote->setBandwidth(sr);
 
         // not needed as long as we are not recording in iq_tool
@@ -2797,6 +2802,7 @@ void MainWindow::on_plotter_newFilterFreq(int low, int high)
     /* Update filter range of plotter, in case this slot is triggered by
      * switching to a bookmark */
     ui->plotter->setHiLowCutFrequencies(low, high);
+    ui->plotter->updateOverlay();
 
     if (retcode == receiver::STATUS_OK)
         uiDockRxOpt->setFilterParam(low, high);
@@ -2962,6 +2968,7 @@ void MainWindow::onBookmarkActivated(BookmarkInfo & bm)
     old_vfo->set_offset(old_offset);
     old_vfo->set_freq_lock(true);
     loadRxToGUI();
+    ui->plotter->updateOverlay();
 }
 
 void MainWindow::onBookmarkActivatedAddDemod(BookmarkInfo & bm)
@@ -3232,6 +3239,7 @@ void MainWindow::on_actionAddDemodulator_triggered()
     ui->plotter->setCurrentVfo(rx->get_rx_count() - 1);
     rxSpinBox->setMaximum(rx->get_rx_count() - 1);
     rxSpinBox->setValue(n);
+    ui->plotter->updateOverlay();
 }
 
 void MainWindow::on_actionRemoveDemodulator_triggered()
@@ -3246,6 +3254,7 @@ void MainWindow::on_actionRemoveDemodulator_triggered()
     if (old_current != n)
         ui->plotter->removeVfo(rx->get_vfo(n));
     ui->plotter->setCurrentVfo(n);
+    ui->plotter->updateOverlay();
 }
 
 void MainWindow::rxSpinBox_valueChanged(int i)
@@ -3258,6 +3267,7 @@ void MainWindow::rxSpinBox_valueChanged(int i)
     ui->plotter->setCurrentVfo(i);
     if (n == receiver::STATUS_OK)
         loadRxToGUI();
+    ui->plotter->updateOverlay();
 }
 
 void MainWindow::on_plotter_selectVfo(int i)

src/qtgui/dockrxopt.cpp

@@ -154,7 +154,9 @@ DockRxOpt::~DockRxOpt()
  */
 void DockRxOpt::setFilterOffset(qint64 freq_hz)
 {
+    ui->filterFreq->blockSignals(true);
     ui->filterFreq->setFrequency(freq_hz);
+    ui->filterFreq->blockSignals(false);
 }
 
 /**
@@ -231,6 +233,7 @@ void DockRxOpt::setFilterParam(int lo, int hi)
 {
     int filter_index = filterIdxFromLoHi(lo, hi);
 
+    ui->filterCombo->blockSignals(true);
     ui->filterCombo->setCurrentIndex(filter_index);
     if (filter_index == FILTER_PRESET_USER)
     {
@@ -239,6 +242,7 @@ void DockRxOpt::setFilterParam(int lo, int hi)
         ui->filterCombo->setItemText(FILTER_PRESET_USER, QString("User (%1 k)")
                                      .arg((double)width_f));
     }
+    ui->filterCombo->blockSignals(false);
 }
 
 /**
@@ -247,7 +251,9 @@ void DockRxOpt::setFilterParam(int lo, int hi)
  */
 void DockRxOpt::setCurrentFilter(int index)
 {
+    ui->filterCombo->blockSignals(true);
     ui->filterCombo->setCurrentIndex(index);
+    ui->filterCombo->blockSignals(false);
 }
 
 /**
@@ -262,7 +268,9 @@ int  DockRxOpt::currentFilter() const
 /** Select filter shape */
 void DockRxOpt::setCurrentFilterShape(int index)
 {
+    ui->filterCombo->blockSignals(true);
     ui->filterShapeCombo->setCurrentIndex(index);
+    ui->filterCombo->blockSignals(false);
 }
 
 int  DockRxOpt::currentFilterShape() const
@@ -278,7 +286,9 @@ void DockRxOpt::setCurrentDemod(Modulations::idx demod)
 {
     if ((demod >= Modulations::MODE_OFF) && (demod < Modulations::MODE_LAST))
     {
+        ui->modeSelector->blockSignals(true);
         ui->modeSelector->setCurrentIndex(demod);
+        ui->modeSelector->blockSignals(false);
         updateDemodOptPage(demod);
     }
 }

src/qtgui/plotter.cpp

@@ -726,7 +726,6 @@ bool CPlotter::saveWaterfall(const QString & filename) const
 void CPlotter::setCurrentVfo(int current)
 {
     m_currentVfo = current;
-    updateOverlay();
 }
 
 void    CPlotter::addVfo(vfo::sptr n_vfo)
@@ -2409,12 +2408,12 @@ void CPlotter::drawVfo(QPainter &painter, const int demodFreqX, const int demodL
     QFontMetrics    metrics(m_Font);
     QRect         br = metrics.boundingRect("+256+");
     painter.setOpacity(0.3);
-    painter.fillRect(m_DemodLowCutFreqX, br.height(), dw, h,
+    painter.fillRect(demodLowCutFreqX, br.height(), dw, h,
                     QColor(PLOTTER_FILTER_BOX_COLOR));
 
     painter.setOpacity(1.0);
     painter.setPen(QPen(QColor(is_selected ? PLOTTER_FILTER_LINE_COLOR : PLOTTER_TEXT_COLOR), m_DPR));
-    painter.drawLine(demodFreqX, br.height(), m_DemodFreqX, h);
+    painter.drawLine(demodFreqX, br.height(), demodFreqX, h);
     painter.drawText(demodFreqX - br.width() / 2, 0, br.width(), br.height(),
                      Qt::AlignVCenter | Qt::AlignHCenter,
                      QString::number(index));
@@ -2550,7 +2549,6 @@ void CPlotter::setDemodRanges(int FLowCmin, int FLowCmax,
     m_FHiCmax=FHiCmax;
     m_symetric=symetric;
     clampDemodParameters();
-    updateOverlay();
 }
 
 void CPlotter::setCenterFreq(quint64 f)

src/qtgui/plotter.h

@@ -60,7 +60,6 @@ class CPlotter : public QFrame
     void setFilterOffset(qint64 freq_hz)
     {
         m_DemodCenterFreq = m_CenterFreq + freq_hz;
-        updateOverlay();
     }
     qint64 getFilterOffset() const
     {
@@ -76,7 +75,6 @@ class CPlotter : public QFrame
     {
         m_DemodLowCutFreq = LowCut;
         m_DemodHiCutFreq = HiCut;
-        updateOverlay();
     }
 
     void getHiLowCutFrequencies(int *LowCut, int *HiCut) const
@@ -94,7 +92,6 @@ class CPlotter : public QFrame
             m_Span = (qint32)s;
             setFftCenterFreq(m_FftCenter);
         }
-        updateOverlay();
     }
 
     void setVdivDelta(int delta) { m_VdivDelta = delta; }