VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-28 15:56:33 -04:00
Code Issues Projects Releases Wiki Activity

WFM modulator: use settings in GUI (1)

Browse Source
This commit is contained in:
f4exb 2017-10-13 08:24:39 +02:00
parent 1ead2de958
commit 5746aa1189
2 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/channeltx/modwfm/wfmmodgui.cpp
View File

@ -195,45 +195,55 @@ void WFMModGUI::handleSourceMessages()
void WFMModGUI::on_deltaFrequency_changed(qint64 value) void WFMModGUI::on_deltaFrequency_changed(qint64 value)
{ {
m_channelMarker.setCenterFrequency(value); m_channelMarker.setCenterFrequency(value);
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
applySettings();
} }
void WFMModGUI::on_rfBW_currentIndexChanged(int index) void WFMModGUI::on_rfBW_currentIndexChanged(int index)
{ {
m_channelMarker.setBandwidth(m_rfBW[index]); float rfBW = WFMModSettings::getRFBW(index);
m_channelMarker.setBandwidth(rfBW);
m_settings.m_rfBandwidth = rfBW;
applySettings(); applySettings();
} }
void WFMModGUI::on_afBW_valueChanged(int value) void WFMModGUI::on_afBW_valueChanged(int value)
{ {
ui->afBWText->setText(QString("%1k").arg(value)); ui->afBWText->setText(QString("%1k").arg(value));
m_settings.m_afBandwidth = value * 1000.0;
applySettings(); applySettings();
} }
void WFMModGUI::on_fmDev_valueChanged(int value) void WFMModGUI::on_fmDev_valueChanged(int value)
{ {
ui->fmDevText->setText(QString("%1k").arg(value)); ui->fmDevText->setText(QString("%1k").arg(value));
m_settings.m_fmDeviation = value * 1000.0;
applySettings(); applySettings();
} }
void WFMModGUI::on_volume_valueChanged(int value) void WFMModGUI::on_volume_valueChanged(int value)
{ {
ui->volumeText->setText(QString("%1").arg(value / 10.0, 0, 'f', 1)); ui->volumeText->setText(QString("%1").arg(value / 10.0, 0, 'f', 1));
m_settings.m_volumeFactor = value / 10.0;
applySettings(); applySettings();
} }
void WFMModGUI::on_toneFrequency_valueChanged(int value) void WFMModGUI::on_toneFrequency_valueChanged(int value)
{ {
ui->toneFrequencyText->setText(QString("%1k").arg(value / 100.0, 0, 'f', 2)); ui->toneFrequencyText->setText(QString("%1k").arg(value / 100.0, 0, 'f', 2));
m_settings.m_toneFrequency = value * 10.0;
applySettings(); applySettings();
} }
void WFMModGUI::on_channelMute_toggled(bool checked __attribute__((unused))) void WFMModGUI::on_channelMute_toggled(bool checked)
{ {
m_settings.m_channelMute = checked;
applySettings(); applySettings();
} }
void WFMModGUI::on_playLoop_toggled(bool checked __attribute__((unused))) void WFMModGUI::on_playLoop_toggled(bool checked)
{ {
m_settings.m_playLoop = checked;
applySettings(); applySettings();
} }
@ -423,14 +433,23 @@ void WFMModGUI::applySettings()
ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
m_wfmMod->configure(m_wfmMod->getInputMessageQueue(), m_wfmMod->configure(m_wfmMod->getInputMessageQueue(),
m_rfBW[ui->rfBW->currentIndex()], m_settings.m_rfBandwidth,
ui->afBW->value() * 1000.0, m_settings.m_afBandwidth,
ui->fmDev->value() * 1000.0f, // value is in '100 Hz m_settings.m_fmDeviation,
ui->toneFrequency->value() * 10.0f, m_settings.m_toneFrequency,
ui->volume->value() / 10.0f, m_settings.m_volumeFactor,
ui->channelMute->isChecked(), m_settings.m_channelMute,
ui->playLoop->isChecked()); m_settings.m_playLoop);
// m_wfmMod->configure(m_wfmMod->getInputMessageQueue(),
// m_rfBW[ui->rfBW->currentIndex()],
// ui->afBW->value() * 1000.0,
// ui->fmDev->value() * 1000.0f, // value is in '100 Hz
// ui->toneFrequency->value() * 10.0f,
// ui->volume->value() / 10.0f,
// ui->channelMute->isChecked(),
// ui->playLoop->isChecked());
} }
} }

2
plugins/channeltx/modwfm/wfmmodgui.h
View File

@ -24,6 +24,7 @@
#include "util/messagequeue.h" #include "util/messagequeue.h"
#include "wfmmod.h" #include "wfmmod.h"
#include "wfmmodsettings.h"
class PluginAPI; class PluginAPI;
class DeviceSinkAPI; class DeviceSinkAPI;
@ -87,6 +88,7 @@ private:
PluginAPI* m_pluginAPI; PluginAPI* m_pluginAPI;
DeviceSinkAPI* m_deviceAPI; DeviceSinkAPI* m_deviceAPI;
ChannelMarker m_channelMarker; ChannelMarker m_channelMarker;
WFMModSettings m_settings;
bool m_basicSettingsShown; bool m_basicSettingsShown;
bool m_doApplySettings; bool m_doApplySettings;