mirror
/
sdrangel
kopia lustrzana https://github.com/f4exb/sdrangel
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Channel Analyzer NG: serialize/deserialize rational downsampler value

pull/27/head
f4exb 2017-03-01 06:21:56 +01:00
rodzic 2f6cf815ee
commit ba85b9126f
1 zmienionych plików z 7 dodań i 2 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
plugins/channelrx/chanalyzerng/chanalyzernggui.cpp
Wyświetl plik

@ -95,6 +95,7 @@ QByteArray ChannelAnalyzerNGGUI::serialize() const
s.writeS32(6, ui->spanLog2->currentIndex()); s.writeS32(6, ui->spanLog2->currentIndex());
s.writeBool(7, ui->ssb->isChecked()); s.writeBool(7, ui->ssb->isChecked());
s.writeBlob(8, ui->scopeGUI->serialize()); s.writeBlob(8, ui->scopeGUI->serialize());
s.writeU64(9, ui->channelSampleRate->getValueNew());
return s.final(); return s.final();
} }
@ -112,6 +113,7 @@ bool ChannelAnalyzerNGGUI::deserialize(const QByteArray& data)
{ {
QByteArray bytetmp; QByteArray bytetmp;
quint32 u32tmp; quint32 u32tmp;
quint64 u64tmp;
qint32 tmp, spanLog2, bw, lowCut; qint32 tmp, spanLog2, bw, lowCut;
bool tmpBool; bool tmpBool;
@ -135,6 +137,8 @@ bool ChannelAnalyzerNGGUI::deserialize(const QByteArray& data)
ui->ssb->setChecked(tmpBool); ui->ssb->setChecked(tmpBool);
d.readBlob(8, &bytetmp); d.readBlob(8, &bytetmp);
ui->scopeGUI->deserialize(bytetmp); ui->scopeGUI->deserialize(bytetmp);
d.readU64(9, &u64tmp, 2000U);
ui->channelSampleRate->setValue(u64tmp);
blockApplySettings(false); blockApplySettings(false);
m_channelMarker.blockSignals(false); m_channelMarker.blockSignals(false);
@ -173,8 +177,7 @@ void ChannelAnalyzerNGGUI::tick()
void ChannelAnalyzerNGGUI::channelizerInputSampleRateChanged() void ChannelAnalyzerNGGUI::channelizerInputSampleRateChanged()
{ {
qDebug("ChannelAnalyzerNGGUI::channelizerInputSampleRateChanged(): %d", m_channelizer->getInputSampleRate()); //ui->channelSampleRate->setValueRange(7, 2000U, m_channelAnalyzer->getInputSampleRate());
ui->channelSampleRate->setValueRange(7, 2000U, m_channelAnalyzer->getInputSampleRate());
setNewFinalRate(m_spanLog2); setNewFinalRate(m_spanLog2);
applySettings(); applySettings();
} }
@ -192,6 +195,8 @@ void ChannelAnalyzerNGGUI::on_deltaMinus_toggled(bool minus)
void ChannelAnalyzerNGGUI::on_channelSampleRate_changed(quint64 value) void ChannelAnalyzerNGGUI::on_channelSampleRate_changed(quint64 value)
{ {
ui->channelSampleRate->setValueRange(7, 2000U, m_channelAnalyzer->getInputSampleRate());
if (ui->useRationalDownsampler->isChecked()) if (ui->useRationalDownsampler->isChecked())
{ {
qDebug("ChannelAnalyzerNGGUI::on_channelSampleRate_changed: %llu", value); qDebug("ChannelAnalyzerNGGUI::on_channelSampleRate_changed: %llu", value);