VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-03 21:20:31 -05:00
Code Issues Projects Releases Wiki Activity

SSB modulator: use settings in GUI (4)

Browse Source
This commit is contained in:
f4exb 2017-10-21 03:42:28 +02:00
parent d2c7b6c26b
commit 1f60fa48d0
3 changed files with 92 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

241
plugins/channeltx/modssb/ssbmodgui.cpp
View File

@ -36,18 +36,6 @@
const QString SSBModGUI::m_channelID = "sdrangel.channeltx.modssb"; const QString SSBModGUI::m_channelID = "sdrangel.channeltx.modssb";
const int SSBModGUI::m_agcTimeConstant[] = {
1,
2,
5,
10,
20,
50,
100,
200,
500,
990};
SSBModGUI* SSBModGUI::create(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI) SSBModGUI* SSBModGUI::create(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI)
{ {
SSBModGUI* gui = new SSBModGUI(pluginAPI, deviceAPI); SSBModGUI* gui = new SSBModGUI(pluginAPI, deviceAPI);
@ -80,127 +68,27 @@ void SSBModGUI::setCenterFrequency(qint64 centerFrequency)
void SSBModGUI::resetToDefaults() void SSBModGUI::resetToDefaults()
{ {
blockApplySettings(true); m_settings.resetToDefaults();
ui->BW->setValue(30);
ui->lowCut->setValue(3);
ui->spanLog2->setValue(m_settings.m_spanLog2);
ui->toneFrequency->setValue(100);
ui->deltaFrequency->setValue(0);
ui->audioBinaural->setChecked(false);
ui->audioFlipChannels->setChecked(false);
ui->dsb->setChecked(false);
ui->audioMute->setChecked(false);
ui->play->setEnabled(false);
ui->play->setChecked(false);
ui->tone->setChecked(false);
ui->morseKeyer->setChecked(false);
ui->mic->setChecked(false);
blockApplySettings(false);
} }
QByteArray SSBModGUI::serialize() const QByteArray SSBModGUI::serialize() const
{ {
SimpleSerializer s(1); return m_settings.serialize();
s.writeS32(1, m_channelMarker.getCenterFrequency());
s.writeS32(2, ui->BW->value());
s.writeS32(3, ui->toneFrequency->value());
s.writeBlob(4, ui->spectrumGUI->serialize());
s.writeU32(5, m_channelMarker.getColor().rgb());
s.writeBlob(6, ui->cwKeyerGUI->serialize());
s.writeS32(7, ui->lowCut->value());
s.writeS32(8, ui->spanLog2->value());
s.writeBool(9, ui->audioBinaural->isChecked());
s.writeBool(10, ui->audioFlipChannels->isChecked());
s.writeBool(11, ui->dsb->isChecked());
s.writeBool(12, ui->agc->isChecked());
s.writeS32(13, ui->agcTime->value());
s.writeS32(14, ui->agcThreshold->value());
s.writeS32(15, ui->agcThresholdGate->value());
s.writeS32(16, ui->agcThresholdDelay->value());
s.writeS32(17, ui->agcOrder->value());
return s.final();
} }
bool SSBModGUI::deserialize(const QByteArray& data) bool SSBModGUI::deserialize(const QByteArray& data)
{ {
SimpleDeserializer d(data); if(m_settings.deserialize(data))
if(!d.isValid())
{ {
resetToDefaults();
applySettings();
return false;
}
if(d.getVersion() == 1)
{
QByteArray bytetmp;
quint32 u32tmp;
qint32 tmp;
bool booltmp;
blockApplySettings(true);
m_channelMarker.blockSignals(true);
d.readS32(1, &tmp, 0);
m_channelMarker.setCenterFrequency(tmp);
d.readS32(2, &tmp, 30);
ui->BW->setValue(tmp);
d.readS32(3, &tmp, 100);
ui->toneFrequency->setValue(tmp);
d.readBlob(4, &bytetmp);
ui->spectrumGUI->deserialize(bytetmp);
if(d.readU32(5, &u32tmp))
{
m_channelMarker.setColor(u32tmp);
}
d.readBlob(6, &bytetmp);
ui->cwKeyerGUI->deserialize(bytetmp);
d.readS32(7, &tmp, 3);
ui->lowCut->setValue(tmp);
d.readS32(8, &tmp, 3);
ui->spanLog2->setValue(tmp);
setNewRate(tmp);
d.readBool(9, &booltmp);
ui->audioBinaural->setChecked(booltmp);
d.readBool(10, &booltmp);
ui->audioFlipChannels->setChecked(booltmp);
d.readBool(11, &booltmp);
ui->dsb->setChecked(booltmp);
d.readBool(12, &booltmp, false);
ui->agc->setChecked(booltmp);
d.readS32(13, &tmp, 7);
ui->agcTime->setValue(tmp > 9 ? 9 : tmp);
d.readS32(14, &tmp, -40);
ui->agcThreshold->setValue(tmp);
d.readS32(15, &tmp, 4);
ui->agcThresholdGate->setValue(tmp);
d.readS32(16, &tmp, 5);
ui->agcThresholdDelay->setValue(tmp);
d.readS32(17, &tmp, 20);
ui->agcOrder->setValue(tmp);
displaySettings(); displaySettings();
applySettings(); // will have true
blockApplySettings(false);
m_channelMarker.blockSignals(false);
applySettings();
return true; return true;
} }
else else
{ {
resetToDefaults(); m_settings.resetToDefaults();
applySettings(); displaySettings();
applySettings(); // will have true
return false; return false;
} }
} }
@ -463,16 +351,16 @@ void SSBModGUI::on_agcOrder_valueChanged(int value){
} }
void SSBModGUI::on_agcTime_valueChanged(int value){ void SSBModGUI::on_agcTime_valueChanged(int value){
QString s = QString::number(m_agcTimeConstant[value], 'f', 0); QString s = QString::number(SSBModSettings::getAGCTimeConstant(value), 'f', 0);
ui->agcTimeText->setText(s); ui->agcTimeText->setText(s);
m_settings.m_agcTime = m_agcTimeConstant[value] * 48; m_settings.m_agcTime = SSBModSettings::getAGCTimeConstant(value) * 48;
applySettings(); applySettings();
} }
void SSBModGUI::on_agcThreshold_valueChanged(int value) void SSBModGUI::on_agcThreshold_valueChanged(int value)
{ {
displayAGCPowerThreshold(value);
m_settings.m_agcThreshold = value; // dB m_settings.m_agcThreshold = value; // dB
displayAGCPowerThreshold();
applySettings(); applySettings();
} }
@ -604,6 +492,10 @@ SSBModGUI::SSBModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* pa
ui->cwKeyerGUI->setBuddies(m_ssbMod->getInputMessageQueue(), m_ssbMod->getCWKeyer()); ui->cwKeyerGUI->setBuddies(m_ssbMod->getInputMessageQueue(), m_ssbMod->getCWKeyer());
ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum); ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
m_settings.setChannelMarker(&m_channelMarker);
m_settings.setSpectrumGUI(ui->spectrumGUI);
m_settings.setCWKeyerGUI(ui->cwKeyerGUI);
displaySettings(); displaySettings();
applySettings(); applySettings();
setNewRate(m_settings.m_spanLog2); setNewRate(m_settings.m_spanLog2);
@ -734,51 +626,96 @@ void SSBModGUI::applySettings()
m_settings.m_agcThreshold, m_settings.m_agcThreshold,
m_settings.m_agcThresholdGate, m_settings.m_agcThresholdGate,
m_settings.m_agcThresholdDelay); m_settings.m_agcThresholdDelay);
// m_ssbMod->configure(m_ssbMod->getInputMessageQueue(),
// ui->BW->value() * 100.0f,
// ui->lowCut->value() * 100.0f,
// ui->toneFrequency->value() * 10.0f,
// ui->volume->value() / 10.0f,
// m_spanLog2,
// ui->audioBinaural->isChecked(),
// ui->audioFlipChannels->isChecked(),
// ui->dsb->isChecked(),
// ui->audioMute->isChecked(),
// ui->playLoop->isChecked(),
// ui->agc->isChecked(),
// ui->agcOrder->value() / 100.0,
// m_agcTimeConstant[ui->agcTime->value()],
// ui->agcThreshold->value(),
// ui->agcThresholdGate->value(),
// ui->agcThresholdDelay->value() * 10);
} }
} }
void SSBModGUI::displaySettings() void SSBModGUI::displaySettings()
{ {
QString s = QString::number(m_agcTimeConstant[ui->agcTime->value()], 'f', 0); m_channelMarker.blockSignals(true);
ui->agcTimeText->setText(s); m_channelMarker.setCenterFrequency(m_settings.m_inputFrequencyOffset);
displayAGCPowerThreshold(ui->agcThreshold->value()); m_channelMarker.setBandwidth(m_settings.m_bandwidth * 2);
s = QString::number(ui->agcThresholdGate->value(), 'f', 0); m_channelMarker.setLowCutoff(m_settings.m_lowCutoff);
ui->agcThresholdGateText->setText(s); m_channelMarker.setColor(m_settings.m_rgbColor);
s = QString::number(ui->agcThresholdDelay->value() * 10, 'f', 0); setTitleColor(m_settings.m_rgbColor);
ui->agcThresholdDelayText->setText(s);
s = QString::number(ui->agcOrder->value() / 100.0, 'f', 2); if (m_settings.m_dsb) {
ui->agcOrderText->setText(s); m_channelMarker.setSidebands(ChannelMarker::dsb);
} else {
if (m_settings.m_bandwidth < 0) {
m_channelMarker.setSidebands(ChannelMarker::lsb);
} else {
m_channelMarker.setSidebands(ChannelMarker::usb);
}
} }
void SSBModGUI::displayAGCPowerThreshold(int value) m_channelMarker.blockSignals(false);
setWindowTitle(m_channelMarker.getTitle());
blockApplySettings(true);
QString s = QString::number(m_settings.m_agcTime / 48, 'f', 0);
ui->agcTimeText->setText(s);
ui->agcTime->setValue(SSBModSettings::getAGCTimeConstantIndex(m_settings.m_agcTime / 48));
displayAGCPowerThreshold();
s = QString::number(m_settings.m_agcThresholdGate / 48, 'f', 0);
ui->agcThresholdGateText->setText(s);
ui->agcThresholdGate->setValue(m_settings.m_agcThresholdGate / 48);
s = QString::number(m_settings.m_agcThresholdDelay / 48, 'f', 0);
ui->agcThresholdDelayText->setText(s);
ui->agcThresholdDelay->setValue(m_settings.m_agcThresholdDelay / 480);
s = QString::number(m_settings.m_agcOrder, 'f', 2);
ui->agcOrderText->setText(s);
ui->agcOrder->setValue(roundf(m_settings.m_agcOrder * 100.0));
ui->agc->setChecked(m_settings.m_agc);
ui->audioBinaural->setChecked(m_settings.m_audioBinaural);
ui->audioFlipChannels->setChecked(m_settings.m_audioFlipChannels);
ui->audioMute->setChecked(m_settings.m_audioMute);
ui->dsb->setChecked(m_settings.m_dsb);
ui->playLoop->setChecked(m_settings.m_playLoop);
ui->BW->setValue(roundf(m_settings.m_bandwidth/100.0));
s = QString::number(m_settings.m_bandwidth/1000.0, 'f', 1);
if (m_settings.m_dsb)
{ {
if (value == -99) ui->BWText->setText(tr("%1%2k").arg(QChar(0xB1, 0x00)).arg(s));
}
else
{
ui->BWText->setText(tr("%1k").arg(s));
}
ui->deltaFrequency->setValue(m_settings.m_inputFrequencyOffset);
ui->lowCut->setValue(m_settings.m_lowCutoff / 100.0);
ui->lowCutText->setText(tr("%1k").arg(m_settings.m_lowCutoff / 1000.0));
ui->spanLog2->setValue(m_settings.m_spanLog2);
ui->toneFrequency->setValue(roundf(m_settings.m_toneFrequency / 10.0));
ui->toneFrequencyText->setText(QString("%1k").arg(m_settings.m_toneFrequency / 1000.0, 0, 'f', 2));
ui->volume->setValue(m_settings.m_volumeFactor * 10.0);
ui->volumeText->setText(QString("%1").arg(m_settings.m_volumeFactor, 0, 'f', 1));
blockApplySettings(false);
}
void SSBModGUI::displayAGCPowerThreshold()
{
if (m_settings.m_agcThreshold == -99)
{ {
ui->agcThresholdText->setText("---"); ui->agcThresholdText->setText("---");
} }
else else
{ {
QString s = QString::number(value, 'f', 0); QString s = QString::number(m_settings.m_agcThreshold, 'f', 0);
ui->agcThresholdText->setText(s); ui->agcThresholdText->setText(s);
} }
ui->agcThreshold->setValue(m_settings.m_agcThreshold);
} }
void SSBModGUI::leaveEvent(QEvent*) void SSBModGUI::leaveEvent(QEvent*)

4
plugins/channeltx/modssb/ssbmodgui.h
View File

@ -118,7 +118,7 @@ private:
SSBMod::SSBModInputAF m_modAFInput; SSBMod::SSBModInputAF m_modAFInput;
MessageQueue m_inputMessageQueue; MessageQueue m_inputMessageQueue;
static const int m_agcTimeConstant[]; //!< time constant index to value in ms //static const int m_agcTimeConstant[]; //!< time constant index to value in ms
explicit SSBModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* parent = NULL); explicit SSBModGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget* parent = NULL);
virtual ~SSBModGUI(); virtual ~SSBModGUI();
@ -129,7 +129,7 @@ private:
void blockApplySettings(bool block); void blockApplySettings(bool block);
void applySettings(); void applySettings();
void displaySettings(); void displaySettings();
void displayAGCPowerThreshold(int value); void displayAGCPowerThreshold();
void updateWithStreamData(); void updateWithStreamData();
void updateWithStreamTime(); void updateWithStreamTime();
void channelMarkerUpdate(); void channelMarkerUpdate();

1
plugins/channeltx/modssb/ssbmodsettings.h
View File

@ -63,6 +63,7 @@ struct SSBModSettings
void resetToDefaults(); void resetToDefaults();
void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; } void setChannelMarker(Serializable *channelMarker) { m_channelMarker = channelMarker; }
void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; } void setSpectrumGUI(Serializable *spectrumGUI) { m_spectrumGUI = spectrumGUI; }
void setCWKeyerGUI(Serializable *cwKeyerGUI) { m_cwKeyerGUI = cwKeyerGUI; }
QByteArray serialize() const; QByteArray serialize() const;
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);