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

Merge pull request #2184 from dforsi/fix/cleanup

Browse Source 
Fix/cleanup
This commit is contained in:
Edouard Griffiths 2024-06-24 10:48:57 +02:00 committed by GitHub
commit a4b78fa30e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
123 changed files with 136 additions and 1651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/channelmimo/doa2/doa2streamsink.cpp
View File

@ -17,7 +17,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QMutexLocker>
#include <QDebug> #include <QDebug>
#include "doa2streamsink.h" #include "doa2streamsink.h"

1
plugins/channelmimo/interferometer/interferometerstreamsink.cpp
View File

@ -17,7 +17,6 @@
// along with this program. If not, see <http://www.gnu.org/licenses/>. // // along with this program. If not, see <http://www.gnu.org/licenses/>. //
/////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////
#include <QMutexLocker>
#include <QDebug> #include <QDebug>
#include "interferometerstreamsink.h" #include "interferometerstreamsink.h"

1
plugins/channelrx/demoddsd/dsdstatustextdialog.ui
View File

@ -109,6 +109,7 @@
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>9</pointsize>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">

2
plugins/channelrx/demodvormc/vordemodmcgui.ui
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>VORDemodMCGUI</class> <class>VORDemodGUI</class>
<widget class="RollupContents" name="VORDemodGUI"> <widget class="RollupContents" name="VORDemodGUI">
<property name="geometry"> <property name="geometry">
<rect> <rect>

1
plugins/channelrx/demodwfm/wfmdemodgui.ui
View File

@ -233,7 +233,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

1
plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp
View File

@ -20,7 +20,6 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QUdpSocket> #include <QUdpSocket>

1
plugins/channeltx/modais/aismod.cpp
View File

@ -19,7 +19,6 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkDatagram> #include <QNetworkDatagram>
#include <QNetworkReply> #include <QNetworkReply>

1
plugins/channeltx/modchirpchat/chirpchatmod.cpp
View File

@ -20,7 +20,6 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QUdpSocket> #include <QUdpSocket>

1
plugins/channeltx/moddatv/datvmod.cpp
View File

@ -24,7 +24,6 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkReply> #include <QNetworkReply>
#include <QBuffer> #include <QBuffer>

1
plugins/channeltx/modpacket/packetmod.cpp
View File

@ -20,7 +20,6 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkDatagram> #include <QNetworkDatagram>
#include <QNetworkReply> #include <QNetworkReply>

1
plugins/channeltx/modpsk31/psk31mod.cpp
View File

@ -17,7 +17,6 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkDatagram> #include <QNetworkDatagram>
#include <QNetworkReply> #include <QNetworkReply>

1
plugins/channeltx/modrtty/rttymod.cpp
View File

@ -17,7 +17,6 @@
#include <QTime> #include <QTime>
#include <QDebug> #include <QDebug>
#include <QMutexLocker>
#include <QNetworkAccessManager> #include <QNetworkAccessManager>
#include <QNetworkDatagram> #include <QNetworkDatagram>
#include <QNetworkReply> #include <QNetworkReply>

1
plugins/feature/antennatools/antennatoolsgui.ui
View File

@ -540,7 +540,6 @@
<tabstop>dishEffectiveArea</tabstop> <tabstop>dishEffectiveArea</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="antennatools.qrc"/> <include location="antennatools.qrc"/>
</resources> </resources>
<connections/> <connections/>

437
plugins/feature/map/mapfmlistdialog.ui
View File

@ -1,437 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>MapBeaconDialog</class>
<widget class="QDialog" name="MapBeaconDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>1027</width>
<height>349</height>
</rect>
</property>
<property name="font">
<font>
<family>Liberation Sans</family>
<pointsize>9</pointsize>
</font>
</property>
<property name="windowTitle">
<string>Beacons</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox">
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="topMargin">
<number>0</number>
</property>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="downloadList">
<property name="toolTip">
<string>Download FM/DAB list</string>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../sdrgui/resources/res.qrc">
<normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>2</number>
</property>
<widget class="QWidget" name="fmTab">
<attribute name="title">
<string>FM</string>
</attribute>
<widget class="QTableWidget" name="fm">
<property name="geometry">
<rect>
<x>0</x>
<y>20</y>
<width>989</width>
<height>192</height>
</rect>
</property>
<property name="toolTip">
<string/>
</property>
<column>
<property name="text">
<string>Station</string>
</property>
</column>
<column>
<property name="text">
<string>Frequency</string>
</property>
</column>
<column>
<property name="text">
<string>Location</string>
</property>
</column>
<column>
<property name="text">
<string>Power</string>
</property>
</column>
<column>
<property name="text">
<string>Azimuth</string>
</property>
</column>
<column>
<property name="text">
<string>Elevation</string>
</property>
</column>
<column>
<property name="text">
<string>Distance (km)</string>
</property>
</column>
</widget>
</widget>
<widget class="QWidget" name="dabTab">
<attribute name="title">
<string>DAB</string>
</attribute>
<widget class="QTableWidget" name="dab">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>989</width>
<height>192</height>
</rect>
</property>
<property name="toolTip">
<string/>
</property>
<column>
<property name="text">
<string>Station</string>
</property>
</column>
<column>
<property name="text">
<string>Frequency</string>
</property>
</column>
<column>
<property name="text">
<string>Location</string>
</property>
</column>
<column>
<property name="text">
<string>Power</string>
</property>
</column>
<column>
<property name="text">
<string>Azimuth</string>
</property>
</column>
<column>
<property name="text">
<string>Elevation</string>
</property>
</column>
<column>
<property name="text">
<string>Distance (km)</string>
</property>
</column>
</widget>
</widget>
<widget class="QWidget" name="settingsTab">
<attribute name="title">
<string>Settings</string>
</attribute>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Countries</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="4">
<widget class="QCheckBox" name="checkBox_16">
<property name="text">
<string>ETH</string>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QCheckBox" name="checkBox_15">
<property name="text">
<string>CRO</string>
</property>
</widget>
</item>
<item row="0" column="7">
<widget class="QCheckBox" name="checkBox_19">
<property name="text">
<string>LCA</string>
</property>
</widget>
</item>
<item row="0" column="9">
<widget class="QCheckBox" name="checkBox_21">
<property name="text">
<string>NIU</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="checkBox_13">
<property name="text">
<string>AZE</string>
</property>
</widget>
</item>
<item row="0" column="12">
<widget class="QCheckBox" name="checkBox_24">
<property name="text">
<string>TKM</string>
</property>
</widget>
</item>
<item row="0" column="5">
<widget class="QCheckBox" name="checkBox_17">
<property name="text">
<string>GTB</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QCheckBox" name="checkBox_14">
<property name="text">
<string>BRB</string>
</property>
</widget>
</item>
<item row="0" column="8">
<widget class="QCheckBox" name="checkBox_20">
<property name="text">
<string>MLD</string>
</property>
</widget>
</item>
<item row="0" column="6">
<widget class="QCheckBox" name="checkBox_18">
<property name="text">
<string>IRQ</string>
</property>
</widget>
</item>
<item row="0" column="10">
<widget class="QCheckBox" name="checkBox_22">
<property name="text">
<string>PTC</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>ABW</string>
</property>
</widget>
</item>
<item row="0" column="11">
<widget class="QCheckBox" name="checkBox_23">
<property name="text">
<string>SNG</string>
</property>
</widget>
</item>
<item row="0" column="13">
<widget class="QCheckBox" name="checkBox_25">
<property name="text">
<string>VIR</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="checkBox_4">
<property name="text">
<string>AFG</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QCheckBox" name="checkBox_5">
<property name="text">
<string>AZR</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QCheckBox" name="checkBox_6">
<property name="text">
<string>BRU</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QCheckBox" name="checkBox_11">
<property name="text">
<string>CTI</string>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QCheckBox" name="checkBox_9">
<property name="text">
<string>F</string>
</property>
</widget>
</item>
<item row="1" column="5">
<widget class="QCheckBox" name="checkBox_12">
<property name="text">
<string>GTM</string>
</property>
</widget>
</item>
<item row="1" column="6">
<widget class="QCheckBox" name="checkBox_10">
<property name="text">
<string>ISL</string>
</property>
</widget>
</item>
<item row="1" column="7">
<widget class="QCheckBox" name="checkBox_8">
<property name="text">
<string>LHW</string>
</property>
</widget>
</item>
<item row="1" column="8">
<widget class="QCheckBox" name="checkBox_7">
<property name="text">
<string>MLI</string>
</property>
</widget>
</item>
<item row="1" column="9">
<widget class="QCheckBox" name="checkBox_3">
<property name="text">
<string>NMB</string>
</property>
</widget>
</item>
<item row="1" column="10">
<widget class="QCheckBox" name="checkBox_2">
<property name="text">
<string>PTR</string>
</property>
</widget>
</item>
<item row="1" column="11">
<widget class="QCheckBox" name="checkBox_26">
<property name="text">
<string>SOM</string>
</property>
</widget>
</item>
<item row="1" column="12">
<widget class="QCheckBox" name="checkBox_27">
<property name="text">
<string>TMP</string>
</property>
</widget>
</item>
<item row="1" column="13">
<widget class="QCheckBox" name="checkBox_28">
<property name="text">
<string>VRG</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections>
<connection>
<sender>buttonBox</sender>
<signal>accepted()</signal>
<receiver>MapBeaconDialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>248</x>
<y>254</y>
</hint>
<hint type="destinationlabel">
<x>157</x>
<y>274</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>MapBeaconDialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>260</y>
</hint>
<hint type="destinationlabel">
<x>286</x>
<y>274</y>
</hint>
</hints>
</connection>
</connections>
</ui>

4
plugins/feature/map/mapradiotimedialog.ui
View File

@ -100,9 +100,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

2
plugins/feature/morsedecoder/readme.md
View File

@ -67,7 +67,7 @@ Lock the pitch and speed to the current values detected by GGMorse. Unlock to re
This is the GGMorse decoder cost factor. Successful decodes yield from a few millis to a few tens of millis. This is the GGMorse decoder cost factor. Successful decodes yield from a few millis to a few tens of millis.
<h3>11a: Show decoder theshold</h3> <h3>11a: Show decoder threshold</h3>
Enable or disable the GGMorse decoder threshold display on the imaginary trace of the scope. Enable or disable the GGMorse decoder threshold display on the imaginary trace of the scope.

4
plugins/feature/simpleptt/simplepttcommandoutputdialog.ui
View File

@ -200,9 +200,7 @@
<tabstops> <tabstops>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources/>
<include location="../resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

1
plugins/feature/simpleptt/simplepttgui.ui
View File

@ -94,7 +94,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>20</pointsize> <pointsize>20</pointsize>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>

2
plugins/samplemimo/audiocatsiso/audiocatsiso.cpp
View File

@ -207,8 +207,6 @@ bool AudioCATSISO::startTx()
m_outputWorkerThread->start(); m_outputWorkerThread->start();
m_txRunning = true; m_txRunning = true;
mutexLocker.unlock();
qDebug("AudioCATSISO::startTx: started"); qDebug("AudioCATSISO::startTx: started");
return true; return true;

2
plugins/samplemimo/audiocatsiso/audiocatsisogui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -334,7 +333,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

2
plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp
View File

@ -171,7 +171,6 @@ bool BladeRF2MIMO::startRx()
} }
m_sourceThread->startWork(); m_sourceThread->startWork();
mutexLocker.unlock();
m_runningRx = true; m_runningRx = true;
return true; return true;
@ -207,7 +206,6 @@ bool BladeRF2MIMO::startTx()
} }
m_sinkThread->startWork(); m_sinkThread->startWork();
mutexLocker.unlock();
m_runningTx = true; m_runningTx = true;
return true; return true;

2
plugins/samplemimo/limesdrmimo/limesdrmimo.cpp
View File

@ -300,7 +300,6 @@ bool LimeSDRMIMO::startRx()
m_sourceThread->setLog2Decimation(m_settings.m_log2SoftDecim); m_sourceThread->setLog2Decimation(m_settings.m_log2SoftDecim);
m_sourceThread->setIQOrder(m_settings.m_iqOrder); m_sourceThread->setIQOrder(m_settings.m_iqOrder);
m_sourceThread->startWork(); m_sourceThread->startWork();
mutexLocker.unlock();
m_runningRx = true; m_runningRx = true;
return true; return true;
@ -374,7 +373,6 @@ bool LimeSDRMIMO::startTx()
m_sinkThread->setFifo(&m_sampleMOFifo); m_sinkThread->setFifo(&m_sampleMOFifo);
m_sinkThread->setLog2Interpolation(m_settings.m_log2SoftInterp); m_sinkThread->setLog2Interpolation(m_settings.m_log2SoftInterp);
m_sinkThread->startWork(); m_sinkThread->startWork();
mutexLocker.unlock();
m_runningTx = true; m_runningTx = true;
return true; return true;

37
plugins/samplemimo/limesdrmimo/limesdrmimogui.ui
View File

@ -343,7 +343,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -414,7 +413,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -540,7 +538,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -731,7 +728,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -1359,39 +1355,6 @@ QToolTip{background-color: white; color: black;}</string>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

2
plugins/samplemimo/metismiso/metismisogui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -338,7 +337,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

2
plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp
View File

@ -199,7 +199,6 @@ bool PlutoSDRMIMO::startRx()
m_plutoRxBuffer = m_plutoParams->getBox()->createRxBuffer(PlutoSDRMIMOSettings::m_plutoSDRBlockSizeSamples, false); m_plutoRxBuffer = m_plutoParams->getBox()->createRxBuffer(PlutoSDRMIMOSettings::m_plutoSDRBlockSizeSamples, false);
m_sourceThread->startWork(); m_sourceThread->startWork();
mutexLocker.unlock();
m_runningRx = true; m_runningRx = true;
return true; return true;
@ -237,7 +236,6 @@ bool PlutoSDRMIMO::startTx()
m_plutoTxBuffer = m_plutoParams->getBox()->createTxBuffer(PlutoSDRMIMOSettings::m_plutoSDRBlockSizeSamples, false); m_plutoTxBuffer = m_plutoParams->getBox()->createTxBuffer(PlutoSDRMIMOSettings::m_plutoSDRBlockSizeSamples, false);
m_sinkThread->startWork(); m_sinkThread->startWork();
mutexLocker.unlock();
m_runningTx = true; m_runningTx = true;
return true; return true;

2
plugins/samplemimo/plutosdrmimo/plutosdrmimogui.ui
View File

@ -792,7 +792,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -849,7 +848,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

4
plugins/samplemimo/testmi/testmigui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -230,7 +229,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -497,7 +495,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -656,7 +653,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

1
plugins/samplemimo/testmosync/testmosync.cpp
View File

@ -89,7 +89,6 @@ bool TestMOSync::startTx()
m_sinkWorker->setFeedSpectrumIndex(m_feedSpectrumIndex); m_sinkWorker->setFeedSpectrumIndex(m_feedSpectrumIndex);
m_sinkWorker->connectTimer(m_masterTimer); m_sinkWorker->connectTimer(m_masterTimer);
startWorker(); startWorker();
mutexLocker.unlock();
m_runningTx = true; m_runningTx = true;
return true; return true;

4
plugins/samplemimo/xtrxmimo/xtrxmimogui.ui
View File

@ -343,7 +343,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -414,7 +413,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -540,7 +538,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -736,7 +733,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

2
plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.ui
View File

@ -129,7 +129,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -206,7 +205,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

2
plugins/samplesink/audiooutput/audiooutput.cpp
View File

@ -98,8 +98,6 @@ bool AudioOutput::start()
m_workerThread->start(); m_workerThread->start();
m_running = true; m_running = true;
mutexLocker.unlock();
qDebug("AudioOutput::start: started"); qDebug("AudioOutput::start: started");
return true; return true;

33
plugins/samplesink/limesdroutput/limesdroutputgui.ui
View File

@ -977,39 +977,6 @@ QToolTip{background-color: white; color: black;}</string>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

3
plugins/samplesink/plutosdroutput/plutosdroutputgui.ui
View File

@ -135,7 +135,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -431,7 +430,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -488,7 +486,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

33
plugins/samplesink/usrpoutput/usrpoutputgui.ui
View File

@ -746,39 +746,6 @@
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
plugins/samplesink/xtrxoutput/xtrxoutputgui.ui
View File

@ -135,7 +135,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -248,7 +247,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -354,7 +352,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -550,7 +547,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

3
plugins/samplesource/aaroniartsainput/aaroniartsainputgui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -135,7 +134,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -210,7 +208,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

1
plugins/samplesource/audioinput/audioinput.cpp
View File

@ -119,7 +119,6 @@ bool AudioInput::start()
m_worker->startWork(); m_worker->startWork();
m_workerThread->start(); m_workerThread->start();
m_running = true; m_running = true;
mutexLocker.unlock();
qDebug("AudioInput::start: started"); qDebug("AudioInput::start: started");

6
plugins/samplesource/fileinput/fileinputgui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -129,7 +128,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -241,7 +239,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -276,7 +273,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -305,7 +301,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -445,7 +440,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

2
plugins/samplesource/kiwisdr/kiwisdrgui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -135,7 +134,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

33
plugins/samplesource/limesdrinput/limesdrinputgui.ui
View File

@ -1300,39 +1300,6 @@ QToolTip{background-color: white; color: black;}</string>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

1
plugins/samplesource/localinput/localinputgui.ui
View File

@ -132,7 +132,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

2
plugins/samplesource/plutosdrinput/plutosdrinputgui.ui
View File

@ -607,7 +607,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -664,7 +663,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

2
plugins/samplesource/remoteinput/remoteinputgui.ui
View File

@ -123,7 +123,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -204,7 +203,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

1
plugins/samplesource/sigmffileinput/recordinfodialog.ui
View File

@ -62,6 +62,7 @@
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>9</pointsize>
</font> </font>
</property> </property>
</widget> </widget>

7
plugins/samplesource/sigmffileinput/sigmffileinputgui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -132,7 +131,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -293,7 +291,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -328,7 +325,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -357,7 +353,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -376,7 +371,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -703,7 +697,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

4
plugins/samplesource/testsource/testsourcegui.ui
View File

@ -32,7 +32,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -138,7 +137,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -418,7 +416,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>
@ -577,7 +574,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<italic>false</italic> <italic>false</italic>
<bold>false</bold> <bold>false</bold>
</font> </font>

33
plugins/samplesource/usrpinput/usrpinputgui.ui
View File

@ -900,39 +900,6 @@
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../../../sdrgui/resources/res.qrc"/> <include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
<include location="../../../sdrgui/resources/res.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

4
plugins/samplesource/xtrxinput/xtrxinputgui.ui
View File

@ -135,7 +135,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>16</pointsize> <pointsize>16</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -248,7 +247,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -374,7 +372,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>
@ -570,7 +567,6 @@
<font> <font>
<family>Liberation Mono</family> <family>Liberation Mono</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

2
sdrbase/maincore.cpp
View File

@ -144,7 +144,7 @@ void MainCore::setLoggingOptions()
.arg(QT_POINTER_SIZE*8) .arg(QT_POINTER_SIZE*8)
.arg(SDR_RX_SAMP_SZ) .arg(SDR_RX_SAMP_SZ)
.arg(SDR_RX_SAMP_SZ) .arg(SDR_RX_SAMP_SZ)
.arg(QCoreApplication::applicationPid()); .arg(QCoreApplication::applicationPid()));
#endif #endif
m_logger->logToFile(QtInfoMsg, appInfoStr); m_logger->logToFile(QtInfoMsg, appInfoStr);
} }

4
sdrbase/resources/webapi/doc/swagger/include/AFC.yaml
View File

@ -28,7 +28,7 @@ AFCSettings:
type: integer type: integer
format: int64 format: int64
freqTolerance: freqTolerance:
descritpion: Frequency shift tolerance before tracker frequency is (re)adjusted description: Frequency shift tolerance before tracker frequency is (re)adjusted
type: integer type: integer
trackerAdjustPeriod: trackerAdjustPeriod:
description: Tracker channel frequency adjustment period in seconds description: Tracker channel frequency adjustment period in seconds
@ -62,7 +62,7 @@ AFCReport:
description: Tracker index in device set description: Tracker index in device set
type: integer type: integer
trackerDeviceFrequency: trackerDeviceFrequency:
descritpion: Center frequency of tracker device description: Center frequency of tracker device
type: integer type: integer
format: int64 format: int64
trackerChannelOffset: trackerChannelOffset:

6
sdrbase/resources/webapi/doc/swagger/include/AudioCATSISO.yaml
View File

@ -80,7 +80,7 @@ AudioCATSISOSettings:
description: Tx volume in dB usually negative description: Tx volume in dB usually negative
catSpeedIndex: catSpeedIndex:
type: integer type: integer
descriptoion: > description: >
CAT serial link baud rate CAT serial link baud rate
* 0 - 1200 * 0 - 1200
* 1 - 2400 * 1 - 2400
@ -99,7 +99,7 @@ AudioCATSISOSettings:
catStopBitsIndex: catStopBitsIndex:
type: integer type: integer
description: > description: >
CAT serial linkj stop bits CAT serial link stop bits
* 0 - 1 (default) * 0 - 1 (default)
* 1 - 2 * 1 - 2
catHandshakeIndex: catHandshakeIndex:
@ -112,7 +112,7 @@ AudioCATSISOSettings:
catPTTMethodIndex: catPTTMethodIndex:
type: integer type: integer
description: > description: >
CAT PTT metgod CAT PTT method
* 0 - PTT (default) * 0 - PTT (default)
* 1 - DTR * 1 - DTR
* 2 - RTS * 2 - RTS

4
sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml
View File

@ -38,7 +38,7 @@ ChirpChatDemodSettings:
spreadFactor: spreadFactor:
type: integer type: integer
deBits: deBits:
description: Low data rate optmize (DE) bits i.e. nb of FFT bins per effective symbol description: Low data rate optimize (DE) bits i.e. nb of FFT bins per effective symbol
type: integer type: integer
fftWindow: fftWindow:
type: integer type: integer
@ -203,5 +203,5 @@ ChirpChatDemodReport:
type: integer type: integer
description: > description: >
Boolean - decoding status Boolean - decoding status
* 0 - no deconding * 0 - no decoding
* 1 - decoding * 1 - decoding

2
sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml
View File

@ -38,7 +38,7 @@ ChirpChatModSettings:
spreadFactor: spreadFactor:
type: integer type: integer
deBits: deBits:
description: Low data rate optmize (DE) bits i.e. nb of FFT bins per effective symbol description: Low data rate optimize (DE) bits i.e. nb of FFT bins per effective symbol
type: integer type: integer
preambleChirps: preambleChirps:
description: Number of preamble chirps description: Number of preamble chirps

2
sdrbase/resources/webapi/doc/swagger/include/Command.yaml
View File

@ -13,7 +13,7 @@ Command:
description: Qt::Key description: Qt::Key
type: integer type: integer
keyModifiers: keyModifiers:
sdescription: Qt::KeyboardModifiers description: Qt::KeyboardModifiers
type: integer type: integer
associateKey: associateKey:
description: boolean description: boolean

6
sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml
View File

@ -12,7 +12,7 @@ DATVDemodSettings:
standard: standard:
type: integer type: integer
description: > description: >
DVB bersion (see DATVDemodSettings::dvb_version) DVB version (see DATVDemodSettings::dvb_version)
* 0 - DVB-S * 0 - DVB-S
* 1 - DVB-S2 * 1 - DVB-S2
modulation: modulation:
@ -46,7 +46,7 @@ DATVDemodSettings:
* 11 - 2/5 * 11 - 2/5
* 12 - 3/5 * 12 - 3/5
softLDPC: softLDPC:
description: (boolean) engage sodt LDPC with LDPC tool sub processes (Linux only) description: (boolean) engage soft LDPC with LDPC tool sub processes (Linux only)
type: integer type: integer
softLDPCToolPath: softLDPCToolPath:
description: O/S path to the LDPC tool binary description: O/S path to the LDPC tool binary
@ -74,7 +74,7 @@ DATVDemodSettings:
type: integer type: integer
filter: filter:
description: > description: >
Type of sumbol filtering (see DATVDemodSettings::dvb_sampler) Type of symbol filtering (see DATVDemodSettings::dvb_sampler)
* 0 - Nearest * 0 - Nearest
* 1 - Linear * 1 - Linear
* 2 - Root Raised Cosine * 2 - Root Raised Cosine

2
sdrbase/resources/webapi/doc/swagger/include/DOA2.yaml
View File

@ -23,7 +23,7 @@ DOA2Settings:
description: Antennas baseline distance in millimeters from 1 to 99999 description: Antennas baseline distance in millimeters from 1 to 99999
squelchdB: squelchdB:
type: integer type: integer
description: Porcessing squared magnitude threshold (squelch) in dB from -140 t0 0 description: Processing squared magnitude threshold (squelch) in dB from -140 t0 0
fftAveragingValue: fftAveragingValue:
type: integer type: integer
description: Number of FFTs to average over. Use 1, 2, 5 or 10 times 10^0 to 10^5 (1 to 1M) description: Number of FFTs to average over. Use 1, 2, 5 or 10 times 10^0 to 10^5 (1 to 1M)

2
sdrbase/resources/webapi/doc/swagger/include/FT8Demod.yaml
View File

@ -51,7 +51,7 @@ FT8DemodSettings:
decoderTimeBudget: decoderTimeBudget:
type: number type: number
format: float format: float
desctiption: Decoder time budget in seconds (will stop after running this time) description: Decoder time budget in seconds (will stop after running this time)
useOSD: useOSD:
type: integer type: integer
description: > description: >

4
sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml
View File

@ -27,11 +27,11 @@ FileSinkSettings:
description: Number of seconds to record before recording is triggered (manual or squelch) description: Number of seconds to record before recording is triggered (manual or squelch)
squelchPostRecordTime: squelchPostRecordTime:
type: integer type: integer
description: Number of seconds to record after spectrum squelch cloeses description: Number of seconds to record after spectrum squelch closes
squelchRecordingEnable: squelchRecordingEnable:
type: integer type: integer
description: > description: >
Automatic recording triggered by spectrum squalch Automatic recording triggered by spectrum squelch
* 0 - disabled * 0 - disabled
* 1 - enabled * 1 - enabled
streamIndex: streamIndex:

6
sdrbase/resources/webapi/doc/swagger/include/GLSpectrum.yaml
View File

@ -17,7 +17,7 @@ SpectrumHistogramMarker:
* 2 - Max power * 2 - Max power
markerColor: markerColor:
type: integer type: integer
description: Color in 8 bit BGR serie description: Color in 8 bit BGR series
show: show:
type: integer type: integer
description: > description: >
@ -37,7 +37,7 @@ SpectrumWaterfallMarker:
description: Time shift in seconds description: Time shift in seconds
markerColor: markerColor:
type: integer type: integer
description: Color in 8 bit BGR serie description: Color in 8 bit BGR series
show: show:
type: integer type: integer
description: > description: >
@ -55,7 +55,7 @@ SpectrumAnnotationMarker:
type: integer type: integer
markerColor: markerColor:
type: integer type: integer
description: Color in 8 bit BGR serie description: Color in 8 bit BGR series
show: show:
type: integer type: integer
description: > description: >

4
sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml
View File

@ -107,7 +107,7 @@ GS232ControllerReport:
items: items:
type: string type: string
targetAzimuth: targetAzimuth:
desription: "Target azimuth in degrees (0-450)" description: "Target azimuth in degrees (0-450)"
type: number type: number
format: float format: float
targetElevation: targetElevation:
@ -115,7 +115,7 @@ GS232ControllerReport:
type: number type: number
format: float format: float
currentAzimuth: currentAzimuth:
desription: "Current azimuth in degrees (0-450)" description: "Current azimuth in degrees (0-450)"
type: number type: number
format: float format: float
currentElevation: currentElevation:

2
sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml
View File

@ -106,7 +106,7 @@ IEEE_802_15_4_ModSettings:
beta: beta:
type: number type: number
format: float format: float
description: Pulse shapint filter beta factor description: Pulse shaping filter beta factor
symbolSpan: symbolSpan:
type: integer type: integer
udpEnabled: udpEnabled:

4
sdrbase/resources/webapi/doc/swagger/include/LimeRFE.yaml
View File

@ -53,7 +53,7 @@ LimeRFESettings:
description: Rx attenuation factor. Attenuation is 2 times this factor in dB (0..7 => 0..14dB) description: Rx attenuation factor. Attenuation is 2 times this factor in dB (0..7 => 0..14dB)
type: integer type: integer
amfmNotch: amfmNotch:
desciption: Rx AM/FM notch filter (boolean) description: Rx AM/FM notch filter (boolean)
type: integer type: integer
txChannels: txChannels:
type: integer type: integer
@ -150,7 +150,7 @@ LimeRFEActions:
* 1 - Tx * 1 - Tx
deviceSetIndex: deviceSetIndex:
type: integer type: integer
dexcription: Index of device set to synchronize switch with description: Index of device set to synchronize switch with
switchChannel: switchChannel:
type: integer type: integer
description: > description: >

8
sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml
View File

@ -329,7 +329,7 @@ LimeSdrInputReport:
description: LimeSDR description: LimeSDR
properties: properties:
success: success:
description: 1 if info was successfullt retrieved else 0 description: 1 if info was successfully retrieved else 0
type: integer type: integer
streamActive: streamActive:
description: 1 if active else 0 description: 1 if active else 0
@ -365,7 +365,7 @@ LimeSdrOutputReport:
description: LimeSDR description: LimeSDR
properties: properties:
success: success:
description: 1 if info was successfullt retrieved else 0 description: 1 if info was successfully retrieved else 0
type: integer type: integer
streamActive: streamActive:
description: 1 if active else 0 description: 1 if active else 0
@ -414,7 +414,7 @@ LimeSdrMIMOReport:
type: integer type: integer
format: int8 format: int8
successRx: successRx:
description: 1 if Rx info was successfullt retrieved else 0 description: 1 if Rx info was successfully retrieved else 0
type: integer type: integer
streamActiveRx: streamActiveRx:
description: 1 if active else 0 description: 1 if active else 0
@ -433,7 +433,7 @@ LimeSdrMIMOReport:
type: number type: number
format: float format: float
successTx: successTx:
description: 1 if Tx info was successfullt retrieved else 0 description: 1 if Tx info was successfully retrieved else 0
type: integer type: integer
streamActiveTx: streamActiveTx:
description: 1 if active else 0 description: 1 if active else 0

16
sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml
View File

@ -11,35 +11,35 @@ MetisMISOSettings:
* 0 - disabled sends null payload to Metis device * 0 - disabled sends null payload to Metis device
* 1 - enabled sends Tx payload to Metis device * 1 - enabled sends Tx payload to Metis device
rx1CenterFrequency: rx1CenterFrequency:
description: center fequencies of receiver 1 description: center frequencies of receiver 1
type: integer type: integer
format: int64 format: int64
rx2CenterFrequency: rx2CenterFrequency:
description: center fequencies of receiver 2 description: center frequencies of receiver 2
type: integer type: integer
format: int64 format: int64
rx3CenterFrequency: rx3CenterFrequency:
description: center fequencies of receiver 3 description: center frequencies of receiver 3
type: integer type: integer
format: int64 format: int64
rx4CenterFrequency: rx4CenterFrequency:
description: center fequencies of receiver 4 description: center frequencies of receiver 4
type: integer type: integer
format: int64 format: int64
rx5CenterFrequency: rx5CenterFrequency:
description: center fequencies of receiver 5 description: center frequencies of receiver 5
type: integer type: integer
format: int64 format: int64
rx6CenterFrequency: rx6CenterFrequency:
description: center fequencies of receiver 6 description: center frequencies of receiver 6
type: integer type: integer
format: int64 format: int64
rx7CenterFrequency: rx7CenterFrequency:
description: center fequencies of receiver 7 description: center frequencies of receiver 7
type: integer type: integer
format: int64 format: int64
rx8CenterFrequency: rx8CenterFrequency:
description: center fequencies of receiver 8 description: center frequencies of receiver 8
type: integer type: integer
format: int64 format: int64
txCenterFrequency: txCenterFrequency:

4
sdrbase/resources/webapi/doc/swagger/include/MorseDecoder.yaml
View File

@ -23,10 +23,10 @@ MorseDecoderSettings:
* 0 - do not send * 0 - do not send
udpAddress: udpAddress:
type: string type: string
description: Address to semd text via UDP description: Address to send text via UDP
udpPort: udpPort:
type: integer type: integer
description: Port to semd text via UDP description: Port to send text via UDP
logFiledName: logFiledName:
type: string type: string
description: File to log the decoded text to description: File to log the decoded text to

2
sdrbase/resources/webapi/doc/swagger/include/Preferences.yaml
View File

@ -1,5 +1,5 @@
Preferences: Preferences:
description: Repreents a Prefernce object description: Represents a Preference object
properties: properties:
sourceDevice: sourceDevice:
description: Identification of the source used in R0 tab (GUI flavor) at startup description: Identification of the source used in R0 tab (GUI flavor) at startup

2
sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml
View File

@ -14,7 +14,7 @@ RemoteInputSettings:
multicastJoin: multicastJoin:
type: integer type: integer
description: > description: >
Joim multicast group Join multicast group
* 0 - leave group * 0 - leave group
* 1 - join group * 1 - join group
dcBlock: dcBlock:

2
sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml
View File

@ -6,7 +6,7 @@ RemoteOutputSettings:
nbTxBytes: nbTxBytes:
type: integer type: integer
description: > description: >
Number of bytes in a transmited I or Q sample Number of bytes in a transmitted I or Q sample
* 1 * 1
* 2 * 2
* 4 * 4

2
sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml
View File

@ -7,7 +7,7 @@ RemoteSinkSettings:
nbTxBytes: nbTxBytes:
type: integer type: integer
description: > description: >
Number of bytes in a transmited I or Q sample Number of bytes in a transmitted I or Q sample
* 1 * 1
* 2 * 2
* 4 * 4

4
sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml
View File

@ -73,11 +73,11 @@ SSBDemodSettings:
dnrAboveAvgFactor: dnrAboveAvgFactor:
type: number type: number
format: float format: float
description: Multiplier of the average to deteermine magnitude threshold in average scheme description: Multiplier of the average to determine magnitude threshold in average scheme
dnrSigmaFactor: dnrSigmaFactor:
type: number type: number
format: float format: float
description: Standard deviation (sigma) multiplier to deteermine magnitude threshold in average and standard deviation scheme description: Standard deviation (sigma) multiplier to determine magnitude threshold in average and standard deviation scheme
dnrNbPeaks: dnrNbPeaks:
type: integer type: integer
description: Number of magnitude peak maxima selected in peaks scheme description: Number of magnitude peak maxima selected in peaks scheme

2
sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml
View File

@ -48,7 +48,7 @@ SatelliteTrackerSettings:
description: "Number of points used to draw ground tracks" description: "Number of points used to draw ground tracks"
type: integer type: integer
dateFormat: dateFormat:
desciption: "Format for dates in the GUI (E.g: yy/MM/dd)" description: "Format for dates in the GUI (E.g: yy/MM/dd)"
type: string type: string
utc: utc:
description: "Times are UTC (1) or local (0)" description: "Times are UTC (1) or local (0)"

6
sdrbase/resources/webapi/doc/swagger/include/SigMFFileInput.yaml
View File

@ -115,15 +115,15 @@ SigMFFileInputActions:
description: Move to beginning of track given its number. Must stop first. description: Move to beginning of track given its number. Must stop first.
seekTrackMillis: seekTrackMillis:
type: integer type: integer
description: Move to this number / 1000 raio in track. Must stop first. description: Move to this number / 1000 ratio in track. Must stop first.
seekRecordMillis: seekRecordMillis:
type: integer type: integer
description: Move to this number / 1000 raio in full record. Must stop first. description: Move to this number / 1000 ratio in full record. Must stop first.
definitions: definitions:
Capture: Capture:
descripion: Capture (track) information description: Capture (track) information
properties: properties:
tsms: tsms:
description: Timestamp in milliseconds since epoch of capture start description: Timestamp in milliseconds since epoch of capture start

4
sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml
View File

@ -27,11 +27,11 @@ SigMFFileSinkSettings:
description: Number of seconds to record before recording is triggered (manual or squelch) description: Number of seconds to record before recording is triggered (manual or squelch)
squelchPostRecordTime: squelchPostRecordTime:
type: integer type: integer
description: Number of seconds to record after spectrum squelch cloeses description: Number of seconds to record after spectrum squelch closes
squelchRecordingEnable: squelchRecordingEnable:
type: integer type: integer
description: > description: >
Automatic recording triggered by spectrum squalch Automatic recording triggered by spectrum squelch
* 0 - disabled * 0 - disabled
* 1 - enabled * 1 - enabled
log2RecordSampleSize: log2RecordSampleSize:

4
sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml
View File

@ -212,7 +212,7 @@ definitions:
$ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat"
ArgValue: ArgValue:
descripion: Generic argument value description: Generic argument value
properties: properties:
key: key:
type: string type: string
@ -223,7 +223,7 @@ definitions:
type: string type: string
ArgInfo: ArgInfo:
descripion: Generic argument information description: Generic argument information
properties: properties:
key: key:
type: string type: string

2
sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml
View File

@ -159,7 +159,7 @@ StarTrackerTarget:
type: number type: number
format: float format: float
airTemperature: airTemperature:
description: "Surface air temperature in degrees celsius at antenna location" description: "Surface air temperature in degrees Celsius at antenna location"
type: number type: number
format: float format: float
skyTemperature: skyTemperature:

4
sdrbase/resources/webapi/doc/swagger/include/Structs.yaml
View File

@ -17,7 +17,7 @@ Frequency:
type: integer type: integer
FrequencyBand: FrequencyBand:
description: A band of frequencies given its boudaries in Hertz (Hz) description: A band of frequencies given its boundaries in Hertz (Hz)
properties: properties:
name: name:
type: string type: string
@ -59,7 +59,7 @@ RangeFloat:
format: float format: float
FrequencyRange: FrequencyRange:
description: An frequency range with 64 bit support for min and max description: A frequency range with 64 bit support for min and max
properties: properties:
min: min:
type: integer type: integer

2
sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml
View File

@ -52,7 +52,7 @@ UDPSourceSettings:
multicastJoin: multicastJoin:
type: integer type: integer
description: > description: >
Joim multicast group Join multicast group
* 0 - leave group * 0 - leave group
* 1 - join group * 1 - join group
title: title:

10
sdrbase/resources/webapi/doc/swagger/swagger.yaml
View File

@ -1075,7 +1075,7 @@ paths:
- Workspace - Workspace
responses: responses:
"202": "202":
descriptions: Successful sending of the message description: Successful sending of the message
schema: schema:
$ref: "#/definitions/SuccessResponse" $ref: "#/definitions/SuccessResponse"
"500": "500":
@ -1089,7 +1089,7 @@ paths:
- Workspace - Workspace
responses: responses:
"202": "202":
descriptions: Successful sending of the message description: Successful sending of the message
schema: schema:
$ref: "#/definitions/SuccessResponse" $ref: "#/definitions/SuccessResponse"
"500": "500":
@ -3325,7 +3325,7 @@ definitions:
description: "Name of the preset group" description: "Name of the preset group"
type: string type: string
centerFrequency: centerFrequency:
description: "Center freqeuency in Hz" description: "Center frequency in Hz"
type: integer type: integer
format: int64 format: int64
type: type:
@ -3343,7 +3343,7 @@ definitions:
- name - name
properties: properties:
centerFrequency: centerFrequency:
description: "Center freqeuency in Hz" description: "Center frequency in Hz"
type: integer type: integer
format: int64 format: int64
type: type:
@ -3458,7 +3458,7 @@ definitions:
type: string type: string
ConfigurationImportExport: ConfigurationImportExport:
description: "Details to impprt/export a configuration from/to file" description: "Details to import/export a configuration from/to file"
properties: properties:
filePath: filePath:
description: "Path of the import file" description: "Path of the import file"

2
sdrgui/CMakeLists.txt
View File

@ -79,7 +79,6 @@ set(sdrgui_SOURCES
gui/presetitem.cpp gui/presetitem.cpp
gui/profiledialog.cpp gui/profiledialog.cpp
gui/rollupcontents.cpp gui/rollupcontents.cpp
gui/rollupwidget.cpp
gui/samplingdevicedialog.cpp gui/samplingdevicedialog.cpp
gui/scaleengine.cpp gui/scaleengine.cpp
gui/scaledimage.cpp gui/scaledimage.cpp
@ -210,7 +209,6 @@ set(sdrgui_HEADERS
gui/profiledialog.h gui/profiledialog.h
gui/qtcompatibility.h gui/qtcompatibility.h
gui/rollupcontents.h gui/rollupcontents.h
gui/rollupwidget.h
gui/samplingdevicedialog.h gui/samplingdevicedialog.h
gui/scaleengine.h gui/scaleengine.h
gui/scaledimage.h gui/scaledimage.h

2
sdrgui/device/deviceuiset.cpp
View File

@ -347,7 +347,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
qDebug("DeviceUISet::loadRxChannelSettings: creating new channel [%s] from config [%s]", qDebug("DeviceUISet::loadRxChannelSettings: creating new channel [%s] from config [%s]",
qPrintable((*channelRegistrations)[i].m_channelIdURI), qPrintable((*channelRegistrations)[i].m_channelIdURI),
qPrintable(channelConfig.m_channelIdURI)); qPrintable(channelConfig.m_channelIdURI));
BasebandSampleSink *rxChannel; BasebandSampleSink *rxChannel = nullptr;
PluginInterface *pluginInterface = (*channelRegistrations)[i].m_plugin; PluginInterface *pluginInterface = (*channelRegistrations)[i].m_plugin;
pluginInterface->createRxChannel(m_deviceAPI, &rxChannel, &channelAPI); pluginInterface->createRxChannel(m_deviceAPI, &rxChannel, &channelAPI);
rxChannelGUI = pluginInterface->createRxChannelGUI(this, rxChannel); rxChannelGUI = pluginInterface->createRxChannelGUI(this, rxChannel);

33
sdrgui/gui/aboutdialog.ui
View File

@ -187,39 +187,6 @@
</widget> </widget>
<resources> <resources>
<include location="../resources/res.qrc"/> <include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

33
sdrgui/gui/audiodialog.ui
View File

@ -766,39 +766,6 @@
</tabstops> </tabstops>
<resources> <resources>
<include location="../resources/res.qrc"/> <include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

4
sdrgui/gui/audioselectdialog.ui
View File

@ -63,9 +63,7 @@
<tabstops> <tabstops>
<tabstop>buttonBox</tabstop> <tabstop>buttonBox</tabstop>
</tabstops> </tabstops>
<resources> <resources/>
<include location="../resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

4
sdrgui/gui/commandoutputdialog.ui
View File

@ -74,6 +74,7 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
</font> </font>
</property> </property>
@ -105,6 +106,7 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
</font> </font>
</property> </property>
@ -126,6 +128,7 @@
</property> </property>
<property name="font"> <property name="font">
<font> <font>
<family>Liberation Sans</family>
<pointsize>8</pointsize> <pointsize>8</pointsize>
</font> </font>
</property> </property>
@ -285,6 +288,7 @@
<property name="font"> <property name="font">
<font> <font>
<family>Monospace</family> <family>Monospace</family>
<pointsize>9</pointsize>
</font> </font>
</property> </property>
<property name="toolTip"> <property name="toolTip">

5
sdrgui/gui/cwkeyergui.ui
View File

@ -152,7 +152,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -219,7 +218,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -293,7 +291,6 @@
<font> <font>
<family>DejaVu Serif</family> <family>DejaVu Serif</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -573,7 +570,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>
@ -662,7 +658,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>12</pointsize> <pointsize>12</pointsize>
<weight>75</weight>
<bold>true</bold> <bold>true</bold>
</font> </font>
</property> </property>

4
sdrgui/gui/fftdialog.ui
View File

@ -64,9 +64,7 @@ Changes only apply to new devices / channels until SDRangel is restarted.</strin
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

4
sdrgui/gui/fftnrdialog.ui
View File

@ -280,9 +280,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

4
sdrgui/gui/graphicsdialog.ui
View File

@ -209,9 +209,7 @@ Requires windows to be reopened to take effect</string>
<tabstop>mapMultisampling</tabstop> <tabstop>mapMultisampling</tabstop>
<tabstop>mapSmoothing</tabstop> <tabstop>mapSmoothing</tabstop>
</tabstops> </tabstops>
<resources> <resources/>
<include location="../resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

4
sdrgui/gui/profiledialog.ui
View File

@ -83,9 +83,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources> <resources/>
<include location="../resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

627
sdrgui/gui/rollupwidget.cpp
View File

@ -1,627 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany //
// written by Christian Daniel //
// Copyright (C) 2017, 2019-2020, 2022 Edouard Griffiths, F4EXB <f4exb06@gmail.com> //
// Copyright (C) 2020 Texas.C <ytexas96@yahoo.com> //
// Copyright (C) 2021-2022 Jon Beniston, M7RCE <jon@beniston.com> //
// //
// 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 //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#include <QEvent>
#include <QPainter>
#include <QPainterPath>
#include <QMouseEvent>
#include <QDialog>
#include <QDesktopServices>
#include "gui/rollupwidget.h"
#include "settings/rollupstate.h"
RollupWidget::RollupWidget(QWidget* parent) :
QWidget(parent),
m_highlighted(false),
m_contextMenuType(ContextMenuNone),
m_streamIndicator("S"),
m_channelWidget(true),
m_newHeight(0)
{
setMinimumSize(250, 150);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
setBackgroundRole(QPalette::Window);
setAutoFillBackground(false);
setAttribute(Qt::WA_OpaquePaintEvent, true);
// Vorgaben aus der Palette
m_titleColor = palette().highlight().color();
m_titleTextColor = palette().highlightedText().color();
}
// QByteArray RollupWidget::saveState(int version) const
// {
// QByteArray state;
// QDataStream stream(&state, QIODevice::WriteOnly);
// int count = 0;
// for (int i = 0; i < children().count(); ++i)
// {
// QWidget* r = qobject_cast<QWidget*>(children()[i]);
// if (r) {
// count++;
// }
// }
// stream << VersionMarker;
// stream << version;
// stream << count;
// for (int i = 0; i < children().count(); ++i)
// {
// QWidget* r = qobject_cast<QWidget*>(children()[i]);
// if (r)
// {
// stream << r->objectName();
// if (r->isHidden()) {
// stream << (int) 0;
// } else {
// stream << (int) 1;
// }
// }
// }
// return state;
// }
void RollupWidget::saveState(RollupState &state) const
{
QList<RollupState::RollupChildState>& childrenStates = state.getChildren();
childrenStates.clear();
for (const auto &child : children())
{
QWidget* r = qobject_cast<QWidget*>(child);
if (r && isRollupChild(r)) {
childrenStates.push_back({r->objectName(), r->isHidden()});
}
}
}
// bool RollupWidget::restoreState(const QByteArray& state, int version)
// {
// if (state.isEmpty()) {
// return false;
// }
// QByteArray sd = state;
// QDataStream stream(&sd, QIODevice::ReadOnly);
// int marker, v;
// stream >> marker;
// stream >> v;
// if ((stream.status() != QDataStream::Ok) || (marker != VersionMarker) || (v != version)) {
// return false;
// }
// int count;
// stream >> count;
// if (stream.status() != QDataStream::Ok) {
// return false;
// }
// for (int i = 0; i < count; ++i)
// {
// QString name;
// int visible;
// stream >> name;
// stream >> visible;
// if (stream.status() != QDataStream::Ok) {
// return false;
// }
// for (int j = 0; j < children().count(); ++j)
// {
// QWidget* r = qobject_cast<QWidget*>(children()[j]);
// if (r)
// {
// if (r->objectName() == name)
// {
// if (visible) {
// r->show();
// } else {
// r->hide();
// }
// break;
// }
// }
// }
// }
// return true;
// }
void RollupWidget::restoreState(const RollupState& state)
{
const QList<RollupState::RollupChildState>& childrenStates = state.getChildren();
for (const auto &object : children())
{
QWidget* r = qobject_cast<QWidget*>(object);
if (r && isRollupChild(r))
{
for (const auto &childState : childrenStates)
{
if (childState.m_objectName.compare(r->objectName()) == 0)
{
if (childState.m_isHidden) {
r->hide();
} else {
r->show();
}
break;
}
}
}
}
}
void RollupWidget::setTitleColor(const QColor& c)
{
m_titleColor = c;
float l = 0.2126*c.redF() + 0.7152*c.greenF() + 0.0722*c.blueF();
m_titleTextColor = l < 0.5f ? Qt::white : Qt::black;
update();
}
void RollupWidget::setHighlighted(bool highlighted)
{
if (m_highlighted != highlighted)
{
m_highlighted = highlighted;
update();
}
}
int RollupWidget::arrangeRollups()
{
QFontMetrics fm(font());
int pos;
// First calculate minimum height needed, to determine how much extra space
// we have that can be split between expanding widgets
pos = fm.height() + 4;
int expandingChildren = 0;
for (int i = 0; i < children().count(); ++i)
{
QWidget* r = qobject_cast<QWidget*>(children()[i]);
if ((r != nullptr) && isRollupChild(r))
{
pos += fm.height() + 2;
if (!r->isHidden())
{
if (r->sizePolicy().verticalPolicy() & QSizePolicy::ExpandFlag) {
expandingChildren++;
}
int h = 0;
if (r->hasHeightForWidth()) {
h = r->heightForWidth(width() - 4);
} else {
h = r->minimumSizeHint().height();
}
pos += h + 5;
}
}
}
setMinimumHeight(pos);
// Split extra space equally between widgets
// If there's a remainder, we give it to the first widget
// In the future, we should probably respect 'Vertical Stretch'
int extraSpace;
int firstExtra;
if ((expandingChildren > 0) && (m_newHeight > pos))
{
int totalExtra = m_newHeight - pos;
extraSpace = totalExtra / expandingChildren;
firstExtra = totalExtra - (extraSpace * expandingChildren);
}
else
{
extraSpace = 0;
firstExtra = 0;
}
// Now reposition and resize child widgets
pos = fm.height() + 4;
for (int i = 0; i < children().count(); ++i)
{
QWidget* r = qobject_cast<QWidget*>(children()[i]);
if ((r != nullptr) && isRollupChild(r))
{
pos += fm.height() + 2;
if (!r->isHidden())
{
r->move(2, pos + 3);
int h = 0;
if (r->hasHeightForWidth()) {
h = r->heightForWidth(width() - 4);
} else {
h = r->minimumSizeHint().height();
}
if (r->sizePolicy().verticalPolicy() & QSizePolicy::ExpandFlag)
{
h += extraSpace;
h += firstExtra;
firstExtra = 0;
}
r->resize(width() - 4, h);
pos += r->height() + 5;
}
}
}
if (expandingChildren == 0) {
setMaximumHeight(pos);
} else {
setMaximumHeight(16777215);
}
updateGeometry();
return pos;
}
void RollupWidget::paintEvent(QPaintEvent*)
{
QPainter p(this);
QColor frame = palette().highlight().color();
// Eigenbau
QFontMetrics fm(font());
p.setRenderHint(QPainter::Antialiasing, true);
// Ecken (corners)
p.setPen(Qt::NoPen);
p.setBrush(palette().base());
p.drawRect(0, 0, 5, 5);
p.drawRect(width() - 5, 0, 5, 5);
p.drawRect(0, height() - 5, 5, 5);
p.drawRect(width() - 5, height() - 5, 5, 5);
// Rahmen (frame)
p.setPen(m_highlighted ? Qt::white : frame);
p.setBrush(palette().window());
QRectF r(rect());
r.adjust(0.5, 0.5, -0.5, -0.5);
p.drawRoundedRect(r, 3.0, 3.0, Qt::AbsoluteSize);
// Titel-Hintergrund (Title background)
p.setPen(Qt::NoPen);
p.setBrush(m_titleColor);
QPainterPath path;
path.moveTo(1.5, fm.height() + 2.5);
path.lineTo(width() - 1.5, fm.height() + 2.5);
path.lineTo(width() - 1.5, 3.5);
path.arcTo(QRectF(width() - 3.5, 0, 2.5, 2.5), 270, -90);
path.lineTo(3.5, 1.5);
path.arcTo(QRectF(1.5, 2.5, 2.5, 2.5), 90, 90);
p.drawPath(path);
// Titel-Abschlusslinie (Title closing line)
p.setPen(frame);
p.drawLine(QPointF(0.5, 2 + fm.height() + 1.5), QPointF(width() - 1.5, 2 + fm.height() + 1.5));
// Aktiv-Button links
p.setPen(QPen(palette().windowText().color(), 1.0));
p.setBrush(palette().light());
p.drawRoundedRect(QRectF(3.5, 3.5, fm.ascent(), fm.ascent()), 2.0, 2.0, Qt::AbsoluteSize);
p.setPen(QPen(Qt::white, 1.0));
p.drawText(QRectF(3.5, 2.5, fm.ascent(), fm.ascent()), Qt::AlignCenter, "c");
if (m_channelWidget)
{
// Stromkanal-Button links (Current channel)
p.setPen(QPen(palette().windowText().color(), 1.0));
p.setBrush(palette().light());
p.drawRoundedRect(QRectF(5.5 + fm.ascent(), 2.5, fm.ascent() + 2.0, fm.ascent() + 2.0), 2.0, 2.0, Qt::AbsoluteSize);
p.setPen(QPen(Qt::white, 1.0));
p.drawText(QRectF(5.5 + fm.ascent(), 2.5, fm.ascent() + 2.0, fm.ascent() + 2.0), Qt::AlignCenter, m_streamIndicator);
}
// Help button
if (!m_helpURL.isEmpty())
{
p.setRenderHint(QPainter::Antialiasing, true);
p.setPen(QPen(palette().windowText().color(), 1.0));
p.setBrush(palette().light());
r = QRectF(width() - 2*(3.5 + fm.ascent()), 3.5, fm.ascent(), fm.ascent());
p.drawRoundedRect(r, 2.0, 2.0, Qt::AbsoluteSize);
p.drawText(QRectF(width() - 2*(3.5 + fm.ascent()), 5, fm.ascent(), fm.ascent() - 2), Qt::AlignCenter, "?");
}
//p.drawLine(r.topLeft() + QPointF(1, 1), r.bottomRight() + QPointF(-1, -1));
//p.drawLine(r.bottomLeft() + QPointF(1, -1), r.topRight() + QPointF(-1, 1));
// Schließen-Button rechts (Close button on the right)
p.setRenderHint(QPainter::Antialiasing, true);
p.setPen(QPen(palette().windowText().color(), 1.0));
p.setBrush(palette().light());
r = QRectF(width() - 3.5 - fm.ascent(), 3.5, fm.ascent(), fm.ascent());
p.drawRoundedRect(r, 2.0, 2.0, Qt::AbsoluteSize);
p.setPen(QPen(palette().windowText().color(), 1.5));
p.drawLine(r.topLeft() + QPointF(1, 1), r.bottomRight() + QPointF(-1, -1));
p.drawLine(r.bottomLeft() + QPointF(1, -1), r.topRight() + QPointF(-1, 1));
// Titel
//p.setPen(palette().highlightedText().color());
p.setPen(m_titleTextColor);
p.drawText(QRect(2 + 2*fm.height() + 2, 2, width() - 6 - 3*fm.height(), fm.height()),
fm.elidedText(windowTitle(), Qt::ElideMiddle, width() - 6 - 3*fm.height(), 0));
// Rollups
int pos = fm.height() + 4;
const QObjectList& c = children();
QObjectList::ConstIterator w = c.begin();
QObjectList::ConstIterator n = c.begin();
for (n = c.begin(); n != c.end(); ++n)
{
if (qobject_cast<QWidget*>(*n) != nullptr) {
break;
}
}
for (w = n; w != c.end(); w = n)
{
if (n != c.end()) {
++n;
}
for (; n != c.end(); ++n)
{
if (qobject_cast<QWidget*>(*n) != nullptr) {
break;
}
}
pos += paintRollup(qobject_cast<QWidget*>(*w), pos, &p, n == c.end(), frame);
}
}
int RollupWidget::paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frame)
{
QFontMetrics fm(font());
int height = 1;
// Titel-Abschlusslinie
if (!rollup->isHidden())
{
p->setPen(palette().dark().color());
p->drawLine(QPointF(1.5, pos + fm.height() + 1.5), QPointF(width() - 1.5, pos + fm.height() + 1.5));
p->setPen(palette().light().color());
p->drawLine(QPointF(1.5, pos + fm.height() + 2.5), QPointF(width() - 1.5, pos + fm.height() + 2.5));
height += 2;
}
else
{
if (!last)
{
p->setPen(frame);
p->drawLine(QPointF(1.5, pos + fm.height() + 1.5), QPointF(width() - 1.5, pos + fm.height() + 1.5));
height++;
}
}
// Titel
p->setPen(palette().windowText().color());
p->drawText(QRect(2 + fm.height(), pos, width() - 4 - fm.height(), fm.height()),
fm.elidedText(rollup->windowTitle(), Qt::ElideMiddle, width() - 4 - fm.height(), 0));
height += fm.height();
// Ausklapp-Icon
p->setPen(palette().windowText().color());
p->setBrush(palette().windowText());
if (!rollup->isHidden())
{
QPolygonF a;
a.append(QPointF(3.5, pos + 2));
a.append(QPointF(3.5 + fm.ascent(), pos + 2));
a.append(QPointF(3.5 + fm.ascent() / 2.0, pos + fm.height() - 2));
p->drawPolygon(a);
}
else
{
QPolygonF a;
a.append(QPointF(3.5, pos + 2));
a.append(QPointF(3.5, pos + fm.height() - 2));
a.append(QPointF(3.5 + fm.ascent(), pos + fm.height() / 2));
p->drawPolygon(a);
}
// Inhalt
if (!rollup->isHidden() && (!last))
{
// Rollup-Abschlusslinie
p->setPen(frame);
p->drawLine(QPointF(1.5, pos + fm.height() + rollup->height() + 6.5),
QPointF(width() - 1.5, pos + fm.height() + rollup->height() + 6.5));
height += rollup->height() + 4;
}
return height;
}
void RollupWidget::resizeEvent(QResizeEvent* size)
{
m_newHeight = size->size().height();
arrangeRollups();
QWidget::resizeEvent(size);
}
void RollupWidget::mousePressEvent(QMouseEvent* event)
{
QFontMetrics fm(font());
// menu box left
if (QRectF(3.5, 3.5, fm.ascent(), fm.ascent()).contains(event->pos()))
{
m_contextMenuType = ContextMenuChannelSettings;
emit customContextMenuRequested(event->globalPos());
return;
}
if (m_channelWidget)
{
// Stream channel menu left
if (QRectF(5.5 + fm.ascent(), 2.5, fm.ascent() + 2.0, fm.ascent() + 2.0).contains(event->pos()))
{
m_contextMenuType = ContextMenuStreamSettings;
emit customContextMenuRequested(event->globalPos());
return;
}
}
// help button
if(!m_helpURL.isEmpty() && QRectF(width() - 2*(3.5 + fm.ascent()), 3.5, fm.ascent(), fm.ascent()).contains(event->pos()))
{
QString url;
if (m_helpURL.startsWith("http")) {
url = m_helpURL;
} else {
url = QString("https://github.com/f4exb/sdrangel/blob/master/%1").arg(m_helpURL); // Something like "plugins/channelrx/chanalyzer/readme.md"
}
QDesktopServices::openUrl(QUrl(url));
return;
}
// close button right
if(QRectF(width() - 3.5 - fm.ascent(), 3.5, fm.ascent(), fm.ascent()).contains(event->pos())) {
close();
return;
}
// check if we need to change a rollup widget
int pos = fm.height() + 4;
for (int i = 0; i < children().count(); ++i)
{
QWidget* r = qobject_cast<QWidget*>(children()[i]);
if (r)
{
if ((event->y() >= pos) && (event->y() < (pos + fm.height() + 3)))
{
if (r->isHidden())
{
r->show();
//emit widgetRolled(r, true);
}
else
{
r->hide();
//emit widgetRolled(r, false);
}
arrangeRollups();
repaint();
return;
}
else
{
pos += fm.height() + 2;
if (!r->isHidden()) {
pos += r->height() + 5;
}
}
}
}
}
bool RollupWidget::event(QEvent* event)
{
if (event->type() == QEvent::ChildAdded)
{
((QChildEvent*)event)->child()->installEventFilter(this);
arrangeRollups();
}
else if (event->type() == QEvent::ChildRemoved)
{
((QChildEvent*)event)->child()->removeEventFilter(this);
arrangeRollups();
}
else if (event->type() == QEvent::LayoutRequest)
{
arrangeRollups();
}
return QWidget::event(event);
}
bool RollupWidget::eventFilter(QObject* object, QEvent* event)
{
if (event->type() == QEvent::Show)
{
if (children().contains(object))
{
arrangeRollups();
emit widgetRolled(qobject_cast<QWidget*>(object), true);
}
}
else if (event->type() == QEvent::Hide)
{
if (children().contains(object))
{
arrangeRollups();
emit widgetRolled(qobject_cast<QWidget*>(object), false);
}
}
else if (event->type() == QEvent::WindowTitleChange)
{
if (children().contains(object)) {
repaint();
}
}
return QWidget::eventFilter(object, event);
}
void RollupWidget::setStreamIndicator(const QString& indicator)
{
m_streamIndicator = indicator;
update();
}
bool RollupWidget::isRollupChild(QWidget *childWidget)
{
return (qobject_cast<QDialog*>(childWidget) == nullptr); // exclude Dialogs from rollups
}

87
sdrgui/gui/rollupwidget.h
View File

@ -1,87 +0,0 @@
///////////////////////////////////////////////////////////////////////////////////
// Copyright (C) 2012 maintech GmbH, Otto-Hahn-Str. 15, 97204 Hoechberg, Germany //
// written by Christian Daniel //
// Copyright (C) 2015-2020, 2022 Edouard Griffiths, F4EXB <f4exb06@gmail.com> //
// Copyright (C) 2021 Jon Beniston, M7RCE <jon@beniston.com> //
// //
// API for features //
// //
// 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 //
// the Free Software Foundation as version 3 of the License, or //
// (at your option) any later version. //
// //
// This program is distributed in the hope that it will be useful, //
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
// GNU General Public License V3 for more details. //
// //
// You should have received a copy of the GNU General Public License //
// along with this program. If not, see <http://www.gnu.org/licenses/>. //
///////////////////////////////////////////////////////////////////////////////////
#ifndef INCLUDE_ROLLUPWIDGET_H
#define INCLUDE_ROLLUPWIDGET_H
#include <QWidget>
#include "export.h"
class RollupState;
class SDRGUI_API RollupWidget : public QWidget {
Q_OBJECT
public:
RollupWidget(QWidget* parent = nullptr);
void setTitleColor(const QColor& c);
void setHighlighted(bool highlighted);
void setChannelWidget(bool channelWidget) { m_channelWidget = channelWidget; }
signals:
void widgetRolled(QWidget* widget, bool rollDown);
protected:
enum {
VersionMarker = 0xff
};
enum ContextMenuType
{
ContextMenuNone,
ContextMenuChannelSettings,
ContextMenuStreamSettings
};
QColor m_titleColor;
QColor m_titleTextColor;
bool m_highlighted;
ContextMenuType m_contextMenuType;
QString m_streamIndicator;
QString m_helpURL;
int arrangeRollups();
// QByteArray saveState(int version = 0) const;
void saveState(RollupState& state) const;
// bool restoreState(const QByteArray& state, int version = 0);
void restoreState(const RollupState& state);
void paintEvent(QPaintEvent*);
int paintRollup(QWidget* rollup, int pos, QPainter* p, bool last, const QColor& frame);
void resizeEvent(QResizeEvent* size);
void mousePressEvent(QMouseEvent* event);
bool event(QEvent* event);
bool eventFilter(QObject* object, QEvent* event);
void resetContextMenuType() { m_contextMenuType = ContextMenuNone; }
void setStreamIndicator(const QString& indicator);
private:
static bool isRollupChild(QWidget *childWidget); //!< chidl is part of rollups (ex: not a dialog)
bool m_channelWidget;
int m_newHeight;
};
#endif // INCLUDE_ROLLUPWIDGET_H

4
sdrgui/gui/spectrummeasurementsdialog.ui
View File

@ -405,9 +405,7 @@
<tabstop>harmonics</tabstop> <tabstop>harmonics</tabstop>
<tabstop>resetMeasurements</tabstop> <tabstop>resetMeasurements</tabstop>
</tabstops> </tabstops>
<resources> <resources/>
<include location="../resources/res.qrc"/>
</resources>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>buttonBox</sender>

33
sdrgui/gui/welcomedialog.ui
View File

@ -72,39 +72,6 @@
</widget> </widget>
<resources> <resources>
<include location="../resources/res.qrc"/> <include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
<include location="../resources/res.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

1
sdrgui/mainwindow.ui
View File

@ -966,7 +966,6 @@
<font> <font>
<family>Liberation Sans</family> <family>Liberation Sans</family>
<pointsize>9</pointsize> <pointsize>9</pointsize>
<weight>50</weight>
<bold>false</bold> <bold>false</bold>
</font> </font>
</property> </property>

4
swagger/sdrangel/api/swagger/include/AFC.yaml
View File

@ -28,7 +28,7 @@ AFCSettings:
type: integer type: integer
format: int64 format: int64
freqTolerance: freqTolerance:
descritpion: Frequency shift tolerance before tracker frequency is (re)adjusted description: Frequency shift tolerance before tracker frequency is (re)adjusted
type: integer type: integer
trackerAdjustPeriod: trackerAdjustPeriod:
description: Tracker channel frequency adjustment period in seconds description: Tracker channel frequency adjustment period in seconds
@ -62,7 +62,7 @@ AFCReport:
description: Tracker index in device set description: Tracker index in device set
type: integer type: integer
trackerDeviceFrequency: trackerDeviceFrequency:
descritpion: Center frequency of tracker device description: Center frequency of tracker device
type: integer type: integer
format: int64 format: int64
trackerChannelOffset: trackerChannelOffset:

6
swagger/sdrangel/api/swagger/include/AudioCATSISO.yaml
View File

@ -80,7 +80,7 @@ AudioCATSISOSettings:
description: Tx volume in dB usually negative description: Tx volume in dB usually negative
catSpeedIndex: catSpeedIndex:
type: integer type: integer
descriptoion: > description: >
CAT serial link baud rate CAT serial link baud rate
* 0 - 1200 * 0 - 1200
* 1 - 2400 * 1 - 2400
@ -99,7 +99,7 @@ AudioCATSISOSettings:
catStopBitsIndex: catStopBitsIndex:
type: integer type: integer
description: > description: >
CAT serial linkj stop bits CAT serial link stop bits
* 0 - 1 (default) * 0 - 1 (default)
* 1 - 2 * 1 - 2
catHandshakeIndex: catHandshakeIndex:
@ -112,7 +112,7 @@ AudioCATSISOSettings:
catPTTMethodIndex: catPTTMethodIndex:
type: integer type: integer
description: > description: >
CAT PTT metgod CAT PTT method
* 0 - PTT (default) * 0 - PTT (default)
* 1 - DTR * 1 - DTR
* 2 - RTS * 2 - RTS

4
swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml
View File

@ -38,7 +38,7 @@ ChirpChatDemodSettings:
spreadFactor: spreadFactor:
type: integer type: integer
deBits: deBits:
description: Low data rate optmize (DE) bits i.e. nb of FFT bins per effective symbol description: Low data rate optimize (DE) bits i.e. nb of FFT bins per effective symbol
type: integer type: integer
fftWindow: fftWindow:
type: integer type: integer
@ -203,5 +203,5 @@ ChirpChatDemodReport:
type: integer type: integer
description: > description: >
Boolean - decoding status Boolean - decoding status
* 0 - no deconding * 0 - no decoding
* 1 - decoding * 1 - decoding

2
swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml
View File

@ -38,7 +38,7 @@ ChirpChatModSettings:
spreadFactor: spreadFactor:
type: integer type: integer
deBits: deBits:
description: Low data rate optmize (DE) bits i.e. nb of FFT bins per effective symbol description: Low data rate optimize (DE) bits i.e. nb of FFT bins per effective symbol
type: integer type: integer
preambleChirps: preambleChirps:
description: Number of preamble chirps description: Number of preamble chirps

2
swagger/sdrangel/api/swagger/include/Command.yaml
View File

@ -13,7 +13,7 @@ Command:
description: Qt::Key description: Qt::Key
type: integer type: integer
keyModifiers: keyModifiers:
sdescription: Qt::KeyboardModifiers description: Qt::KeyboardModifiers
type: integer type: integer
associateKey: associateKey:
description: boolean description: boolean

2
swagger/sdrangel/api/swagger/include/DATVDemod.yaml
View File

@ -74,7 +74,7 @@ DATVDemodSettings:
type: integer type: integer
filter: filter:
description: > description: >
Type of sumbol filtering (see DATVDemodSettings::dvb_sampler) Type of symbol filtering (see DATVDemodSettings::dvb_sampler)
* 0 - Nearest * 0 - Nearest
* 1 - Linear * 1 - Linear
* 2 - Root Raised Cosine * 2 - Root Raised Cosine

Some files were not shown because too many files have changed in this diff Show More