VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-09-03 05:37:50 -04:00
Code Issues Projects Releases Wiki Activity

Highlight demod frame when the marker is highlighted on the spectrum

Browse Source
This commit is contained in:
f4exb 2017-11-14 22:58:35 +01:00
parent 84113775aa
commit 3db655fe61
24 changed files with 90 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/channelrx/chanalyzer/chanalyzergui.cpp
View File

@ -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();

1
plugins/channelrx/chanalyzer/chanalyzergui.h
View File

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

6
plugins/channelrx/chanalyzerng/chanalyzernggui.cpp
View File

@ -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();

1
plugins/channelrx/chanalyzerng/chanalyzernggui.h
View File

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

6
plugins/channelrx/demodam/amdemodgui.cpp
View File

@ -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);

1
plugins/channelrx/demodam/amdemodgui.h
View File

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

6
plugins/channelrx/demodatv/atvdemodgui.cpp
View File

@ -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);

1
plugins/channelrx/demodatv/atvdemodgui.h
View File

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

6
plugins/channelrx/demodbfm/bfmdemodgui.cpp
View File

@ -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);

1
plugins/channelrx/demodbfm/bfmdemodgui.h
View File

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

5
plugins/channelrx/demoddsd/dsddemodgui.cpp
View File

@ -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()
{

1
plugins/channelrx/demoddsd/dsddemodgui.h
View File

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

6
plugins/channelrx/demodnfm/nfmdemodgui.cpp
View File

@ -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);

1
plugins/channelrx/demodnfm/nfmdemodgui.h
View File

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

6
plugins/channelrx/demodssb/ssbdemodgui.cpp
View File

@ -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);

1
plugins/channelrx/demodssb/ssbdemodgui.h
View File

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

6
plugins/channelrx/demodwfm/wfmdemodgui.cpp
View File

@ -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);

1
plugins/channelrx/demodwfm/wfmdemodgui.h
View File

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

6
plugins/channelrx/tcpsrc/tcpsrcgui.cpp
View File

@ -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);

1
plugins/channelrx/tcpsrc/tcpsrcgui.h
View File

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

6
plugins/channelrx/udpsrc/udpsrcgui.cpp
View File

@ -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);

1
plugins/channelrx/udpsrc/udpsrcgui.h
View File

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

14
sdrgui/gui/rollupwidget.cpp
View File

@ -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);

2
sdrgui/gui/rollupwidget.h
View File

@ -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();