VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-24 03:02:29 -04:00
Code Issues Projects Releases Wiki Activity

Housekeeping.

Browse Source
This commit is contained in:
John Greb 2015-01-12 14:25:16 +00:00
parent 429b4dbbff
commit dde49f8650
3 changed files with 60 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/channel/lora/lorademodgui.cpp
View File

@ -32,6 +32,7 @@ void LoRaDemodGUI::setName(const QString& name)
void LoRaDemodGUI::resetToDefaults() void LoRaDemodGUI::resetToDefaults()
{ {
ui->BW->setValue(0); ui->BW->setValue(0);
ui->Spread->setValue(0);
applySettings(); applySettings();
} }
@ -40,8 +41,8 @@ QByteArray LoRaDemodGUI::serialize() const
SimpleSerializer s(1); SimpleSerializer s(1);
s.writeS32(1, m_channelMarker->getCenterFrequency()); s.writeS32(1, m_channelMarker->getCenterFrequency());
s.writeS32(2, ui->BW->value()); s.writeS32(2, ui->BW->value());
s.writeBlob(3, ui->spectrumGUI->serialize()); s.writeS32(3, ui->Spread->value());
s.writeU32(4, m_channelMarker->getColor().rgb()); s.writeBlob(4, ui->spectrumGUI->serialize());
return s.final(); return s.final();
} }
@ -56,16 +57,15 @@ bool LoRaDemodGUI::deserialize(const QByteArray& data)
if(d.getVersion() == 1) { if(d.getVersion() == 1) {
QByteArray bytetmp; QByteArray bytetmp;
quint32 u32tmp;
qint32 tmp; qint32 tmp;
d.readS32(1, &tmp, 0); d.readS32(1, &tmp, 0);
m_channelMarker->setCenterFrequency(tmp); m_channelMarker->setCenterFrequency(tmp);
d.readS32(2, &tmp, 0); d.readS32(2, &tmp, 0);
ui->BW->setValue(tmp); ui->BW->setValue(tmp);
d.readBlob(3, &bytetmp); d.readS32(3, &tmp, 0);
ui->Spread->setValue(tmp);
d.readBlob(4, &bytetmp);
ui->spectrumGUI->deserialize(bytetmp); ui->spectrumGUI->deserialize(bytetmp);
if(d.readU32(4, &u32tmp))
m_channelMarker->setColor(u32tmp);
applySettings(); applySettings();
return true; return true;
} else { } else {
@ -86,12 +86,17 @@ void LoRaDemodGUI::viewChanged()
void LoRaDemodGUI::on_BW_valueChanged(int value) void LoRaDemodGUI::on_BW_valueChanged(int value)
{ {
value = 7813; const int loraBW[] = {7813, 15625, 10417, 20833};
ui->BWText->setText(QString("%1 Hz").arg(value)); int thisBW = loraBW[value];
m_channelMarker->setBandwidth(value); ui->BWText->setText(QString("%1 Hz").arg(thisBW));
m_channelMarker->setBandwidth(thisBW);
applySettings(); applySettings();
} }
void LoRaDemodGUI::on_Spread_valueChanged(int value)
{
}
void LoRaDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown) void LoRaDemodGUI::onWidgetRolled(QWidget* widget, bool rollDown)
{ {
/* /*
@ -126,8 +131,8 @@ LoRaDemodGUI::LoRaDemodGUI(PluginAPI* pluginAPI, QWidget* parent) :
m_threadedSampleSink = new ThreadedSampleSink(m_channelizer); m_threadedSampleSink = new ThreadedSampleSink(m_channelizer);
m_pluginAPI->addSampleSink(m_threadedSampleSink); m_pluginAPI->addSampleSink(m_threadedSampleSink);
ui->glSpectrum->setCenterFrequency(0); ui->glSpectrum->setCenterFrequency(16000);
ui->glSpectrum->setSampleRate(7813); ui->glSpectrum->setSampleRate(32000);
ui->glSpectrum->setDisplayWaterfall(true); ui->glSpectrum->setDisplayWaterfall(true);
ui->glSpectrum->setDisplayMaxHold(true); ui->glSpectrum->setDisplayMaxHold(true);
@ -158,9 +163,8 @@ LoRaDemodGUI::~LoRaDemodGUI()
void LoRaDemodGUI::applySettings() void LoRaDemodGUI::applySettings()
{ {
const int loraBW[] = {7813, 7813, 10417, 20833 }; const int loraBW[] = {7813, 15625, 10417, 20833};
int thisBW = loraBW[ui->BW->value()]; int thisBW = loraBW[ui->BW->value()];
setTitleColor(m_channelMarker->getColor());
m_channelizer->configure(m_threadedSampleSink->getMessageQueue(), m_channelizer->configure(m_threadedSampleSink->getMessageQueue(),
thisBW, thisBW,
m_channelMarker->getCenterFrequency()); m_channelMarker->getCenterFrequency());

1
plugins/channel/lora/lorademodgui.h
View File

@ -33,6 +33,7 @@ public:
private slots: private slots:
void viewChanged(); void viewChanged();
void on_BW_valueChanged(int value); void on_BW_valueChanged(int value);
void on_Spread_valueChanged(int value);
void onWidgetRolled(QWidget* widget, bool rollDown); void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDoubleClicked(); void onMenuDoubleClicked();

42
plugins/channel/lora/lorademodgui.ui
View File

@ -39,6 +39,13 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Spreading</string>
</property>
</widget>
</item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="BW"> <widget class="QSlider" name="BW">
<property name="minimum"> <property name="minimum">
@ -58,6 +65,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1">
<widget class="QSlider" name="Spread">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>1</number>
</property>
<property name="pageStep">
<number>1</number>
</property>
<property name="value">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="2"> <item row="0" column="2">
<widget class="QLabel" name="BWText"> <widget class="QLabel" name="BWText">
<property name="minimumSize"> <property name="minimumSize">
@ -74,6 +100,22 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2">
<widget class="QLabel" name="SpreadText">
<property name="minimumSize">
<size>
<width>50</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>2^8</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="spectrumContainer" native="true"> <widget class="QWidget" name="spectrumContainer" native="true">