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

UDP sink: save channel marker center frequency in only one slot

Browse Source
This commit is contained in:
f4exb 2017-08-26 21:20:35 +02:00
parent 1ff798f1d6
commit c495ba0f2a
2 changed files with 3 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,10 +99,8 @@ QByteArray UDPSrcGUI::serialize() const
s.writeBlob(6, m_channelMarker.serialize()); s.writeBlob(6, m_channelMarker.serialize());
s.writeBlob(7, ui->spectrumGUI->serialize()); s.writeBlob(7, ui->spectrumGUI->serialize());
s.writeS32(8, ui->gain->value()); s.writeS32(8, ui->gain->value());
s.writeString(10, m_channelMarker.getUDPAddress());
s.writeBool(11, m_audioActive); s.writeBool(11, m_audioActive);
s.writeS32(12, (qint32)m_volume); s.writeS32(12, (qint32)m_volume);
s.writeS32(13, m_channelMarker.getUDPReceivePort());
s.writeBool(14, m_audioStereo); s.writeBool(14, m_audioStereo);
s.writeS32(15, m_fmDeviation); s.writeS32(15, m_fmDeviation);
s.writeS32(16, ui->squelch->value()); s.writeS32(16, ui->squelch->value());
@ -179,30 +177,16 @@ bool UDPSrcGUI::deserialize(const QByteArray& data)
ui->sampleRate->setText(QString("%1").arg(realtmp, 0)); ui->sampleRate->setText(QString("%1").arg(realtmp, 0));
d.readReal(5, &realtmp, 32000); d.readReal(5, &realtmp, 32000);
ui->rfBandwidth->setText(QString("%1").arg(realtmp, 0)); ui->rfBandwidth->setText(QString("%1").arg(realtmp, 0));
d.readS32(6, &s32tmp, 9999);
if ((s32tmp > 1024) && (s32tmp < 65536)) {
m_channelMarker.setUDPSendPort(s32tmp);
} else {
m_channelMarker.setUDPSendPort(9999);
}
d.readBlob(7, &bytetmp); d.readBlob(7, &bytetmp);
ui->spectrumGUI->deserialize(bytetmp); ui->spectrumGUI->deserialize(bytetmp);
d.readS32(8, &s32tmp, 10); d.readS32(8, &s32tmp, 10);
ui->gain->setValue(s32tmp); ui->gain->setValue(s32tmp);
ui->gainText->setText(tr("%1").arg(s32tmp/10.0, 0, 'f', 1)); ui->gainText->setText(tr("%1").arg(s32tmp/10.0, 0, 'f', 1));
d.readString(10, &strtmp, "127.0.0.1");
m_channelMarker.setUDPAddress(strtmp);
d.readBool(11, &booltmp, false); d.readBool(11, &booltmp, false);
ui->audioActive->setChecked(booltmp); ui->audioActive->setChecked(booltmp);
d.readS32(12, &s32tmp, 20); d.readS32(12, &s32tmp, 20);
ui->volume->setValue(s32tmp); ui->volume->setValue(s32tmp);
ui->volumeText->setText(QString("%1").arg(s32tmp)); ui->volumeText->setText(QString("%1").arg(s32tmp));
d.readS32(13, &s32tmp, 9998);
if ((s32tmp > 1024) && (s32tmp < 65536)) {
m_channelMarker.setUDPReceivePort(s32tmp);
} else {
m_channelMarker.setUDPReceivePort(9998);
}
d.readBool(14, &booltmp, false); d.readBool(14, &booltmp, false);
ui->audioStereo->setChecked(booltmp); ui->audioStereo->setChecked(booltmp);
d.readS32(15, &s32tmp, 2500); d.readS32(15, &s32tmp, 2500);
@ -219,6 +203,7 @@ bool UDPSrcGUI::deserialize(const QByteArray& data)
blockApplySettings(false); blockApplySettings(false);
m_channelMarker.blockSignals(false); m_channelMarker.blockSignals(false);
this->setWindowTitle(m_channelMarker.getTitle());
displaySettings(); displaySettings();
applySettingsImmediate(true); applySettingsImmediate(true);
applySettings(true); applySettings(true);

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

@ -86,7 +86,6 @@ QByteArray UDPSinkGUI::serialize() const
s.writeReal(5, m_rfBandwidth); s.writeReal(5, m_rfBandwidth);
s.writeS32(6, m_channelMarker.getUDPReceivePort()); s.writeS32(6, m_channelMarker.getUDPReceivePort());
s.writeBlob(7, ui->spectrumGUI->serialize()); s.writeBlob(7, ui->spectrumGUI->serialize());
s.writeS32(8, m_channelMarker.getCenterFrequency());
s.writeString(9, m_channelMarker.getUDPAddress()); s.writeString(9, m_channelMarker.getUDPAddress());
s.writeS32(10, ui->gainOut->value()); s.writeS32(10, ui->gainOut->value());
s.writeS32(11, m_fmDeviation); s.writeS32(11, m_fmDeviation);
@ -144,8 +143,6 @@ bool UDPSinkGUI::deserialize(const QByteArray& data)
} }
d.readBlob(7, &bytetmp); d.readBlob(7, &bytetmp);
ui->spectrumGUI->deserialize(bytetmp); ui->spectrumGUI->deserialize(bytetmp);
d.readS32(8, &s32tmp, 0);
m_channelMarker.setCenterFrequency(s32tmp);
d.readString(9, &strtmp, "127.0.0.1"); d.readString(9, &strtmp, "127.0.0.1");
m_channelMarker.setUDPAddress(strtmp); m_channelMarker.setUDPAddress(strtmp);
d.readS32(10, &s32tmp, 10); d.readS32(10, &s32tmp, 10);
@ -175,6 +172,8 @@ bool UDPSinkGUI::deserialize(const QByteArray& data)
blockApplySettings(false); blockApplySettings(false);
m_channelMarker.blockSignals(false); m_channelMarker.blockSignals(false);
this->setWindowTitle(m_channelMarker.getTitle());
displaySettings();
applySettings(true); applySettings(true);
return true; return true;
} }