VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-10-25 10:00:21 -04:00
Code Issues Projects Releases Wiki Activity

UDP Sink: use settings in GUI (2)

Browse Source
This commit is contained in:
f4exb 2017-10-15 22:55:00 +02:00
parent 83228c9bca
commit 898fcce31e
4 changed files with 110 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
plugins/channeltx/udpsink/udpsinkgui.cpp
View File

@ -80,13 +80,13 @@ QByteArray UDPSinkGUI::serialize() const
{ {
SimpleSerializer s(1); SimpleSerializer s(1);
s.writeS32(2, m_channelMarker.getCenterFrequency()); s.writeS32(2, m_channelMarker.getCenterFrequency());
s.writeS32(3, m_sampleFormat); s.writeS32(3, (int) m_settings.m_sampleFormat);
s.writeReal(4, m_settings.m_inputSampleRate); s.writeReal(4, m_settings.m_inputSampleRate);
s.writeReal(5, m_settings.m_rfBandwidth); s.writeReal(5, m_settings.m_rfBandwidth);
s.writeBlob(6, m_channelMarker.serialize()); s.writeBlob(6, m_channelMarker.serialize());
s.writeBlob(7, ui->spectrumGUI->serialize()); s.writeBlob(7, ui->spectrumGUI->serialize());
s.writeS32(10, ui->gainOut->value()); s.writeS32(10, ui->gainOut->value());
s.writeS32(11, m_fmDeviation); s.writeS32(11, m_settings.m_fmDeviation);
s.writeBool(13, ui->stereoInput->isChecked()); s.writeBool(13, ui->stereoInput->isChecked());
s.writeS32(14, ui->squelch->value()); s.writeS32(14, ui->squelch->value());
s.writeS32(15, ui->squelchGate->value()); s.writeS32(15, ui->squelchGate->value());
@ -123,11 +123,7 @@ bool UDPSinkGUI::deserialize(const QByteArray& data)
m_channelMarker.setCenterFrequency(s32tmp); m_channelMarker.setCenterFrequency(s32tmp);
d.readS32(3, &s32tmp, UDPSinkSettings::FormatS16LE); d.readS32(3, &s32tmp, UDPSinkSettings::FormatS16LE);
if (s32tmp < (int) UDPSinkSettings::FormatNone) { setSampleFormat(s32tmp);
ui->sampleFormat->setCurrentIndex(s32tmp);
} else {
ui->sampleFormat->setCurrentIndex(((int) UDPSinkSettings::FormatNone) - 1);
}
d.readReal(4, &realtmp, 48000); d.readReal(4, &realtmp, 48000);
m_settings.m_inputSampleRate = realtmp; m_settings.m_inputSampleRate = realtmp;
d.readReal(5, &realtmp, 32000); d.readReal(5, &realtmp, 32000);
@ -138,7 +134,7 @@ bool UDPSinkGUI::deserialize(const QByteArray& data)
ui->gainOut->setValue(s32tmp); ui->gainOut->setValue(s32tmp);
ui->gainOutText->setText(tr("%1").arg(s32tmp/10.0, 0, 'f', 1)); ui->gainOutText->setText(tr("%1").arg(s32tmp/10.0, 0, 'f', 1));
d.readS32(11, &s32tmp, 2500); d.readS32(11, &s32tmp, 2500);
ui->fmDeviation->setText(QString("%1").arg(s32tmp)); m_settings.m_fmDeviation = s32tmp * 1.0;
d.readBool(13, &booltmp, true); d.readBool(13, &booltmp, true);
ui->stereoInput->setChecked(booltmp); ui->stereoInput->setChecked(booltmp);
d.readS32(14, &s32tmp, -60); d.readS32(14, &s32tmp, -60);
@ -266,100 +262,23 @@ void UDPSinkGUI::applySettings(bool force)
{ {
if (m_doApplySettings) if (m_doApplySettings)
{ {
bool ok;
// Real inputSampleRate = ui->sampleRate->text().toDouble(&ok);
//
// if((!ok) || (inputSampleRate < 1000))
// {
// inputSampleRate = 48000;
// }
//
// Real rfBandwidth = ui->rfBandwidth->text().toDouble(&ok);
//
// if((!ok) || (rfBandwidth > inputSampleRate))
// {
// rfBandwidth = inputSampleRate;
// }
int fmDeviation = ui->fmDeviation->text().toInt(&ok);
if ((!ok) || (fmDeviation < 1))
{
fmDeviation = 2500;
}
int amModPercent = ui->amModPercent->text().toInt(&ok);
if ((!ok) || (amModPercent < 1) || (amModPercent > 100))
{
amModPercent = 95;
}
setTitleColor(m_channelMarker.getColor()); setTitleColor(m_channelMarker.getColor());
ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency()); ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
// ui->sampleRate->setText(QString("%1").arg(inputSampleRate, 0)); m_channelMarker.blockSignals(true);
// ui->rfBandwidth->setText(QString("%1").arg(rfBandwidth, 0));
ui->fmDeviation->setText(QString("%1").arg(fmDeviation));
ui->amModPercent->setText(QString("%1").arg(amModPercent));
m_channelMarker.disconnect(this, SLOT(channelMarkerChanged()));
m_channelMarker.setBandwidth((int)m_settings.m_rfBandwidth); m_channelMarker.setBandwidth((int)m_settings.m_rfBandwidth);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged())); m_channelMarker.blockSignals(false);
ui->glSpectrum->setSampleRate(m_settings.m_inputSampleRate); ui->glSpectrum->setSampleRate(m_settings.m_inputSampleRate);
m_channelizer->configure(m_channelizer->getInputMessageQueue(), m_channelizer->configure(m_channelizer->getInputMessageQueue(),
m_settings.m_inputSampleRate, m_settings.m_inputSampleRate,
m_channelMarker.getCenterFrequency()); m_channelMarker.getCenterFrequency());
UDPSinkSettings::SampleFormat sampleFormat;
switch(ui->sampleFormat->currentIndex())
{
case 0:
sampleFormat = UDPSinkSettings::FormatS16LE;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setChecked(true);
ui->stereoInput->setEnabled(false);
break;
case 1:
sampleFormat = UDPSinkSettings::FormatNFM;
ui->fmDeviation->setEnabled(true);
ui->stereoInput->setEnabled(true);
break;
case 2:
sampleFormat = UDPSinkSettings::FormatLSB;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setEnabled(true);
break;
case 3:
sampleFormat = UDPSinkSettings::FormatUSB;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setEnabled(true);
break;
case 4:
sampleFormat = UDPSinkSettings::FormatAM;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setEnabled(true);
break;
default:
sampleFormat = UDPSinkSettings::FormatS16LE;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setChecked(true);
ui->stereoInput->setEnabled(false);
break;
}
m_sampleFormat = sampleFormat;
// m_inputSampleRate = inputSampleRate;
// m_rfBandwidth = rfBandwidth;
m_fmDeviation = fmDeviation;
m_udpSink->configure(m_udpSink->getInputMessageQueue(), m_udpSink->configure(m_udpSink->getInputMessageQueue(),
sampleFormat, m_settings.m_sampleFormat,
m_settings.m_inputSampleRate, m_settings.m_inputSampleRate,
m_settings.m_rfBandwidth, m_settings.m_rfBandwidth,
fmDeviation, m_settings.m_fmDeviation,
amModPercent / 100.0f, m_settings.m_amModFactor,
m_channelMarker.getUDPAddress(), m_channelMarker.getUDPAddress(),
m_channelMarker.getUDPReceivePort(), m_channelMarker.getUDPReceivePort(),
ui->channelMute->isChecked(), ui->channelMute->isChecked(),
@ -379,8 +298,13 @@ void UDPSinkGUI::applySettings(bool force)
void UDPSinkGUI::displaySettings() void UDPSinkGUI::displaySettings()
{ {
ui->sampleRate->setText(QString("%1").arg(m_settings.m_inputSampleRate, 0)); ui->sampleRate->setText(QString("%1").arg(roundf(m_settings.m_inputSampleRate), 0));
ui->rfBandwidth->setText(QString("%1").arg(m_settings.m_rfBandwidth, 0)); ui->rfBandwidth->setText(QString("%1").arg(roundf(m_settings.m_rfBandwidth), 0));
ui->fmDeviation->setText(QString("%1").arg(m_settings.m_fmDeviation, 0));
ui->amModPercent->setText(QString("%1").arg(roundf(m_settings.m_amModFactor), 0));
setSampleFormatIndex(m_settings.m_sampleFormat);
ui->gainInText->setText(tr("%1").arg(ui->gainIn->value()/10.0, 0, 'f', 1)); ui->gainInText->setText(tr("%1").arg(ui->gainIn->value()/10.0, 0, 'f', 1));
ui->gainOutText->setText(tr("%1").arg(ui->gainOut->value()/10.0, 0, 'f', 1)); ui->gainOutText->setText(tr("%1").arg(ui->gainOut->value()/10.0, 0, 'f', 1));
ui->squelchText->setText(tr("%1").arg(ui->squelch->value()*1.0, 0, 'f', 0)); ui->squelchText->setText(tr("%1").arg(ui->squelch->value()*1.0, 0, 'f', 0));
@ -414,6 +338,8 @@ void UDPSinkGUI::on_sampleFormat_currentIndexChanged(int index)
ui->amModPercent->setEnabled(false); ui->amModPercent->setEnabled(false);
} }
setSampleFormat(index);
ui->applyBtn->setEnabled(true); ui->applyBtn->setEnabled(true);
ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }"); ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }");
} }
@ -452,12 +378,33 @@ void UDPSinkGUI::on_rfBandwidth_textEdited(const QString& arg1 __attribute__((un
void UDPSinkGUI::on_fmDeviation_textEdited(const QString& arg1 __attribute__((unused))) void UDPSinkGUI::on_fmDeviation_textEdited(const QString& arg1 __attribute__((unused)))
{ {
bool ok;
int fmDeviation = ui->fmDeviation->text().toInt(&ok);
if ((!ok) || (fmDeviation < 1)) {
m_settings.m_fmDeviation = 2500;
ui->fmDeviation->setText(QString("%1").arg(m_settings.m_fmDeviation));
} else {
m_settings.m_fmDeviation = fmDeviation;
}
ui->applyBtn->setEnabled(true); ui->applyBtn->setEnabled(true);
ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }"); ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }");
} }
void UDPSinkGUI::on_amModPercent_textEdited(const QString& arg1 __attribute__((unused))) void UDPSinkGUI::on_amModPercent_textEdited(const QString& arg1 __attribute__((unused)))
{ {
bool ok;
int amModPercent = ui->amModPercent->text().toInt(&ok);
if ((!ok) || (amModPercent < 1) || (amModPercent > 100))
{
m_settings.m_amModFactor = 0.95;
ui->amModPercent->setText(QString("%1").arg(95));
} else {
m_settings.m_amModFactor = amModPercent / 100.0;
}
ui->applyBtn->setEnabled(true); ui->applyBtn->setEnabled(true);
ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }"); ui->applyBtn->setStyleSheet("QPushButton { background-color : green; }");
} }
@ -576,3 +523,68 @@ void UDPSinkGUI::tick()
m_tickCount++; m_tickCount++;
} }
void UDPSinkGUI::setSampleFormatIndex(const UDPSinkSettings::SampleFormat& sampleFormat)
{
switch(sampleFormat)
{
case UDPSinkSettings::FormatS16LE:
ui->sampleFormat->setCurrentIndex(0);
break;
case UDPSinkSettings::FormatNFM:
ui->sampleFormat->setCurrentIndex(1);
break;
case UDPSinkSettings::FormatLSB:
ui->sampleFormat->setCurrentIndex(2);
break;
case UDPSinkSettings::FormatUSB:
ui->sampleFormat->setCurrentIndex(3);
break;
case UDPSinkSettings::FormatAM:
ui->sampleFormat->setCurrentIndex(4);
break;
default:
ui->sampleFormat->setCurrentIndex(0);
break;
}
}
void UDPSinkGUI::setSampleFormat(int index)
{
switch(index)
{
case 0:
m_settings.m_sampleFormat = UDPSinkSettings::FormatS16LE;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setChecked(true);
ui->stereoInput->setEnabled(false);
break;
case 1:
m_settings.m_sampleFormat = UDPSinkSettings::FormatNFM;
ui->fmDeviation->setEnabled(true);
ui->stereoInput->setEnabled(true);
break;
case 2:
m_settings.m_sampleFormat = UDPSinkSettings::FormatLSB;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setEnabled(true);
break;
case 3:
m_settings.m_sampleFormat = UDPSinkSettings::FormatUSB;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setEnabled(true);
break;
case 4:
m_settings.m_sampleFormat = UDPSinkSettings::FormatAM;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setEnabled(true);
break;
default:
m_settings.m_sampleFormat = UDPSinkSettings::FormatS16LE;
ui->fmDeviation->setEnabled(false);
ui->stereoInput->setChecked(true);
ui->stereoInput->setEnabled(false);
break;
}
}

6
plugins/channeltx/udpsink/udpsinkgui.h
View File

@ -94,10 +94,6 @@ private:
// settings // settings
UDPSinkSettings m_settings; UDPSinkSettings m_settings;
UDPSinkSettings::SampleFormat m_sampleFormat;
// Real m_inputSampleRate;
// Real m_rfBandwidth;
int m_fmDeviation;
bool m_doApplySettings; bool m_doApplySettings;
MessageQueue m_inputMessageQueue; MessageQueue m_inputMessageQueue;
@ -107,6 +103,8 @@ private:
void blockApplySettings(bool block); void blockApplySettings(bool block);
void applySettings(bool force = false); void applySettings(bool force = false);
void displaySettings(); void displaySettings();
void setSampleFormat(int index);
void setSampleFormatIndex(const UDPSinkSettings::SampleFormat& sampleFormat);
void leaveEvent(QEvent*); void leaveEvent(QEvent*);
void enterEvent(QEvent*); void enterEvent(QEvent*);

6
plugins/channeltx/udpsink/udpsinksettings.cpp
View File

@ -105,12 +105,12 @@ bool UDPSinkSettings::deserialize(const QByteArray& data)
d.readS32(2, &s32tmp, 0); d.readS32(2, &s32tmp, 0);
m_inputFrequencyOffset = s32tmp; m_inputFrequencyOffset = s32tmp;
d.readS32(3, &s32tmp, (int) FormatS16LE); d.readS32(3, &s32tmp, 0);
if (s32tmp < (int) FormatNone) { if (s32tmp < (int) FormatNone) {
m_sampleFormat = s32tmp; m_sampleFormat = (SampleFormat) s32tmp;
} else { } else {
m_sampleFormat = (int) FormatNone - 1; m_sampleFormat = (SampleFormat) ((int) FormatNone - 1);
} }
d.readReal(4, &m_outputSampleRate, 48000); d.readReal(4, &m_outputSampleRate, 48000);

2
plugins/channeltx/udpsink/udpsinksettings.h
View File

@ -36,7 +36,7 @@ struct UDPSinkSettings
int m_basebandSampleRate; int m_basebandSampleRate;
Real m_outputSampleRate; Real m_outputSampleRate;
int m_sampleFormat; SampleFormat m_sampleFormat;
Real m_inputSampleRate; Real m_inputSampleRate;
qint64 m_inputFrequencyOffset; qint64 m_inputFrequencyOffset;
Real m_rfBandwidth; Real m_rfBandwidth;