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

UDP sink: fixed bandwidth channel marker display

Browse Source
This commit is contained in:
f4exb 2017-11-21 22:46:39 +01:00
parent a57fdb8bd7
commit a1f6d29f03
4 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -419,7 +419,7 @@ void UDPSrcGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((unu
bool ok; bool ok;
Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok); Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok);
if((!ok) || (rfBandwidth > m_settings.m_outputSampleRate)) if ((!ok) || (rfBandwidth > m_settings.m_outputSampleRate))
{ {
m_settings.m_rfBandwidth = m_settings.m_outputSampleRate; m_settings.m_rfBandwidth = m_settings.m_outputSampleRate;
ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0)); ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0));
@ -458,10 +458,8 @@ void UDPSrcGUI::on_applyBtn_clicked()
{ {
if (m_rfBandwidthChanged) if (m_rfBandwidthChanged)
{ {
blockApplySettings(true);
m_channelMarker.setBandwidth((int) m_settings.m_rfBandwidth); m_channelMarker.setBandwidth((int) m_settings.m_rfBandwidth);
m_rfBandwidthChanged = false; m_rfBandwidthChanged = false;
blockApplySettings(false);
} }
ui->glSpectrum->setSampleRate(m_settings.m_outputSampleRate); ui->glSpectrum->setSampleRate(m_settings.m_outputSampleRate);

2
plugins/channelrx/udpsrc/udpsrcplugin.cpp
View File

@ -25,7 +25,7 @@
const PluginDescriptor UDPSrcPlugin::m_pluginDescriptor = { const PluginDescriptor UDPSrcPlugin::m_pluginDescriptor = {
QString("UDP Channel Source"), QString("UDP Channel Source"),
QString("3.8.2"), QString("3.8.5"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

23
plugins/channeltx/udpsink/udpsinkgui.cpp
View File

@ -195,11 +195,11 @@ void UDPSinkGUI::displaySettings()
{ {
m_channelMarker.blockSignals(true); m_channelMarker.blockSignals(true);
m_channelMarker.setCenterFrequency(m_settings.m_inputFrequencyOffset); m_channelMarker.setCenterFrequency(m_settings.m_inputFrequencyOffset);
m_channelMarker.setBandwidth((int)m_settings.m_rfBandwidth); m_channelMarker.setBandwidth(m_settings.m_rfBandwidth);
m_channelMarker.setColor(m_settings.m_rgbColor);
m_channelMarker.setUDPAddress(m_settings.m_udpAddress); m_channelMarker.setUDPAddress(m_settings.m_udpAddress);
m_channelMarker.blockSignals(false);
m_channelMarker.setUDPReceivePort(m_settings.m_udpPort); // activate signal on the last setting only m_channelMarker.setUDPReceivePort(m_settings.m_udpPort); // activate signal on the last setting only
m_channelMarker.blockSignals(false);
m_channelMarker.setColor(m_settings.m_rgbColor);
setTitleColor(m_settings.m_rgbColor); setTitleColor(m_settings.m_rgbColor);
this->setWindowTitle(m_channelMarker.getTitle()); this->setWindowTitle(m_channelMarker.getTitle());
@ -295,13 +295,18 @@ void UDPSinkGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((un
bool ok; bool ok;
Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok); Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok);
if ((!ok) || (rfBandwidth > m_settings.m_inputSampleRate)) { if ((!ok) || (rfBandwidth > m_settings.m_inputSampleRate))
{
m_settings.m_rfBandwidth = m_settings.m_inputSampleRate; m_settings.m_rfBandwidth = m_settings.m_inputSampleRate;
ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0)); ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0));
} else { }
else
{
m_settings.m_rfBandwidth = rfBandwidth; m_settings.m_rfBandwidth = rfBandwidth;
} }
m_rfBandwidthChanged = true;
ui->applyBtn->setEnabled(true); ui->applyBtn->setEnabled(true);
ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }"); ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }");
} }
@ -384,13 +389,13 @@ void UDPSinkGUI::on_applyBtn_clicked()
{ {
if (m_rfBandwidthChanged) if (m_rfBandwidthChanged)
{ {
m_channelMarker.setBandwidth(m_settings.m_rfBandwidth); // will call apply settings m_channelMarker.setBandwidth(m_settings.m_rfBandwidth);
m_rfBandwidthChanged = false; m_rfBandwidthChanged = false;
} }
else
{ ui->glSpectrum->setSampleRate(m_settings.m_inputSampleRate);
applySettings(); applySettings();
}
} }
void UDPSinkGUI::on_resetUDPReadIndex_clicked() void UDPSinkGUI::on_resetUDPReadIndex_clicked()

2
plugins/channeltx/udpsink/udpsinkplugin.cpp
View File

@ -24,7 +24,7 @@
const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = { const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = {
QString("UDP Channel Sink"), QString("UDP Channel Sink"),
QString("3.8.4"), QString("3.8.5"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,