Highlight demod frame when the marker is highlighted on the spectrum

plugins/channelrx/chanalyzer/chanalyzergui.cpp

@@ -188,6 +188,11 @@ void ChannelAnalyzerGUI::channelMarkerChangedByCursor()
     applySettings();
 }
 
+void ChannelAnalyzerGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void ChannelAnalyzerGUI::tick()
 {
 	Real powDb = CalcDb::dbPower(m_channelAnalyzer->getMagSq());
@@ -368,6 +373,7 @@ ChannelAnalyzerGUI::ChannelAnalyzerGUI(PluginAPI* pluginAPI, DeviceUISet *device
 	ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 	connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
 
 	applySettings();

plugins/channelrx/chanalyzer/chanalyzergui.h

@@ -55,6 +55,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+	void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::ChannelAnalyzerGUI* ui;

plugins/channelrx/chanalyzerng/chanalyzernggui.cpp

@@ -227,6 +227,11 @@ void ChannelAnalyzerNGGUI::channelMarkerChangedByCursor()
 	applySettings();
 }
 
+void ChannelAnalyzerNGGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void ChannelAnalyzerNGGUI::tick()
 {
 	double powDb = CalcDb::dbPower(m_channelAnalyzer->getMagSq());
@@ -432,6 +437,7 @@ ChannelAnalyzerNGGUI::ChannelAnalyzerNGGUI(PluginAPI* pluginAPI, DeviceUISet *de
 	ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 	connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleInputMessages()));
 
 	applySettings();

plugins/channelrx/chanalyzerng/chanalyzernggui.h

@@ -55,6 +55,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+	void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::ChannelAnalyzerNGGUI* ui;

plugins/channelrx/demodam/amdemodgui.cpp

@@ -101,6 +101,11 @@ void AMDemodGUI::channelMarkerChangedByCursor()
 	applySettings();
 }
 
+void AMDemodGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void AMDemodGUI::on_deltaFrequency_changed(qint64 value)
 {
     m_channelMarker.setCenterFrequency(value);
@@ -216,6 +221,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
 	displaySettings();
 	applySettings(true);

plugins/channelrx/demodam/amdemodgui.h

@@ -38,6 +38,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+	void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::AMDemodGUI* ui;

plugins/channelrx/demodatv/atvdemodgui.cpp

@@ -245,6 +245,11 @@ void ATVDemodGUI::channelMarkerChangedByCursor()
     applyRFSettings();
 }
 
+void ATVDemodGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void ATVDemodGUI::handleSourceMessages()
 {
     Message* message;
@@ -325,6 +330,7 @@ ATVDemodGUI::ATVDemodGUI(PluginAPI* objPluginAPI, DeviceUISet *deviceUISet, Base
     ui->scopeGUI->focusOnTrigger(0); // re-focus to take changes into account in the GUI
 
     connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
     connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
 
     QChar delta = QChar(0x94, 0x03);

plugins/channelrx/demodatv/atvdemodgui.h

@@ -56,6 +56,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::ATVDemodGUI* ui;

plugins/channelrx/demodbfm/bfmdemodgui.cpp

@@ -143,6 +143,11 @@ void BFMDemodGUI::channelMarkerChangedByCursor()
     applySettings();
 }
 
+void BFMDemodGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void BFMDemodGUI::on_deltaFrequency_changed(qint64 value)
 {
     m_channelMarker.setCenterFrequency(value);
@@ -371,6 +376,7 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
 	ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
 

plugins/channelrx/demodbfm/bfmdemodgui.h

@@ -57,6 +57,7 @@ public:
 
 public slots:
     void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::BFMDemodGUI* ui;

plugins/channelrx/demoddsd/dsddemodgui.cpp

@@ -296,6 +296,7 @@ DSDDemodGUI::DSDDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
 	ui->scopeGUI->setBuddies(m_scopeVis->getInputMessageQueue(), m_scopeVis, ui->glScope);
 
@@ -556,6 +557,10 @@ void DSDDemodGUI::channelMarkerChangedByCursor()
     applySettings();
 }
 
+void DSDDemodGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
 
 void DSDDemodGUI::tick()
 {

plugins/channelrx/demoddsd/dsddemodgui.h

@@ -59,6 +59,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	typedef enum

plugins/channelrx/demodnfm/nfmdemodgui.cpp

@@ -105,6 +105,11 @@ void NFMDemodGUI::channelMarkerChangedByCursor()
     applySettings();
 }
 
+void NFMDemodGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void NFMDemodGUI::on_deltaFrequency_changed(qint64 value)
 {
     m_channelMarker.setCenterFrequency(value);
@@ -293,6 +298,7 @@ NFMDemodGUI::NFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
 	QChar delta = QChar(0x94, 0x03);
 	ui->deltaSquelch->setText(delta);

plugins/channelrx/demodnfm/nfmdemodgui.h

@@ -40,6 +40,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::NFMDemodGUI* ui;

plugins/channelrx/demodssb/ssbdemodgui.cpp

@@ -88,6 +88,11 @@ void SSBDemodGUI::channelMarkerChangedByCursor()
     applySettings();
 }
 
+void SSBDemodGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void SSBDemodGUI::on_audioBinaural_toggled(bool binaural)
 {
 	m_audioBinaural = binaural;
@@ -242,6 +247,7 @@ SSBDemodGUI::SSBDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
 	ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
 

plugins/channelrx/demodssb/ssbdemodgui.h

@@ -40,6 +40,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::SSBDemodGUI* ui;

plugins/channelrx/demodwfm/wfmdemodgui.cpp

@@ -85,6 +85,11 @@ void WFMDemodGUI::channelMarkerChangedByCursor()
     applySettings();
 }
 
+void WFMDemodGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void WFMDemodGUI::on_deltaFrequency_changed(qint64 value)
 {
     m_channelMarker.setCenterFrequency(value);
@@ -197,6 +202,7 @@ WFMDemodGUI::WFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
     displaySettings();
 	applySettings(true);

plugins/channelrx/demodwfm/wfmdemodgui.h

@@ -38,6 +38,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::WFMDemodGUI* ui;

plugins/channelrx/tcpsrc/tcpsrcgui.cpp

@@ -114,6 +114,11 @@ void TCPSrcGUI::channelMarkerChangedByCursor()
 	applySettings();
 }
 
+void TCPSrcGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void TCPSrcGUI::tick()
 {
     double powDb = CalcDb::dbPower(m_tcpSrc->getMagSq());
@@ -168,6 +173,7 @@ TCPSrcGUI::TCPSrcGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
 	ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
 

plugins/channelrx/tcpsrc/tcpsrcgui.h

@@ -41,6 +41,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::TCPSrcGUI* ui;

plugins/channelrx/udpsrc/udpsrcgui.cpp

@@ -102,6 +102,11 @@ void UDPSrcGUI::channelMarkerChangedByCursor()
     applySettingsImmediate();
 }
 
+void UDPSrcGUI::channelMarkerHighlightedByCursor()
+{
+    setHighlighted(m_channelMarker.getHighlighted());
+}
+
 void UDPSrcGUI::tick()
 {
     if (m_tickCount % 4 == 0)
@@ -183,6 +188,7 @@ UDPSrcGUI::UDPSrcGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandSam
 	m_deviceUISet->addRollupWidget(this);
 
 	connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
+    connect(&m_channelMarker, SIGNAL(highlightedByCursor()), this, SLOT(channelMarkerHighlightedByCursor()));
 
 	ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
 

plugins/channelrx/udpsrc/udpsrcgui.h

@@ -57,6 +57,7 @@ public:
 
 public slots:
 	void channelMarkerChangedByCursor();
+    void channelMarkerHighlightedByCursor();
 
 private:
 	Ui::UDPSrcGUI* ui;

sdrgui/gui/rollupwidget.cpp

@@ -5,7 +5,8 @@
 #include "ui_glspectrumgui.h"
 
 RollupWidget::RollupWidget(QWidget* parent) :
-	QWidget(parent)
+	QWidget(parent),
+	m_highlighted(false)
 {
 	setMinimumSize(250, 150);
 	setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
@@ -99,6 +100,15 @@ void RollupWidget::setTitleColor(const QColor& c)
 	update();
 }
 
+void RollupWidget::setHighlighted(bool highlighted)
+{
+    if (m_highlighted != highlighted)
+    {
+        m_highlighted = highlighted;
+        update();
+    }
+}
+
 int RollupWidget::arrangeRollups()
 {
 	QFontMetrics fm(font());
@@ -153,7 +163,7 @@ void RollupWidget::paintEvent(QPaintEvent*)
 	p.drawRect(width() - 5, height() - 5, 5, 5);
 
 	// Rahmen
-	p.setPen(frame);
+	p.setPen(m_highlighted ? Qt::white : frame);
 	p.setBrush(palette().window());
 	QRectF r(rect());
 	r.adjust(0.5, 0.5, -0.5, -0.5);

sdrgui/gui/rollupwidget.h

@@ -10,6 +10,7 @@ class SDRANGEL_API RollupWidget : public QWidget {
 public:
 	RollupWidget(QWidget* parent = NULL);
 	void setTitleColor(const QColor& c);
+	void setHighlighted(bool highlighted);
 
 signals:
 	void widgetRolled(QWidget* widget, bool rollDown);
@@ -21,6 +22,7 @@ protected:
 
 	QColor m_titleColor;
 	QColor m_titleTextColor;
+	bool m_highlighted;
 
 	int arrangeRollups();