From 83228c9bca01922bbae96b4fca3a92e0b09d0ab2 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 15 Oct 2017 22:14:30 +0200 Subject: [PATCH] UDP Sink: use settings in GUI (1) --- plugins/channeltx/udpsink/udpsink.cpp | 4 +- plugins/channeltx/udpsink/udpsink.h | 3 +- plugins/channeltx/udpsink/udpsinkgui.cpp | 74 +++++++++++++++--------- plugins/channeltx/udpsink/udpsinkgui.h | 4 +- 4 files changed, 53 insertions(+), 32 deletions(-) diff --git a/plugins/channeltx/udpsink/udpsink.cpp b/plugins/channeltx/udpsink/udpsink.cpp index bef3ef2c8..eeec71ced 100644 --- a/plugins/channeltx/udpsink/udpsink.cpp +++ b/plugins/channeltx/udpsink/udpsink.cpp @@ -433,7 +433,7 @@ bool UDPSink::handleMessage(const Message& cmd) void UDPSink::configure(MessageQueue* messageQueue, UDPSinkSettings::SampleFormat sampleFormat, - Real outputSampleRate, + Real inputSampleRate, Real rfBandwidth, int fmDeviation, Real amModFactor, @@ -450,7 +450,7 @@ void UDPSink::configure(MessageQueue* messageQueue, bool force) { Message* cmd = MsgUDPSinkConfigure::create(sampleFormat, - outputSampleRate, + inputSampleRate, rfBandwidth, fmDeviation, amModFactor, diff --git a/plugins/channeltx/udpsink/udpsink.h b/plugins/channeltx/udpsink/udpsink.h index 607b3525c..44cbe4aea 100644 --- a/plugins/channeltx/udpsink/udpsink.h +++ b/plugins/channeltx/udpsink/udpsink.h @@ -101,8 +101,7 @@ private: bool getStereoInput() const { return m_stereoInput; } static MsgUDPSinkConfigure* create( - UDPSinkSettings::SampleFormat - sampleFormat, + UDPSinkSettings::SampleFormat sampleFormat, Real inputSampleRate, Real rfBandwidth, int fmDeviation, diff --git a/plugins/channeltx/udpsink/udpsinkgui.cpp b/plugins/channeltx/udpsink/udpsinkgui.cpp index 261aed616..736649672 100644 --- a/plugins/channeltx/udpsink/udpsinkgui.cpp +++ b/plugins/channeltx/udpsink/udpsinkgui.cpp @@ -81,8 +81,8 @@ QByteArray UDPSinkGUI::serialize() const SimpleSerializer s(1); s.writeS32(2, m_channelMarker.getCenterFrequency()); s.writeS32(3, m_sampleFormat); - s.writeReal(4, m_inputSampleRate); - s.writeReal(5, m_rfBandwidth); + s.writeReal(4, m_settings.m_inputSampleRate); + s.writeReal(5, m_settings.m_rfBandwidth); s.writeBlob(6, m_channelMarker.serialize()); s.writeBlob(7, ui->spectrumGUI->serialize()); s.writeS32(10, ui->gainOut->value()); @@ -129,9 +129,9 @@ bool UDPSinkGUI::deserialize(const QByteArray& data) ui->sampleFormat->setCurrentIndex(((int) UDPSinkSettings::FormatNone) - 1); } d.readReal(4, &realtmp, 48000); - ui->sampleRate->setText(QString("%1").arg(realtmp, 0)); + m_settings.m_inputSampleRate = realtmp; d.readReal(5, &realtmp, 32000); - ui->rfBandwidth->setText(QString("%1").arg(realtmp, 0)); + m_settings.m_rfBandwidth = realtmp; d.readBlob(7, &bytetmp); ui->spectrumGUI->deserialize(bytetmp); d.readS32(10, &s32tmp, 10); @@ -268,19 +268,19 @@ void UDPSinkGUI::applySettings(bool force) { bool ok; - Real inputSampleRate = ui->sampleRate->text().toDouble(&ok); - - if((!ok) || (inputSampleRate < 1000)) - { - inputSampleRate = 48000; - } - - Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok); - - if((!ok) || (rfBandwidth > inputSampleRate)) - { - rfBandwidth = inputSampleRate; - } +// Real inputSampleRate = ui->sampleRate->text().toDouble(&ok); +// +// if((!ok) || (inputSampleRate < 1000)) +// { +// inputSampleRate = 48000; +// } +// +// Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok); +// +// if((!ok) || (rfBandwidth > inputSampleRate)) +// { +// rfBandwidth = inputSampleRate; +// } int fmDeviation = ui->fmDeviation->text().toInt(&ok); @@ -298,17 +298,17 @@ void UDPSinkGUI::applySettings(bool force) setTitleColor(m_channelMarker.getColor()); ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); - ui->sampleRate->setText(QString("%1").arg(inputSampleRate, 0)); - ui->rfBandwidth->setText(QString("%1").arg(rfBandwidth, 0)); +// ui->sampleRate->setText(QString("%1").arg(inputSampleRate, 0)); +// ui->rfBandwidth->setText(QString("%1").arg(rfBandwidth, 0)); ui->fmDeviation->setText(QString("%1").arg(fmDeviation)); ui->amModPercent->setText(QString("%1").arg(amModPercent)); m_channelMarker.disconnect(this, SLOT(channelMarkerChanged())); - m_channelMarker.setBandwidth((int)rfBandwidth); + m_channelMarker.setBandwidth((int)m_settings.m_rfBandwidth); connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged())); - ui->glSpectrum->setSampleRate(inputSampleRate); + ui->glSpectrum->setSampleRate(m_settings.m_inputSampleRate); m_channelizer->configure(m_channelizer->getInputMessageQueue(), - inputSampleRate, + m_settings.m_inputSampleRate, m_channelMarker.getCenterFrequency()); UDPSinkSettings::SampleFormat sampleFormat; @@ -350,14 +350,14 @@ void UDPSinkGUI::applySettings(bool force) } m_sampleFormat = sampleFormat; - m_inputSampleRate = inputSampleRate; - m_rfBandwidth = rfBandwidth; +// m_inputSampleRate = inputSampleRate; +// m_rfBandwidth = rfBandwidth; m_fmDeviation = fmDeviation; m_udpSink->configure(m_udpSink->getInputMessageQueue(), sampleFormat, - inputSampleRate, - rfBandwidth, + m_settings.m_inputSampleRate, + m_settings.m_rfBandwidth, fmDeviation, amModPercent / 100.0f, m_channelMarker.getUDPAddress(), @@ -379,6 +379,8 @@ void UDPSinkGUI::applySettings(bool force) void UDPSinkGUI::displaySettings() { + ui->sampleRate->setText(QString("%1").arg(m_settings.m_inputSampleRate, 0)); + ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0)); ui->gainInText->setText(tr("%1").arg(ui->gainIn->value()/10.0, 0, 'f', 1)); ui->gainOutText->setText(tr("%1").arg(ui->gainOut->value()/10.0, 0, 'f', 1)); ui->squelchText->setText(tr("%1").arg(ui->squelch->value()*1.0, 0, 'f', 0)); @@ -418,12 +420,32 @@ void UDPSinkGUI::on_sampleFormat_currentIndexChanged(int index) void UDPSinkGUI::on_sampleRate_textEdited(const QString& arg1 __attribute__((unused))) { + bool ok; + Real inputSampleRate = ui->sampleRate->text().toDouble(&ok); + + if ((!ok) || (inputSampleRate < 1000)) { + m_settings.m_inputSampleRate = 48000; + ui->sampleRate->setText(QString("%1").arg(m_settings.m_inputSampleRate, 0)); + } else { + m_settings.m_inputSampleRate = inputSampleRate; + } + ui->applyBtn->setEnabled(true); ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }"); } void UDPSinkGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((unused))) { + bool ok; + Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok); + + if ((!ok) || (rfBandwidth > m_settings.m_inputSampleRate)) { + m_settings.m_rfBandwidth = m_settings.m_inputSampleRate; + ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0)); + } else { + m_settings.m_rfBandwidth = rfBandwidth; + } + ui->applyBtn->setEnabled(true); ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }"); } diff --git a/plugins/channeltx/udpsink/udpsinkgui.h b/plugins/channeltx/udpsink/udpsinkgui.h index bc47006b8..106a39366 100644 --- a/plugins/channeltx/udpsink/udpsinkgui.h +++ b/plugins/channeltx/udpsink/udpsinkgui.h @@ -95,8 +95,8 @@ private: // settings UDPSinkSettings m_settings; UDPSinkSettings::SampleFormat m_sampleFormat; - Real m_inputSampleRate; - Real m_rfBandwidth; +// Real m_inputSampleRate; +// Real m_rfBandwidth; int m_fmDeviation; bool m_doApplySettings; MessageQueue m_inputMessageQueue;