VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-12-23 10:05:46 -05:00
Code Issues Projects Releases Wiki Activity

UDP channel sink: applied new channel marker signal handling

Browse Source
This commit is contained in:
f4exb 2017-11-14 22:02:40 +01:00
parent 89f6fcb8b0
commit 84113775aa
4 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,26 +138,27 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer());
connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
//m_channelMarker = new ChannelMarker(this);
m_channelMarker.blockSignals(true);
m_channelMarker.setBandwidth(16000);
m_channelMarker.setCenterFrequency(0);
m_channelMarker.setColor(Qt::green);
m_channelMarker.setColor(m_settings.m_rgbColor);
m_channelMarker.setTitle("UDP Sample Sink");
m_channelMarker.setVisible(true);
connect(&m_channelMarker, SIGNAL(changed()), this, SLOT(channelMarkerChanged()));
m_channelMarker.blockSignals(false);
m_channelMarker.setVisible(true); // activate signal on the last setting only
m_deviceUISet->registerTxChannelInstance(UDPSink::m_channelID, this);
m_deviceUISet->addChannelMarker(&m_channelMarker);
m_deviceUISet->addRollupWidget(this);
ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
connect(&m_channelMarker, SIGNAL(changedByCursor()), this, SLOT(channelMarkerChangedByCursor()));
displaySettings();
applySettings(true);
ui->spectrumGUI->setBuddies(m_spectrumVis->getInputMessageQueue(), m_spectrumVis, ui->glSpectrum);
connect(getInputMessageQueue(), SIGNAL(messageEnqueued()), this, SLOT(handleSourceMessages()));
connect(m_udpSink, SIGNAL(levelChanged(qreal, qreal, int)), ui->volumeMeter, SLOT(levelChanged(qreal, qreal, int)));
displaySettings();
applySettings(true);
}
UDPSinkGUI::~UDPSinkGUI()
@ -197,12 +198,14 @@ void UDPSinkGUI::displaySettings()
m_channelMarker.setBandwidth((int)m_settings.m_rfBandwidth);
m_channelMarker.setColor(m_settings.m_rgbColor);
m_channelMarker.setUDPAddress(m_settings.m_udpAddress);
m_channelMarker.setUDPReceivePort(m_settings.m_udpPort);
m_channelMarker.blockSignals(false);
m_channelMarker.setUDPReceivePort(m_settings.m_udpPort); // activate signal on the last setting only
setTitleColor(m_settings.m_rgbColor);
this->setWindowTitle(m_channelMarker.getTitle());
blockApplySettings(true);
ui->deltaFrequency->setValue(m_settings.m_inputFrequencyOffset);
ui->sampleRate->setText(QString("%1").arg(roundf(m_settings.m_inputSampleRate), 0));
ui->glSpectrum->setSampleRate(m_settings.m_inputSampleRate);
@ -234,18 +237,14 @@ void UDPSinkGUI::displaySettings()
ui->squelchGate->setValue(roundf(m_settings.m_squelchGate * 100.0));
ui->addressText->setText(tr("%1:%2").arg(m_settings.m_udpAddress).arg(m_settings.m_udpPort));
blockApplySettings(false);
}
void UDPSinkGUI::displayUDPSettings()
void UDPSinkGUI::channelMarkerChangedByCursor()
{
}
void UDPSinkGUI::channelMarkerChanged()
{
m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
m_settings.m_udpAddress = m_channelMarker.getUDPAddress();
m_settings.m_udpPort = m_channelMarker.getUDPReceivePort();
displaySettings();
ui->deltaFrequency->setValue(m_channelMarker.getCenterFrequency());
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
applySettings();
}
@ -424,20 +423,26 @@ void UDPSinkGUI::onMenuDialogCalled(const QPoint &p)
BasicChannelSettingsDialog dialog(&m_channelMarker, this);
dialog.move(p);
dialog.exec();
m_settings.m_inputFrequencyOffset = m_channelMarker.getCenterFrequency();
m_settings.m_udpAddress = m_channelMarker.getUDPAddress(),
m_settings.m_udpPort = m_channelMarker.getUDPReceivePort(),
m_settings.m_rgbColor = m_channelMarker.getColor().rgb();
setWindowTitle(m_channelMarker.getTitle());
setTitleColor(m_settings.m_rgbColor);
applySettings();
}
void UDPSinkGUI::leaveEvent(QEvent*)
{
blockApplySettings(true);
m_channelMarker.setHighlighted(false);
blockApplySettings(false);
}
void UDPSinkGUI::enterEvent(QEvent*)
{
blockApplySettings(true);
m_channelMarker.setHighlighted(true);
blockApplySettings(false);
}
void UDPSinkGUI::tick()

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

@ -53,27 +53,8 @@ public:
virtual MessageQueue *getInputMessageQueue() { return &m_inputMessageQueue; }
virtual bool handleMessage(const Message& message);
private slots:
void handleSourceMessages();
void channelMarkerChanged();
void on_deltaFrequency_changed(qint64 value);
void on_sampleFormat_currentIndexChanged(int index);
void on_sampleRate_textEdited(const QString& arg1);
void on_rfBandwidth_textEdited(const QString& arg1);
void on_fmDeviation_textEdited(const QString& arg1);
void on_amModPercent_textEdited(const QString& arg1);
void on_applyBtn_clicked();
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDialogCalled(const QPoint& p);
void on_gainIn_valueChanged(int value);
void on_gainOut_valueChanged(int value);
void on_squelch_valueChanged(int value);
void on_squelchGate_valueChanged(int value);
void on_channelMute_toggled(bool checked);
void on_resetUDPReadIndex_clicked();
void on_autoRWBalance_toggled(bool checked);
void on_stereoInput_toggled(bool checked);
void tick();
public slots:
void channelMarkerChangedByCursor();
private:
Ui::UDPSinkGUI* ui;
@ -98,12 +79,32 @@ private:
void blockApplySettings(bool block);
void applySettings(bool force = false);
void displaySettings();
void displayUDPSettings();
void setSampleFormat(int index);
void setSampleFormatIndex(const UDPSinkSettings::SampleFormat& sampleFormat);
void leaveEvent(QEvent*);
void enterEvent(QEvent*);
private slots:
void handleSourceMessages();
void on_deltaFrequency_changed(qint64 value);
void on_sampleFormat_currentIndexChanged(int index);
void on_sampleRate_textEdited(const QString& arg1);
void on_rfBandwidth_textEdited(const QString& arg1);
void on_fmDeviation_textEdited(const QString& arg1);
void on_amModPercent_textEdited(const QString& arg1);
void on_applyBtn_clicked();
void onWidgetRolled(QWidget* widget, bool rollDown);
void onMenuDialogCalled(const QPoint& p);
void on_gainIn_valueChanged(int value);
void on_gainOut_valueChanged(int value);
void on_squelch_valueChanged(int value);
void on_squelchGate_valueChanged(int value);
void on_channelMute_toggled(bool checked);
void on_resetUDPReadIndex_clicked();
void on_autoRWBalance_toggled(bool checked);
void on_stereoInput_toggled(bool checked);
void tick();
};
#endif /* PLUGINS_CHANNELTX_UDPSINK_UDPSINKGUI_H_ */

2
plugins/channeltx/udpsink/udpsinkgui.ui
View File

@ -800,7 +800,7 @@
</size>
</property>
<property name="toolTip">
<string>UDP &lt;address&gt;:&lt;data port&gt;</string>
<string>Receiving UDP address and port</string>
</property>
<property name="text">
<string>000.000.000.000:00000</string>

2
plugins/channeltx/udpsink/udpsinkplugin.cpp
View File

@ -24,7 +24,7 @@
const PluginDescriptor UDPSinkPlugin::m_pluginDescriptor = {
QString("UDP Channel Sink"),
QString("3.8.2"),
QString("3.8.4"),
QString("(c) Edouard Griffiths, F4EXB"),
QString("https://github.com/f4exb/sdrangel"),
true,