From 80ea5348402e3fd11737e30d766b81926c384564 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 8 Jul 2020 20:05:23 +0200 Subject: [PATCH] SigMF file sink: GUI changes --- .../channelrx/sigmffilesink/sigmffilesink.cpp | 2 +- .../sigmffilesink/sigmffilesinkgui.ui | 559 ++++++++++-------- .../sigmffilesink/sigmffilesinkplugin.h | 2 +- .../sigmffilesink/sigmffilesinksettings.cpp | 4 +- 4 files changed, 304 insertions(+), 263 deletions(-) diff --git a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp index fc235e10f..81b3c67d9 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesink.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesink.cpp @@ -200,7 +200,7 @@ DeviceSampleSource *SigMFFileSink::getLocalDevice(uint32_t index) } else { - qDebug("SigMFFileSink::getLocalDevice: source device at index %u is not a Local Input source", index); + qDebug("SigMFFileSink::getLocalDevice: source device at index %u is not a SigMF File sink", index); } } else diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui index 565d30a50..07ec8b509 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkgui.ui @@ -6,14 +6,14 @@ 0 0 - 340 - 112 + 494 + 102 - 340 - 100 + 494 + 102 @@ -33,14 +33,20 @@ 0 0 - 341 - 101 + 492 + 100 + + + 492 + 100 + + Settings - + 2 @@ -54,273 +60,308 @@ 2 - - - 3 + + + 2 - - - 2 + + + + 16 + 0 + - - - - - 16 - 0 - - - - Df - - - - - - - false - - - - 0 - 0 - - - - - 32 - 16 - - - - - Liberation Mono - 12 - - - - PointingHandCursor - - - Qt::StrongFocus - - - Demod shift frequency from center in Hz - - - - - - - Hz - - - - - - - NCO - - - - - - - Qt::Vertical - - - - - - - Dec - - - - - - - - 55 - 16777215 - - - - Decimation factor - - - - 1 - - - - - 2 - - - - - 4 - - - - - 8 - - - - - 16 - - - - - 32 - - - - - 64 - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 50 - 0 - - - - Effective channel rate (kS/s) - - - 0000k - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + + Df + + - - - 10 + + + false - - - - Pos - - - - - - - Center frequency position - - - 2 - - - 1 - - - Qt::Horizontal - - - - - - - - 24 - 0 - - - - Filter chain hash code - - - 000 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 50 - 0 - - - - Filter chain stages left to right (L: low, C: center, H: high) - - - LLLLLL - - - - + + + 0 + 0 + + + + + 32 + 16 + + + + + Liberation Mono + 12 + + + + PointingHandCursor + + + Qt::StrongFocus + + + Demod shift frequency from center in Hz + + - + + + Hz + + + + + + + Qt::Vertical + + + + + + + NCO + + + + + + + Dec + + + + + + + + 55 + 16777215 + + + + Decimation factor + - - - - 24 - 16777215 - - - - - - - - :/record_off.png:/record_off.png - - + + 1 + - - - Qt::Horizontal - - - - 40 - 20 - - - + + 2 + - + + + 4 + + + + + 8 + + + + + 16 + + + + + 32 + + + + + 64 + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 50 + 0 + + + + Effective channel rate (kS/s) + + + 0000k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + 10 + + + + + Pos + + + + + + + Center frequency position + + + 2 + + + 1 + + + Qt::Horizontal + + + + + + + + 24 + 0 + + + + Filter chain hash code + + + 000 + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 50 + 0 + + + + Filter chain stages left to right (L: low, C: center, H: high) + + + LLLLLL + + + + + + + + + + + + 24 + 16777215 + + + + + + + + :/record_off.png:/record_off.png + + + + + + + + 24 + 24 + + + + + 24 + 24 + + + + Open file + + + + + + + :/preset-load.png:/preset-load.png + + + + + + + true + + + File currently opened + + + ... + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.h b/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.h index f1059e744..49644b969 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.h +++ b/plugins/channelrx/sigmffilesink/sigmffilesinkplugin.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////////////// -// Copyright (C) 2019 Edouard Griffiths, F4EXB // +// Copyright (C) 2020 Edouard Griffiths, F4EXB // // // // This program is free software; you can redistribute it and/or modify // // it under the terms of the GNU General Public License as published by // diff --git a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp index 21c68b2f2..f101899e2 100644 --- a/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp +++ b/plugins/channelrx/sigmffilesink/sigmffilesinksettings.cpp @@ -33,7 +33,7 @@ void SigMFFileSinkSettings::resetToDefaults() m_inputFrequencyOffset = 0; m_fileRecordName = ""; m_rgbColor = QColor(140, 4, 4).rgb(); - m_title = "Local sink"; + m_title = "SigMF File Sink"; m_log2Decim = 0; m_filterChainHash = 0; m_channelMarker = nullptr; @@ -85,7 +85,7 @@ bool SigMFFileSinkSettings::deserialize(const QByteArray& data) d.readString(3, &m_fileRecordName, ""); d.readS32(4, &m_streamIndex, 0); d.readU32(5, &m_rgbColor, QColor(0, 255, 255).rgb()); - d.readString(6, &m_title, "Local sink"); + d.readString(6, &m_title, "SigMF File Sink"); d.readBool(7, &m_useReverseAPI, false); d.readString(8, &m_reverseAPIAddress, "127.0.0.1"); d.readU32(9, &tmp, 0);