mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-09-30 16:56:35 -04:00
Deep redesign: AM demod: allocalte channel marker on demod GUI object stack
This commit is contained in:
parent
d2ed278ba3
commit
fd816a0b1d
@ -39,7 +39,7 @@ QString AMDemodGUI::getName() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
qint64 AMDemodGUI::getCenterFrequency() const {
|
qint64 AMDemodGUI::getCenterFrequency() const {
|
||||||
return m_channelMarker->getCenterFrequency();
|
return m_channelMarker.getCenterFrequency();
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMDemodGUI::resetToDefaults()
|
void AMDemodGUI::resetToDefaults()
|
||||||
@ -59,12 +59,12 @@ void AMDemodGUI::resetToDefaults()
|
|||||||
QByteArray AMDemodGUI::serialize() const
|
QByteArray AMDemodGUI::serialize() const
|
||||||
{
|
{
|
||||||
SimpleSerializer s(1);
|
SimpleSerializer s(1);
|
||||||
s.writeS32(1, m_channelMarker->getCenterFrequency());
|
s.writeS32(1, m_channelMarker.getCenterFrequency());
|
||||||
s.writeS32(2, ui->rfBW->value());
|
s.writeS32(2, ui->rfBW->value());
|
||||||
s.writeS32(3, ui->afBW->value());
|
s.writeS32(3, ui->afBW->value());
|
||||||
s.writeS32(4, ui->volume->value());
|
s.writeS32(4, ui->volume->value());
|
||||||
s.writeS32(5, ui->squelch->value());
|
s.writeS32(5, ui->squelch->value());
|
||||||
s.writeU32(7, m_channelMarker->getColor().rgb());
|
s.writeU32(7, m_channelMarker.getColor().rgb());
|
||||||
return s.final();
|
return s.final();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,10 +85,10 @@ bool AMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
qint32 tmp;
|
qint32 tmp;
|
||||||
|
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
m_channelMarker->blockSignals(true);
|
m_channelMarker.blockSignals(true);
|
||||||
|
|
||||||
d.readS32(1, &tmp, 0);
|
d.readS32(1, &tmp, 0);
|
||||||
m_channelMarker->setCenterFrequency(tmp);
|
m_channelMarker.setCenterFrequency(tmp);
|
||||||
d.readS32(2, &tmp, 4);
|
d.readS32(2, &tmp, 4);
|
||||||
ui->rfBW->setValue(tmp);
|
ui->rfBW->setValue(tmp);
|
||||||
d.readS32(3, &tmp, 3);
|
d.readS32(3, &tmp, 3);
|
||||||
@ -100,11 +100,11 @@ bool AMDemodGUI::deserialize(const QByteArray& data)
|
|||||||
|
|
||||||
if(d.readU32(7, &u32tmp))
|
if(d.readU32(7, &u32tmp))
|
||||||
{
|
{
|
||||||
m_channelMarker->setColor(u32tmp);
|
m_channelMarker.setColor(u32tmp);
|
||||||
}
|
}
|
||||||
|
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
m_channelMarker->blockSignals(false);
|
m_channelMarker.blockSignals(false);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
return true;
|
return true;
|
||||||
@ -128,28 +128,28 @@ void AMDemodGUI::viewChanged()
|
|||||||
|
|
||||||
void AMDemodGUI::on_deltaMinus_clicked(bool minus)
|
void AMDemodGUI::on_deltaMinus_clicked(bool minus)
|
||||||
{
|
{
|
||||||
int deltaFrequency = m_channelMarker->getCenterFrequency();
|
int deltaFrequency = m_channelMarker.getCenterFrequency();
|
||||||
bool minusDelta = (deltaFrequency < 0);
|
bool minusDelta = (deltaFrequency < 0);
|
||||||
|
|
||||||
if (minus ^ minusDelta) // sign change
|
if (minus ^ minusDelta) // sign change
|
||||||
{
|
{
|
||||||
m_channelMarker->setCenterFrequency(-deltaFrequency);
|
m_channelMarker.setCenterFrequency(-deltaFrequency);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMDemodGUI::on_deltaFrequency_changed(quint64 value)
|
void AMDemodGUI::on_deltaFrequency_changed(quint64 value)
|
||||||
{
|
{
|
||||||
if (ui->deltaMinus->isChecked()) {
|
if (ui->deltaMinus->isChecked()) {
|
||||||
m_channelMarker->setCenterFrequency(-value);
|
m_channelMarker.setCenterFrequency(-value);
|
||||||
} else {
|
} else {
|
||||||
m_channelMarker->setCenterFrequency(value);
|
m_channelMarker.setCenterFrequency(value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMDemodGUI::on_rfBW_valueChanged(int value)
|
void AMDemodGUI::on_rfBW_valueChanged(int value)
|
||||||
{
|
{
|
||||||
ui->rfBWText->setText(QString("%1 kHz").arg(m_rfBW[value] / 1000.0));
|
ui->rfBWText->setText(QString("%1 kHz").arg(m_rfBW[value] / 1000.0));
|
||||||
m_channelMarker->setBandwidth(m_rfBW[value]);
|
m_channelMarker.setBandwidth(m_rfBW[value]);
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -184,7 +184,7 @@ void AMDemodGUI::onMenuDoubleClicked()
|
|||||||
{
|
{
|
||||||
if(!m_basicSettingsShown) {
|
if(!m_basicSettingsShown) {
|
||||||
m_basicSettingsShown = true;
|
m_basicSettingsShown = true;
|
||||||
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(m_channelMarker, this);
|
BasicChannelSettingsWidget* bcsw = new BasicChannelSettingsWidget(&m_channelMarker, this);
|
||||||
bcsw->show();
|
bcsw->show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -193,6 +193,7 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
RollupWidget(parent),
|
RollupWidget(parent),
|
||||||
ui(new Ui::AMDemodGUI),
|
ui(new Ui::AMDemodGUI),
|
||||||
m_pluginAPI(pluginAPI),
|
m_pluginAPI(pluginAPI),
|
||||||
|
m_channelMarker(this),
|
||||||
m_basicSettingsShown(false),
|
m_basicSettingsShown(false),
|
||||||
m_doApplySettings(true)
|
m_doApplySettings(true)
|
||||||
{
|
{
|
||||||
@ -206,13 +207,15 @@ AMDemodGUI::AMDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
|
|||||||
m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this);
|
m_threadedChannelizer = new ThreadedSampleSink(m_channelizer, this);
|
||||||
DSPEngine::instance()->addThreadedSink(m_threadedChannelizer);
|
DSPEngine::instance()->addThreadedSink(m_threadedChannelizer);
|
||||||
|
|
||||||
m_channelMarker = new ChannelMarker(this);
|
ui->deltaFrequency->setColorMapper(ColorMapper(ColorMapper::ReverseGold));
|
||||||
m_channelMarker->setColor(Qt::yellow);
|
|
||||||
m_channelMarker->setBandwidth(12500);
|
//m_channelMarker = new ChannelMarker(this);
|
||||||
m_channelMarker->setCenterFrequency(0);
|
m_channelMarker.setColor(Qt::yellow);
|
||||||
m_channelMarker->setVisible(true);
|
m_channelMarker.setBandwidth(12500);
|
||||||
connect(m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
|
m_channelMarker.setCenterFrequency(0);
|
||||||
m_pluginAPI->addChannelMarker(m_channelMarker);
|
m_channelMarker.setVisible(true);
|
||||||
|
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(viewChanged()));
|
||||||
|
m_pluginAPI->addChannelMarker(&m_channelMarker);
|
||||||
|
|
||||||
applySettings();
|
applySettings();
|
||||||
}
|
}
|
||||||
@ -224,7 +227,7 @@ AMDemodGUI::~AMDemodGUI()
|
|||||||
delete m_threadedChannelizer;
|
delete m_threadedChannelizer;
|
||||||
delete m_channelizer;
|
delete m_channelizer;
|
||||||
delete m_amDemod;
|
delete m_amDemod;
|
||||||
delete m_channelMarker;
|
//delete m_channelMarker;
|
||||||
delete ui;
|
delete ui;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -237,14 +240,14 @@ void AMDemodGUI::applySettings()
|
|||||||
{
|
{
|
||||||
if (m_doApplySettings)
|
if (m_doApplySettings)
|
||||||
{
|
{
|
||||||
setTitleColor(m_channelMarker->getColor());
|
setTitleColor(m_channelMarker.getColor());
|
||||||
|
|
||||||
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
m_channelizer->configure(m_channelizer->getInputMessageQueue(),
|
||||||
48000,
|
48000,
|
||||||
m_channelMarker->getCenterFrequency());
|
m_channelMarker.getCenterFrequency());
|
||||||
|
|
||||||
ui->deltaFrequency->setValue(abs(m_channelMarker->getCenterFrequency()));
|
ui->deltaFrequency->setValue(abs(m_channelMarker.getCenterFrequency()));
|
||||||
ui->deltaMinus->setChecked(m_channelMarker->getCenterFrequency() < 0);
|
ui->deltaMinus->setChecked(m_channelMarker.getCenterFrequency() < 0);
|
||||||
|
|
||||||
m_amDemod->configure(m_amDemod->getInputMessageQueue(),
|
m_amDemod->configure(m_amDemod->getInputMessageQueue(),
|
||||||
m_rfBW[ui->rfBW->value()],
|
m_rfBW[ui->rfBW->value()],
|
||||||
@ -257,14 +260,14 @@ void AMDemodGUI::applySettings()
|
|||||||
void AMDemodGUI::leaveEvent(QEvent*)
|
void AMDemodGUI::leaveEvent(QEvent*)
|
||||||
{
|
{
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(false);
|
m_channelMarker.setHighlighted(false);
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
void AMDemodGUI::enterEvent(QEvent*)
|
void AMDemodGUI::enterEvent(QEvent*)
|
||||||
{
|
{
|
||||||
blockApplySettings(true);
|
blockApplySettings(true);
|
||||||
m_channelMarker->setHighlighted(true);
|
m_channelMarker.setHighlighted(true);
|
||||||
blockApplySettings(false);
|
blockApplySettings(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3,9 +3,9 @@
|
|||||||
|
|
||||||
#include "gui/rollupwidget.h"
|
#include "gui/rollupwidget.h"
|
||||||
#include "plugin/plugingui.h"
|
#include "plugin/plugingui.h"
|
||||||
|
#include "dsp/channelmarker.h"
|
||||||
|
|
||||||
class PluginAPI;
|
class PluginAPI;
|
||||||
class ChannelMarker;
|
|
||||||
|
|
||||||
class ThreadedSampleSink;
|
class ThreadedSampleSink;
|
||||||
class Channelizer;
|
class Channelizer;
|
||||||
@ -46,7 +46,7 @@ private slots:
|
|||||||
private:
|
private:
|
||||||
Ui::AMDemodGUI* ui;
|
Ui::AMDemodGUI* ui;
|
||||||
PluginAPI* m_pluginAPI;
|
PluginAPI* m_pluginAPI;
|
||||||
ChannelMarker* m_channelMarker;
|
ChannelMarker m_channelMarker;
|
||||||
bool m_basicSettingsShown;
|
bool m_basicSettingsShown;
|
||||||
bool m_doApplySettings;
|
bool m_doApplySettings;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user