From ba9d8cdc1c4e823d5c0e58fecfc91a561d57781c Mon Sep 17 00:00:00 2001 From: f4exb Date: Thu, 5 Oct 2017 22:11:57 +0200 Subject: [PATCH] UDP source: changed marker color --- plugins/channelrx/udpsrc/udpsrcgui.cpp | 3 ++- plugins/channelrx/udpsrc/udpsrcsettings.cpp | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/channelrx/udpsrc/udpsrcgui.cpp b/plugins/channelrx/udpsrc/udpsrcgui.cpp index bcc27bfbf..5b941baf5 100644 --- a/plugins/channelrx/udpsrc/udpsrcgui.cpp +++ b/plugins/channelrx/udpsrc/udpsrcgui.cpp @@ -309,11 +309,12 @@ UDPSrcGUI::UDPSrcGUI(PluginAPI* pluginAPI, DeviceSourceAPI *deviceAPI, QWidget* m_channelMarker.setBandwidth(16000); m_channelMarker.setCenterFrequency(0); m_channelMarker.setTitle("UDP Sample Source"); - m_channelMarker.setColor(Qt::green); m_channelMarker.setUDPAddress("127.0.0.1"); m_channelMarker.setUDPSendPort(9999); m_channelMarker.setUDPReceivePort(9998); m_channelMarker.setVisible(true); + m_channelMarker.setColor(m_settings.m_rgbColor); + setTitleColor(m_channelMarker.getColor()); m_settings.setChannelMarker(&m_channelMarker); m_settings.setSpectrumGUI(ui->spectrumGUI); diff --git a/plugins/channelrx/udpsrc/udpsrcsettings.cpp b/plugins/channelrx/udpsrc/udpsrcsettings.cpp index f239580ab..82e5eb06d 100644 --- a/plugins/channelrx/udpsrc/udpsrcsettings.cpp +++ b/plugins/channelrx/udpsrc/udpsrcsettings.cpp @@ -14,6 +14,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include + #include "dsp/dspengine.h" #include "util/simpleserializer.h" #include "settings/serializable.h" @@ -46,6 +48,7 @@ void UDPSrcSettings::resetToDefaults() m_udpAddress = "127.0.0.1"; m_udpPort = 9999; m_audioPort = 9998; + m_rgbColor = QColor(225, 25, 99).rgb(); } QByteArray UDPSrcSettings::serialize() const @@ -65,6 +68,7 @@ QByteArray UDPSrcSettings::serialize() const } s.writeS32(8, m_gain*10.0); + s.writeU32(9, m_rgbColor); s.writeBool(11, m_audioActive); s.writeS32(12, m_volume); s.writeBool(14, m_audioStereo); @@ -118,6 +122,7 @@ bool UDPSrcSettings::deserialize(const QByteArray& data) d.readS32(8, &s32tmp, 10); m_gain = s32tmp / 10.0; + d.readU32(9, &m_rgbColor); d.readBool(11, &m_audioActive, false); d.readS32(12, &m_volume, 20); d.readBool(14, &m_audioStereo, false);