Fixed Channel Analyzer LSB display and save its SSB checkbox state

This commit is contained in:
f4exb 2015-06-21 13:03:12 +02:00
parent 2c84b82621
commit d6154eb0eb
3 changed files with 11 additions and 1 deletions

View File

@ -107,6 +107,8 @@ Done since the fork
- As a consequence of the above added more interesting values for the available sampling rates of the BladeRF plugin - As a consequence of the above added more interesting values for the available sampling rates of the BladeRF plugin
- Variable span for the SSB demod down to 1.5 kHz - Variable span for the SSB demod down to 1.5 kHz
- Filter out CTCSS tones for audio and full CTCSS support in NFMDemod - Filter out CTCSS tones for audio and full CTCSS support in NFMDemod
- Enhancement of the NFM squelch
- Added a channel analyzer plugin focusing on measurement (DSA/DSO functionnality). Basic functions.
===== =====
To Do To Do

View File

@ -115,7 +115,11 @@ void ChannelAnalyzer::feed(SampleVector::const_iterator begin, SampleVector::con
if (!(m_undersampleCount++ & decim_mask)) if (!(m_undersampleCount++ & decim_mask))
{ {
sum /= decim; sum /= decim;
m_sampleBuffer.push_back(Sample(sum.real() * 32768.0, sum.imag() * 32768.0)); if (m_ssb & !m_usb) { // invert spectrum for LSB
m_sampleBuffer.push_back(Sample(sum.imag() * 32768.0, sum.real() * 32768.0));
} else {
m_sampleBuffer.push_back(Sample(sum.real() * 32768.0, sum.imag() * 32768.0));
}
sum = 0; sum = 0;
} }

View File

@ -51,6 +51,7 @@ QByteArray ChannelAnalyzerGUI::serialize() const
s.writeU32(4, m_channelMarker->getColor().rgb()); s.writeU32(4, m_channelMarker->getColor().rgb());
s.writeS32(5, ui->lowCut->value()); s.writeS32(5, ui->lowCut->value());
s.writeS32(6, ui->spanLog2->value()); s.writeS32(6, ui->spanLog2->value());
s.writeBool(7, ui->ssb->isChecked());
return s.final(); return s.final();
} }
@ -67,6 +68,7 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data)
QByteArray bytetmp; QByteArray bytetmp;
quint32 u32tmp; quint32 u32tmp;
qint32 tmp; qint32 tmp;
bool tmpBool;
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
d.readS32(2, &tmp, 30); d.readS32(2, &tmp, 30);
@ -80,6 +82,8 @@ bool ChannelAnalyzerGUI::deserialize(const QByteArray& data)
d.readS32(6, &tmp, 20); d.readS32(6, &tmp, 20);
ui->spanLog2->setValue(tmp); ui->spanLog2->setValue(tmp);
setNewRate(tmp); setNewRate(tmp);
d.readBool(7, &tmpBool, false);
ui->ssb->setChecked(tmpBool);
applySettings(); applySettings();
return true; return true;
} else { } else {