VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-02 14:04:46 -04:00
Code Issues Projects Releases Wiki Activity

SDRdaemon plugin: update settings after deserialization

Browse Source
This commit is contained in:
f4exb
2016-02-20 10:10:11 +01:00
parent b59c28d4c7
commit 952a32172d
3 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/samplesource/sdrdaemon/sdrdaemongui.cpp
+32 -11
View File
@@ -114,33 +114,54 @@ bool SDRdaemonGui::deserialize(const QByteArray& data)
QString address;
uint32_t uintval;
quint16 port;
bool dcBlock;
bool iqCorrection;
if(!d.isValid()) {
if (!d.isValid())
{
resetToDefaults();
displaySettings();
return false;
}
if(d.getVersion() == 1) {
if (d.getVersion() == 1)
{
uint32_t uintval;
d.readString(1, &m_address, "127.0.0.1");
d.readString(1, &address, "127.0.0.1");
d.readU32(2, &uintval, 9090);
if ((uintval > 1024) && (uintval < 65536)) {
m_port = uintval;
port = uintval;
} else {
m_port = 9090;
port = 9090;
}
d.readBool(3, &m_dcBlock, false);
d.readBool(4, &m_iqCorrection, false);
d.readBool(3, &dcBlock, false);
d.readBool(4, &iqCorrection, false);
if ((address != m_address) || (port != m_port))
{
m_address = address;
m_port = port;
configureUDPLink();
}
if ((dcBlock != m_dcBlock) || (iqCorrection != m_iqCorrection))
{
m_dcBlock = dcBlock;
m_iqCorrection = iqCorrection;
configureAutoCorrections();
}
displaySettings();
return true;
} else {
}
else
{
resetToDefaults();
displaySettings();
return false;
}
displaySettings();
}
qint64 SDRdaemonGui::getCenterFrequency() const
@@ -260,7 +281,7 @@ void SDRdaemonGui::updateWithAcquisition()
void SDRdaemonGui::updateWithStreamData()
{
ui->centerFrequency->setValue(m_centerFrequency);
ui->centerFrequency->setValue(m_centerFrequency / 1000);
QString s = QString::number(m_sampleRate/1000.0, 'f', 0);
ui->sampleRateText->setText(tr("%1k").arg(s));
updateWithStreamTime(); // TODO: remove when time data is implemented
plugins/samplesource/sdrdaemon/sdrdaemonudphandler.cpp
+1 -1
View File
@@ -136,7 +136,7 @@ void SDRdaemonUDPHandler::processData()
DSPEngine::instance()->getInputMessageQueue()->push(notif);
SDRdaemonInput::MsgReportSDRdaemonStreamData *report = SDRdaemonInput::MsgReportSDRdaemonStreamData::create(
m_samplerate,
m_centerFrequency, // Frequency in kHz for the GUI
m_centerFrequency * 1000, // Frequency in Hz for the GUI
m_tv_sec,
m_tv_usec);
m_outputMessageQueueToGUI->push(report);