1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-11-16 21:23:19 -05:00

SigMF file sink: GUI changes

This commit is contained in:
f4exb 2020-07-08 20:05:23 +02:00
parent 2cb96ed187
commit 80ea534840
4 changed files with 304 additions and 263 deletions

View File

@ -200,7 +200,7 @@ DeviceSampleSource *SigMFFileSink::getLocalDevice(uint32_t index)
} }
else 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 else

View File

@ -6,14 +6,14 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>340</width> <width>494</width>
<height>112</height> <height>102</height>
</rect> </rect>
</property> </property>
<property name="minimumSize"> <property name="minimumSize">
<size> <size>
<width>340</width> <width>494</width>
<height>100</height> <height>102</height>
</size> </size>
</property> </property>
<property name="font"> <property name="font">
@ -33,14 +33,20 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>341</width> <width>492</width>
<height>101</height> <height>100</height>
</rect> </rect>
</property> </property>
<property name="minimumSize">
<size>
<width>492</width>
<height>100</height>
</size>
</property>
<property name="windowTitle"> <property name="windowTitle">
<string>Settings</string> <string>Settings</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0">
<property name="leftMargin"> <property name="leftMargin">
<number>2</number> <number>2</number>
</property> </property>
@ -54,12 +60,7 @@
<number>2</number> <number>2</number>
</property> </property>
<item> <item>
<layout class="QVBoxLayout" name="decimationLayer"> <layout class="QHBoxLayout" name="deltaFrequencyLayout">
<property name="spacing">
<number>3</number>
</property>
<item>
<layout class="QHBoxLayout" name="deltaFrequencyLayer">
<property name="rightMargin"> <property name="rightMargin">
<number>2</number> <number>2</number>
</property> </property>
@ -118,16 +119,16 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="nco"> <widget class="Line" name="line">
<property name="text"> <property name="orientation">
<string>NCO</string> <enum>Qt::Vertical</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="Line" name="line"> <widget class="ButtonSwitch" name="nco">
<property name="orientation"> <property name="text">
<enum>Qt::Vertical</enum> <string>NCO</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -221,7 +222,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="decimationShiftLayer"> <layout class="QHBoxLayout" name="decimationShiftLayout">
<property name="rightMargin"> <property name="rightMargin">
<number>10</number> <number>10</number>
</property> </property>
@ -286,7 +287,7 @@
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="fileNameLayout">
<item> <item>
<widget class="ButtonSwitch" name="record"> <widget class="ButtonSwitch" name="record">
<property name="maximumSize"> <property name="maximumSize">
@ -305,23 +306,63 @@
</widget> </widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_2"> <widget class="QPushButton" name="showFileDialog">
<property name="minimumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>24</width>
<height>24</height>
</size>
</property>
<property name="toolTip">
<string>Open file</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/preset-load.png</normaloff>:/preset-load.png</iconset>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="fileNameText">
<property name="enabled">
<bool>true</bool>
</property>
<property name="toolTip">
<string>File currently opened</string>
</property>
<property name="text">
<string>...</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>20</width>
<height>20</height> <height>40</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> </layout>
</item>
</layout>
</item>
</layout>
</widget> </widget>
</widget> </widget>
<customwidgets> <customwidgets>

View File

@ -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 // // 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 // // it under the terms of the GNU General Public License as published by //

View File

@ -33,7 +33,7 @@ void SigMFFileSinkSettings::resetToDefaults()
m_inputFrequencyOffset = 0; m_inputFrequencyOffset = 0;
m_fileRecordName = ""; m_fileRecordName = "";
m_rgbColor = QColor(140, 4, 4).rgb(); m_rgbColor = QColor(140, 4, 4).rgb();
m_title = "Local sink"; m_title = "SigMF File Sink";
m_log2Decim = 0; m_log2Decim = 0;
m_filterChainHash = 0; m_filterChainHash = 0;
m_channelMarker = nullptr; m_channelMarker = nullptr;
@ -85,7 +85,7 @@ bool SigMFFileSinkSettings::deserialize(const QByteArray& data)
d.readString(3, &m_fileRecordName, ""); d.readString(3, &m_fileRecordName, "");
d.readS32(4, &m_streamIndex, 0); d.readS32(4, &m_streamIndex, 0);
d.readU32(5, &m_rgbColor, QColor(0, 255, 255).rgb()); 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.readBool(7, &m_useReverseAPI, false);
d.readString(8, &m_reverseAPIAddress, "127.0.0.1"); d.readString(8, &m_reverseAPIAddress, "127.0.0.1");
d.readU32(9, &tmp, 0); d.readU32(9, &tmp, 0);