VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 16:08:39 -05:00
Code Issues Projects Releases Wiki Activity

AM and NFM Modulators: GUI fixes

Browse Source
This commit is contained in:
f4exb 2016-12-18 07:36:43 +01:00
parent 821b1566e8
commit 55de2d4501
6 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/channeltx/modam/ammodgui.ui
View File

@ -314,7 +314,7 @@
<string>Audio input gain</string> <string>Audio input gain</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>20</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>

2
plugins/channeltx/modam/ammodplugin.cpp
View File

@ -23,7 +23,7 @@
const PluginDescriptor AMModPlugin::m_pluginDescriptor = { const PluginDescriptor AMModPlugin::m_pluginDescriptor = {
QString("AM Modulator"), QString("AM Modulator"),
QString("2.5.0"), QString("2.5.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,

2
plugins/channeltx/modnfm/nfmmod.h
View File

@ -219,7 +219,7 @@ private:
bool getAudioMute() const { return m_audioMute; } bool getAudioMute() const { return m_audioMute; }
bool getPlayLoop() const { return m_playLoop; } bool getPlayLoop() const { return m_playLoop; }
static MsgConfigureNFMMod* create(Real rfBandwidth, Real afBandwidth, float fmDeviation, float toneFrequency, int volumeFactor, bool audioMute, bool playLoop) static MsgConfigureNFMMod* create(Real rfBandwidth, Real afBandwidth, float fmDeviation, float toneFrequency, float volumeFactor, bool audioMute, bool playLoop)
{ {
return new MsgConfigureNFMMod(rfBandwidth, afBandwidth, fmDeviation, toneFrequency, volumeFactor, audioMute, playLoop); return new MsgConfigureNFMMod(rfBandwidth, afBandwidth, fmDeviation, toneFrequency, volumeFactor, audioMute, playLoop);
} }

3
plugins/channeltx/modnfm/nfmmodgui.cpp
View File

@ -95,6 +95,7 @@ QByteArray NFMModGUI::serialize() const
s.writeU32(5, m_channelMarker.getColor().rgb()); s.writeU32(5, m_channelMarker.getColor().rgb());
s.writeS32(6, ui->toneFrequency->value()); s.writeS32(6, ui->toneFrequency->value());
s.writeS32(7, ui->volume->value()); s.writeS32(7, ui->volume->value());
s.writeBlob(8, ui->cwKeyerGUI->serialize());
return s.final(); return s.final();
} }
@ -135,6 +136,8 @@ bool NFMModGUI::deserialize(const QByteArray& data)
ui->toneFrequency->setValue(tmp); ui->toneFrequency->setValue(tmp);
d.readS32(7, &tmp, 10); d.readS32(7, &tmp, 10);
ui->volume->setValue(tmp); ui->volume->setValue(tmp);
d.readBlob(8, &bytetmp);
ui->cwKeyerGUI->deserialize(bytetmp);
blockApplySettings(false); blockApplySettings(false);
m_channelMarker.blockSignals(false); m_channelMarker.blockSignals(false);

2
plugins/channeltx/modnfm/nfmmodgui.ui
View File

@ -354,7 +354,7 @@
<string>Audio input gain</string> <string>Audio input gain</string>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>100</number> <number>20</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>1</number> <number>1</number>

2
plugins/channeltx/modnfm/nfmmodplugin.cpp
View File

@ -23,7 +23,7 @@
const PluginDescriptor NFMModPlugin::m_pluginDescriptor = { const PluginDescriptor NFMModPlugin::m_pluginDescriptor = {
QString("NFM Modulator"), QString("NFM Modulator"),
QString("2.5.0"), QString("2.5.1"),
QString("(c) Edouard Griffiths, F4EXB"), QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"), QString("https://github.com/f4exb/sdrangel"),
true, true,