diff --git a/plugins/channelmimo/doa2/doa2streamsink.cpp b/plugins/channelmimo/doa2/doa2streamsink.cpp index 0c8134d588..5321e1cef3 100644 --- a/plugins/channelmimo/doa2/doa2streamsink.cpp +++ b/plugins/channelmimo/doa2/doa2streamsink.cpp @@ -17,7 +17,6 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include #include #include "doa2streamsink.h" diff --git a/plugins/channelmimo/interferometer/interferometerstreamsink.cpp b/plugins/channelmimo/interferometer/interferometerstreamsink.cpp index 4b8b9b72b3..285b2b96b6 100644 --- a/plugins/channelmimo/interferometer/interferometerstreamsink.cpp +++ b/plugins/channelmimo/interferometer/interferometerstreamsink.cpp @@ -17,7 +17,6 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// -#include #include #include "interferometerstreamsink.h" diff --git a/plugins/channelrx/demoddsd/dsdstatustextdialog.ui b/plugins/channelrx/demoddsd/dsdstatustextdialog.ui index df743fc080..2a55d03a1e 100644 --- a/plugins/channelrx/demoddsd/dsdstatustextdialog.ui +++ b/plugins/channelrx/demoddsd/dsdstatustextdialog.ui @@ -109,6 +109,7 @@ Liberation Mono + 9 diff --git a/plugins/channelrx/demodvormc/vordemodmcgui.ui b/plugins/channelrx/demodvormc/vordemodmcgui.ui index 264377ed63..252cf8a4fe 100644 --- a/plugins/channelrx/demodvormc/vordemodmcgui.ui +++ b/plugins/channelrx/demodvormc/vordemodmcgui.ui @@ -1,6 +1,6 @@ - VORDemodMCGUI + VORDemodGUI diff --git a/plugins/channelrx/demodwfm/wfmdemodgui.ui b/plugins/channelrx/demodwfm/wfmdemodgui.ui index 4747758b6f..52f7eae0c2 100644 --- a/plugins/channelrx/demodwfm/wfmdemodgui.ui +++ b/plugins/channelrx/demodwfm/wfmdemodgui.ui @@ -233,7 +233,6 @@ Liberation Mono 12 - 50 false diff --git a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp index 7117b2fad3..5cc48d28db 100644 --- a/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp +++ b/plugins/channeltx/mod802.15.4/ieee_802_15_4_mod.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/plugins/channeltx/modais/aismod.cpp b/plugins/channeltx/modais/aismod.cpp index d040a9855f..97ac682651 100644 --- a/plugins/channeltx/modais/aismod.cpp +++ b/plugins/channeltx/modais/aismod.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/plugins/channeltx/modchirpchat/chirpchatmod.cpp b/plugins/channeltx/modchirpchat/chirpchatmod.cpp index 1eaa2930ce..8470684e2a 100644 --- a/plugins/channeltx/modchirpchat/chirpchatmod.cpp +++ b/plugins/channeltx/modchirpchat/chirpchatmod.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/plugins/channeltx/moddatv/datvmod.cpp b/plugins/channeltx/moddatv/datvmod.cpp index d4bac5c617..3f171137e5 100644 --- a/plugins/channeltx/moddatv/datvmod.cpp +++ b/plugins/channeltx/moddatv/datvmod.cpp @@ -24,7 +24,6 @@ #include #include -#include #include #include #include diff --git a/plugins/channeltx/modpacket/packetmod.cpp b/plugins/channeltx/modpacket/packetmod.cpp index 48d7105e14..4e25fbf6f3 100644 --- a/plugins/channeltx/modpacket/packetmod.cpp +++ b/plugins/channeltx/modpacket/packetmod.cpp @@ -20,7 +20,6 @@ #include #include -#include #include #include #include diff --git a/plugins/channeltx/modpsk31/psk31mod.cpp b/plugins/channeltx/modpsk31/psk31mod.cpp index 70efa98e0b..29538ced39 100644 --- a/plugins/channeltx/modpsk31/psk31mod.cpp +++ b/plugins/channeltx/modpsk31/psk31mod.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/plugins/channeltx/modrtty/rttymod.cpp b/plugins/channeltx/modrtty/rttymod.cpp index 3f761f870e..140d62728c 100644 --- a/plugins/channeltx/modrtty/rttymod.cpp +++ b/plugins/channeltx/modrtty/rttymod.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/plugins/feature/antennatools/antennatoolsgui.ui b/plugins/feature/antennatools/antennatoolsgui.ui index e6e378cd4c..4246784420 100644 --- a/plugins/feature/antennatools/antennatoolsgui.ui +++ b/plugins/feature/antennatools/antennatoolsgui.ui @@ -540,7 +540,6 @@ dishEffectiveArea - diff --git a/plugins/feature/map/mapfmlistdialog.ui b/plugins/feature/map/mapfmlistdialog.ui deleted file mode 100644 index 4b5e55f0e0..0000000000 --- a/plugins/feature/map/mapfmlistdialog.ui +++ /dev/null @@ -1,437 +0,0 @@ - - - MapBeaconDialog - - - - 0 - 0 - 1027 - 349 - - - - - Liberation Sans - 9 - - - - Beacons - - - - - - - 0 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Download FM/DAB list - - - - - - - :/recycle.png:/recycle.png - - - - - - - - - 2 - - - - FM - - - - - 0 - 20 - 989 - 192 - - - - - - - - Station - - - - - Frequency - - - - - Location - - - - - Power - - - - - Azimuth - - - - - Elevation - - - - - Distance (km) - - - - - - - DAB - - - - - 10 - 20 - 989 - 192 - - - - - - - - Station - - - - - Frequency - - - - - Location - - - - - Power - - - - - Azimuth - - - - - Elevation - - - - - Distance (km) - - - - - - - Settings - - - - - - Countries - - - - - - ETH - - - - - - - CRO - - - - - - - LCA - - - - - - - NIU - - - - - - - AZE - - - - - - - TKM - - - - - - - GTB - - - - - - - BRB - - - - - - - MLD - - - - - - - IRQ - - - - - - - PTC - - - - - - - ABW - - - - - - - SNG - - - - - - - VIR - - - - - - - AFG - - - - - - - AZR - - - - - - - BRU - - - - - - - CTI - - - - - - - F - - - - - - - GTM - - - - - - - ISL - - - - - - - LHW - - - - - - - MLI - - - - - - - NMB - - - - - - - PTR - - - - - - - SOM - - - - - - - TMP - - - - - - - VRG - - - - - - - - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Close - - - - - - - - - - - buttonBox - accepted() - MapBeaconDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - MapBeaconDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/plugins/feature/map/mapradiotimedialog.ui b/plugins/feature/map/mapradiotimedialog.ui index 6dbb874ef1..eb6ed258c0 100644 --- a/plugins/feature/map/mapradiotimedialog.ui +++ b/plugins/feature/map/mapradiotimedialog.ui @@ -100,9 +100,7 @@ - - - + buttonBox diff --git a/plugins/feature/morsedecoder/readme.md b/plugins/feature/morsedecoder/readme.md index ac9aedcd3a..15b876a28d 100644 --- a/plugins/feature/morsedecoder/readme.md +++ b/plugins/feature/morsedecoder/readme.md @@ -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. -

11a: Show decoder theshold

+

11a: Show decoder threshold

Enable or disable the GGMorse decoder threshold display on the imaginary trace of the scope. diff --git a/plugins/feature/simpleptt/simplepttcommandoutputdialog.ui b/plugins/feature/simpleptt/simplepttcommandoutputdialog.ui index 685117fe44..a80cc37f1e 100644 --- a/plugins/feature/simpleptt/simplepttcommandoutputdialog.ui +++ b/plugins/feature/simpleptt/simplepttcommandoutputdialog.ui @@ -200,9 +200,7 @@ buttonBox - - - + buttonBox diff --git a/plugins/feature/simpleptt/simplepttgui.ui b/plugins/feature/simpleptt/simplepttgui.ui index 2338dd6ac0..e9907e7f29 100644 --- a/plugins/feature/simpleptt/simplepttgui.ui +++ b/plugins/feature/simpleptt/simplepttgui.ui @@ -94,7 +94,6 @@ Liberation Sans 20 - 75 true diff --git a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp index f7c3984c17..24429e1a61 100644 --- a/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp +++ b/plugins/samplemimo/audiocatsiso/audiocatsiso.cpp @@ -207,8 +207,6 @@ bool AudioCATSISO::startTx() m_outputWorkerThread->start(); m_txRunning = true; - mutexLocker.unlock(); - qDebug("AudioCATSISO::startTx: started"); return true; diff --git a/plugins/samplemimo/audiocatsiso/audiocatsisogui.ui b/plugins/samplemimo/audiocatsiso/audiocatsisogui.ui index 7c2bf51d41..1822c8e3ae 100644 --- a/plugins/samplemimo/audiocatsiso/audiocatsisogui.ui +++ b/plugins/samplemimo/audiocatsiso/audiocatsisogui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -334,7 +333,6 @@ Liberation Mono 16 - 50 false false diff --git a/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp b/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp index 80415810af..015f46ca14 100644 --- a/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp +++ b/plugins/samplemimo/bladerf2mimo/bladerf2mimo.cpp @@ -171,7 +171,6 @@ bool BladeRF2MIMO::startRx() } m_sourceThread->startWork(); - mutexLocker.unlock(); m_runningRx = true; return true; @@ -207,7 +206,6 @@ bool BladeRF2MIMO::startTx() } m_sinkThread->startWork(); - mutexLocker.unlock(); m_runningTx = true; return true; diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp index 75a4e043e3..c78f86975f 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp +++ b/plugins/samplemimo/limesdrmimo/limesdrmimo.cpp @@ -300,7 +300,6 @@ bool LimeSDRMIMO::startRx() m_sourceThread->setLog2Decimation(m_settings.m_log2SoftDecim); m_sourceThread->setIQOrder(m_settings.m_iqOrder); m_sourceThread->startWork(); - mutexLocker.unlock(); m_runningRx = true; return true; @@ -374,7 +373,6 @@ bool LimeSDRMIMO::startTx() m_sinkThread->setFifo(&m_sampleMOFifo); m_sinkThread->setLog2Interpolation(m_settings.m_log2SoftInterp); m_sinkThread->startWork(); - mutexLocker.unlock(); m_runningTx = true; return true; diff --git a/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui b/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui index 5ef9641a6b..c3ef244205 100644 --- a/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui +++ b/plugins/samplemimo/limesdrmimo/limesdrmimogui.ui @@ -343,7 +343,6 @@ Liberation Mono 16 - 50 false @@ -414,7 +413,6 @@ Liberation Mono 12 - 50 false @@ -540,7 +538,6 @@ Liberation Mono 12 - 50 false @@ -731,7 +728,6 @@ Liberation Mono 12 - 50 false @@ -1359,39 +1355,6 @@ QToolTip{background-color: white; color: black;} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/samplemimo/metismiso/metismisogui.ui b/plugins/samplemimo/metismiso/metismisogui.ui index 647a2ce120..4030ad9d50 100644 --- a/plugins/samplemimo/metismiso/metismisogui.ui +++ b/plugins/samplemimo/metismiso/metismisogui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -338,7 +337,6 @@ Liberation Mono 16 - 50 false false diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp b/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp index b79009dce3..433b2dcb92 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimo.cpp @@ -199,7 +199,6 @@ bool PlutoSDRMIMO::startRx() m_plutoRxBuffer = m_plutoParams->getBox()->createRxBuffer(PlutoSDRMIMOSettings::m_plutoSDRBlockSizeSamples, false); m_sourceThread->startWork(); - mutexLocker.unlock(); m_runningRx = true; return true; @@ -237,7 +236,6 @@ bool PlutoSDRMIMO::startTx() m_plutoTxBuffer = m_plutoParams->getBox()->createTxBuffer(PlutoSDRMIMOSettings::m_plutoSDRBlockSizeSamples, false); m_sinkThread->startWork(); - mutexLocker.unlock(); m_runningTx = true; return true; diff --git a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.ui b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.ui index 049145efdf..18956000ea 100644 --- a/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.ui +++ b/plugins/samplemimo/plutosdrmimo/plutosdrmimogui.ui @@ -792,7 +792,6 @@ Liberation Mono 12 - 50 false @@ -849,7 +848,6 @@ Liberation Mono 12 - 50 false diff --git a/plugins/samplemimo/testmi/testmigui.ui b/plugins/samplemimo/testmi/testmigui.ui index 9ede84f55f..a94631394b 100644 --- a/plugins/samplemimo/testmi/testmigui.ui +++ b/plugins/samplemimo/testmi/testmigui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -230,7 +229,6 @@ Liberation Mono 16 - 50 false false @@ -497,7 +495,6 @@ Liberation Mono 12 - 50 false false @@ -656,7 +653,6 @@ Liberation Mono 12 - 50 false false diff --git a/plugins/samplemimo/testmosync/testmosync.cpp b/plugins/samplemimo/testmosync/testmosync.cpp index 6d835fa0fa..9ed5a94074 100644 --- a/plugins/samplemimo/testmosync/testmosync.cpp +++ b/plugins/samplemimo/testmosync/testmosync.cpp @@ -89,7 +89,6 @@ bool TestMOSync::startTx() m_sinkWorker->setFeedSpectrumIndex(m_feedSpectrumIndex); m_sinkWorker->connectTimer(m_masterTimer); startWorker(); - mutexLocker.unlock(); m_runningTx = true; return true; diff --git a/plugins/samplemimo/xtrxmimo/xtrxmimogui.ui b/plugins/samplemimo/xtrxmimo/xtrxmimogui.ui index ef1ac6b1a2..c5ce3240e2 100644 --- a/plugins/samplemimo/xtrxmimo/xtrxmimogui.ui +++ b/plugins/samplemimo/xtrxmimo/xtrxmimogui.ui @@ -343,7 +343,6 @@ Liberation Mono 16 - 50 false @@ -414,7 +413,6 @@ Liberation Mono 12 - 50 false @@ -540,7 +538,6 @@ Liberation Mono 12 - 50 false @@ -736,7 +733,6 @@ Liberation Mono 12 - 50 false diff --git a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.ui b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.ui index adcc683163..f0af84a8e0 100644 --- a/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.ui +++ b/plugins/samplesink/aaroniartsaoutput/aaroniartsaoutputgui.ui @@ -129,7 +129,6 @@ Liberation Mono 16 - 50 false false @@ -206,7 +205,6 @@ Liberation Mono 12 - 50 false false diff --git a/plugins/samplesink/audiooutput/audiooutput.cpp b/plugins/samplesink/audiooutput/audiooutput.cpp index 96ee3b83e8..ac25223f98 100644 --- a/plugins/samplesink/audiooutput/audiooutput.cpp +++ b/plugins/samplesink/audiooutput/audiooutput.cpp @@ -98,8 +98,6 @@ bool AudioOutput::start() m_workerThread->start(); m_running = true; - mutexLocker.unlock(); - qDebug("AudioOutput::start: started"); return true; diff --git a/plugins/samplesink/limesdroutput/limesdroutputgui.ui b/plugins/samplesink/limesdroutput/limesdroutputgui.ui index 973335a2f5..5b41e33152 100644 --- a/plugins/samplesink/limesdroutput/limesdroutputgui.ui +++ b/plugins/samplesink/limesdroutput/limesdroutputgui.ui @@ -977,39 +977,6 @@ QToolTip{background-color: white; color: black;} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui b/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui index 6a44b1563a..d75d1f5fcd 100644 --- a/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui +++ b/plugins/samplesink/plutosdroutput/plutosdroutputgui.ui @@ -135,7 +135,6 @@ Liberation Mono 16 - 50 false @@ -431,7 +430,6 @@ Liberation Mono 12 - 50 false @@ -488,7 +486,6 @@ Liberation Mono 12 - 50 false diff --git a/plugins/samplesink/usrpoutput/usrpoutputgui.ui b/plugins/samplesink/usrpoutput/usrpoutputgui.ui index 8197066bbf..b2601cfa66 100644 --- a/plugins/samplesink/usrpoutput/usrpoutputgui.ui +++ b/plugins/samplesink/usrpoutput/usrpoutputgui.ui @@ -746,39 +746,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/samplesink/xtrxoutput/xtrxoutputgui.ui b/plugins/samplesink/xtrxoutput/xtrxoutputgui.ui index 9723e14fec..5e1ab46954 100644 --- a/plugins/samplesink/xtrxoutput/xtrxoutputgui.ui +++ b/plugins/samplesink/xtrxoutput/xtrxoutputgui.ui @@ -135,7 +135,6 @@ Liberation Mono 16 - 50 false @@ -248,7 +247,6 @@ Liberation Mono 12 - 50 false @@ -354,7 +352,6 @@ Liberation Mono 12 - 50 false @@ -550,7 +547,6 @@ Liberation Mono 12 - 50 false diff --git a/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.ui b/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.ui index 15adc79683..723bd77aaf 100644 --- a/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.ui +++ b/plugins/samplesource/aaroniartsainput/aaroniartsainputgui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -135,7 +134,6 @@ Liberation Mono 16 - 50 false false @@ -210,7 +208,6 @@ Liberation Mono 12 - 50 false false diff --git a/plugins/samplesource/audioinput/audioinput.cpp b/plugins/samplesource/audioinput/audioinput.cpp index bc75199866..4c9b695b3f 100644 --- a/plugins/samplesource/audioinput/audioinput.cpp +++ b/plugins/samplesource/audioinput/audioinput.cpp @@ -119,7 +119,6 @@ bool AudioInput::start() m_worker->startWork(); m_workerThread->start(); m_running = true; - mutexLocker.unlock(); qDebug("AudioInput::start: started"); diff --git a/plugins/samplesource/fileinput/fileinputgui.ui b/plugins/samplesource/fileinput/fileinputgui.ui index 0764229a18..d626f0566c 100644 --- a/plugins/samplesource/fileinput/fileinputgui.ui +++ b/plugins/samplesource/fileinput/fileinputgui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -129,7 +128,6 @@ Liberation Sans 16 - 50 false false @@ -241,7 +239,6 @@ Liberation Sans 8 - 50 false false @@ -276,7 +273,6 @@ Liberation Sans 8 - 50 false false @@ -305,7 +301,6 @@ Liberation Sans 8 - 50 false false @@ -445,7 +440,6 @@ Liberation Sans 8 - 50 false false diff --git a/plugins/samplesource/kiwisdr/kiwisdrgui.ui b/plugins/samplesource/kiwisdr/kiwisdrgui.ui index 3c0cfda1d5..eea582d55a 100644 --- a/plugins/samplesource/kiwisdr/kiwisdrgui.ui +++ b/plugins/samplesource/kiwisdr/kiwisdrgui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -135,7 +134,6 @@ Liberation Mono 16 - 50 false false diff --git a/plugins/samplesource/limesdrinput/limesdrinputgui.ui b/plugins/samplesource/limesdrinput/limesdrinputgui.ui index 84be919457..c9a1dcbf03 100644 --- a/plugins/samplesource/limesdrinput/limesdrinputgui.ui +++ b/plugins/samplesource/limesdrinput/limesdrinputgui.ui @@ -1300,39 +1300,6 @@ QToolTip{background-color: white; color: black;} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/samplesource/localinput/localinputgui.ui b/plugins/samplesource/localinput/localinputgui.ui index 084a027f64..e409cc527b 100644 --- a/plugins/samplesource/localinput/localinputgui.ui +++ b/plugins/samplesource/localinput/localinputgui.ui @@ -132,7 +132,6 @@ Liberation Sans 16 - 50 false false diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui index 78c6f2fa52..4a47275efe 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui @@ -607,7 +607,6 @@ Liberation Mono 12 - 50 false @@ -664,7 +663,6 @@ Liberation Mono 12 - 50 false diff --git a/plugins/samplesource/remoteinput/remoteinputgui.ui b/plugins/samplesource/remoteinput/remoteinputgui.ui index 03df3121f1..0787ea3112 100644 --- a/plugins/samplesource/remoteinput/remoteinputgui.ui +++ b/plugins/samplesource/remoteinput/remoteinputgui.ui @@ -123,7 +123,6 @@ Liberation Sans 16 - 50 false false @@ -204,7 +203,6 @@ Liberation Mono 12 - 50 false diff --git a/plugins/samplesource/sigmffileinput/recordinfodialog.ui b/plugins/samplesource/sigmffileinput/recordinfodialog.ui index 11aa7da363..335e438c2c 100644 --- a/plugins/samplesource/sigmffileinput/recordinfodialog.ui +++ b/plugins/samplesource/sigmffileinput/recordinfodialog.ui @@ -62,6 +62,7 @@ Liberation Mono + 9 diff --git a/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui b/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui index 1c50bcce21..5c9eef0253 100644 --- a/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui +++ b/plugins/samplesource/sigmffileinput/sigmffileinputgui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -132,7 +131,6 @@ Liberation Sans 16 - 50 false false @@ -293,7 +291,6 @@ Liberation Sans 8 - 50 false false @@ -328,7 +325,6 @@ Liberation Sans 8 - 50 false false @@ -357,7 +353,6 @@ Liberation Sans 8 - 50 false false @@ -376,7 +371,6 @@ Liberation Sans 8 - 50 false false @@ -703,7 +697,6 @@ Liberation Sans 8 - 50 false false diff --git a/plugins/samplesource/testsource/testsourcegui.ui b/plugins/samplesource/testsource/testsourcegui.ui index 8d3418adfe..34984691cc 100644 --- a/plugins/samplesource/testsource/testsourcegui.ui +++ b/plugins/samplesource/testsource/testsourcegui.ui @@ -32,7 +32,6 @@ Liberation Sans 9 - 50 false false @@ -138,7 +137,6 @@ Liberation Mono 16 - 50 false false @@ -418,7 +416,6 @@ Liberation Mono 12 - 50 false false @@ -577,7 +574,6 @@ Liberation Mono 12 - 50 false false diff --git a/plugins/samplesource/usrpinput/usrpinputgui.ui b/plugins/samplesource/usrpinput/usrpinputgui.ui index 4a3ba201d2..4ed145cb6a 100644 --- a/plugins/samplesource/usrpinput/usrpinputgui.ui +++ b/plugins/samplesource/usrpinput/usrpinputgui.ui @@ -900,39 +900,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/plugins/samplesource/xtrxinput/xtrxinputgui.ui b/plugins/samplesource/xtrxinput/xtrxinputgui.ui index d04289c67d..f56e8f0bcc 100644 --- a/plugins/samplesource/xtrxinput/xtrxinputgui.ui +++ b/plugins/samplesource/xtrxinput/xtrxinputgui.ui @@ -135,7 +135,6 @@ Liberation Mono 16 - 50 false @@ -248,7 +247,6 @@ Liberation Mono 12 - 50 false @@ -374,7 +372,6 @@ Liberation Mono 12 - 50 false @@ -570,7 +567,6 @@ Liberation Mono 12 - 50 false diff --git a/sdrbase/maincore.cpp b/sdrbase/maincore.cpp index e6070aedb6..742d2266c6 100644 --- a/sdrbase/maincore.cpp +++ b/sdrbase/maincore.cpp @@ -144,7 +144,7 @@ void MainCore::setLoggingOptions() .arg(QT_POINTER_SIZE*8) .arg(SDR_RX_SAMP_SZ) .arg(SDR_RX_SAMP_SZ) - .arg(QCoreApplication::applicationPid()); + .arg(QCoreApplication::applicationPid())); #endif m_logger->logToFile(QtInfoMsg, appInfoStr); } diff --git a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml index 5fb12f7b23..8f7faaf478 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AFC.yaml @@ -28,7 +28,7 @@ AFCSettings: type: integer format: int64 freqTolerance: - descritpion: Frequency shift tolerance before tracker frequency is (re)adjusted + description: Frequency shift tolerance before tracker frequency is (re)adjusted type: integer trackerAdjustPeriod: description: Tracker channel frequency adjustment period in seconds @@ -62,7 +62,7 @@ AFCReport: description: Tracker index in device set type: integer trackerDeviceFrequency: - descritpion: Center frequency of tracker device + description: Center frequency of tracker device type: integer format: int64 trackerChannelOffset: diff --git a/sdrbase/resources/webapi/doc/swagger/include/AudioCATSISO.yaml b/sdrbase/resources/webapi/doc/swagger/include/AudioCATSISO.yaml index adc2ca7b88..e4bf3db9d6 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/AudioCATSISO.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/AudioCATSISO.yaml @@ -80,7 +80,7 @@ AudioCATSISOSettings: description: Tx volume in dB usually negative catSpeedIndex: type: integer - descriptoion: > + description: > CAT serial link baud rate * 0 - 1200 * 1 - 2400 @@ -99,7 +99,7 @@ AudioCATSISOSettings: catStopBitsIndex: type: integer description: > - CAT serial linkj stop bits + CAT serial link stop bits * 0 - 1 (default) * 1 - 2 catHandshakeIndex: @@ -112,7 +112,7 @@ AudioCATSISOSettings: catPTTMethodIndex: type: integer description: > - CAT PTT metgod + CAT PTT method * 0 - PTT (default) * 1 - DTR * 2 - RTS diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml index 777f486295..8e6d364875 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatDemod.yaml @@ -38,7 +38,7 @@ ChirpChatDemodSettings: spreadFactor: type: integer 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 fftWindow: type: integer @@ -203,5 +203,5 @@ ChirpChatDemodReport: type: integer description: > Boolean - decoding status - * 0 - no deconding + * 0 - no decoding * 1 - decoding diff --git a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml index ba582def4a..3e734f63e8 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/ChirpChatMod.yaml @@ -38,7 +38,7 @@ ChirpChatModSettings: spreadFactor: type: integer 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 preambleChirps: description: Number of preamble chirps diff --git a/sdrbase/resources/webapi/doc/swagger/include/Command.yaml b/sdrbase/resources/webapi/doc/swagger/include/Command.yaml index 2f64b4d876..9979542964 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Command.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Command.yaml @@ -13,7 +13,7 @@ Command: description: Qt::Key type: integer keyModifiers: - sdescription: Qt::KeyboardModifiers + description: Qt::KeyboardModifiers type: integer associateKey: description: boolean diff --git a/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml index 96afa76459..0198fb4037 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DATVDemod.yaml @@ -12,7 +12,7 @@ DATVDemodSettings: standard: type: integer description: > - DVB bersion (see DATVDemodSettings::dvb_version) + DVB version (see DATVDemodSettings::dvb_version) * 0 - DVB-S * 1 - DVB-S2 modulation: @@ -46,7 +46,7 @@ DATVDemodSettings: * 11 - 2/5 * 12 - 3/5 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 softLDPCToolPath: description: O/S path to the LDPC tool binary @@ -74,7 +74,7 @@ DATVDemodSettings: type: integer filter: description: > - Type of sumbol filtering (see DATVDemodSettings::dvb_sampler) + Type of symbol filtering (see DATVDemodSettings::dvb_sampler) * 0 - Nearest * 1 - Linear * 2 - Root Raised Cosine diff --git a/sdrbase/resources/webapi/doc/swagger/include/DOA2.yaml b/sdrbase/resources/webapi/doc/swagger/include/DOA2.yaml index 8f0891ceb0..6163db2ad7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/DOA2.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/DOA2.yaml @@ -23,7 +23,7 @@ DOA2Settings: description: Antennas baseline distance in millimeters from 1 to 99999 squelchdB: 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: type: integer description: Number of FFTs to average over. Use 1, 2, 5 or 10 times 10^0 to 10^5 (1 to 1M) diff --git a/sdrbase/resources/webapi/doc/swagger/include/FT8Demod.yaml b/sdrbase/resources/webapi/doc/swagger/include/FT8Demod.yaml index f482297a57..1d72235010 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FT8Demod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FT8Demod.yaml @@ -51,7 +51,7 @@ FT8DemodSettings: decoderTimeBudget: type: number 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: type: integer description: > diff --git a/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml index 72d0a545d9..c638810c11 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/FileSink.yaml @@ -27,11 +27,11 @@ FileSinkSettings: description: Number of seconds to record before recording is triggered (manual or squelch) squelchPostRecordTime: type: integer - description: Number of seconds to record after spectrum squelch cloeses + description: Number of seconds to record after spectrum squelch closes squelchRecordingEnable: type: integer description: > - Automatic recording triggered by spectrum squalch + Automatic recording triggered by spectrum squelch * 0 - disabled * 1 - enabled streamIndex: diff --git a/sdrbase/resources/webapi/doc/swagger/include/GLSpectrum.yaml b/sdrbase/resources/webapi/doc/swagger/include/GLSpectrum.yaml index 0a7b425cae..6744e2dd46 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/GLSpectrum.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/GLSpectrum.yaml @@ -17,7 +17,7 @@ SpectrumHistogramMarker: * 2 - Max power markerColor: type: integer - description: Color in 8 bit BGR serie + description: Color in 8 bit BGR series show: type: integer description: > @@ -37,7 +37,7 @@ SpectrumWaterfallMarker: description: Time shift in seconds markerColor: type: integer - description: Color in 8 bit BGR serie + description: Color in 8 bit BGR series show: type: integer description: > @@ -55,7 +55,7 @@ SpectrumAnnotationMarker: type: integer markerColor: type: integer - description: Color in 8 bit BGR serie + description: Color in 8 bit BGR series show: type: integer description: > diff --git a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml index ea484ec957..887f609aa3 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/GS232Controller.yaml @@ -107,7 +107,7 @@ GS232ControllerReport: items: type: string targetAzimuth: - desription: "Target azimuth in degrees (0-450)" + description: "Target azimuth in degrees (0-450)" type: number format: float targetElevation: @@ -115,7 +115,7 @@ GS232ControllerReport: type: number format: float currentAzimuth: - desription: "Current azimuth in degrees (0-450)" + description: "Current azimuth in degrees (0-450)" type: number format: float currentElevation: diff --git a/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml b/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml index ab5f1743c3..2e2f926722 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/IEEE_802_15_4_Mod.yaml @@ -106,7 +106,7 @@ IEEE_802_15_4_ModSettings: beta: type: number format: float - description: Pulse shapint filter beta factor + description: Pulse shaping filter beta factor symbolSpan: type: integer udpEnabled: diff --git a/sdrbase/resources/webapi/doc/swagger/include/LimeRFE.yaml b/sdrbase/resources/webapi/doc/swagger/include/LimeRFE.yaml index ab91cf81e8..de299cc8e6 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/LimeRFE.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/LimeRFE.yaml @@ -53,7 +53,7 @@ LimeRFESettings: description: Rx attenuation factor. Attenuation is 2 times this factor in dB (0..7 => 0..14dB) type: integer amfmNotch: - desciption: Rx AM/FM notch filter (boolean) + description: Rx AM/FM notch filter (boolean) type: integer txChannels: type: integer @@ -150,7 +150,7 @@ LimeRFEActions: * 1 - Tx deviceSetIndex: type: integer - dexcription: Index of device set to synchronize switch with + description: Index of device set to synchronize switch with switchChannel: type: integer description: > diff --git a/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml b/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml index 3ddb18de3b..7c54b524f0 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/LimeSdr.yaml @@ -329,7 +329,7 @@ LimeSdrInputReport: description: LimeSDR properties: success: - description: 1 if info was successfullt retrieved else 0 + description: 1 if info was successfully retrieved else 0 type: integer streamActive: description: 1 if active else 0 @@ -365,7 +365,7 @@ LimeSdrOutputReport: description: LimeSDR properties: success: - description: 1 if info was successfullt retrieved else 0 + description: 1 if info was successfully retrieved else 0 type: integer streamActive: description: 1 if active else 0 @@ -414,7 +414,7 @@ LimeSdrMIMOReport: type: integer format: int8 successRx: - description: 1 if Rx info was successfullt retrieved else 0 + description: 1 if Rx info was successfully retrieved else 0 type: integer streamActiveRx: description: 1 if active else 0 @@ -433,7 +433,7 @@ LimeSdrMIMOReport: type: number format: float successTx: - description: 1 if Tx info was successfullt retrieved else 0 + description: 1 if Tx info was successfully retrieved else 0 type: integer streamActiveTx: description: 1 if active else 0 diff --git a/sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml b/sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml index 404e26e618..361b0cf8f1 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/MetisMISO.yaml @@ -11,35 +11,35 @@ MetisMISOSettings: * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device rx1CenterFrequency: - description: center fequencies of receiver 1 + description: center frequencies of receiver 1 type: integer format: int64 rx2CenterFrequency: - description: center fequencies of receiver 2 + description: center frequencies of receiver 2 type: integer format: int64 rx3CenterFrequency: - description: center fequencies of receiver 3 + description: center frequencies of receiver 3 type: integer format: int64 rx4CenterFrequency: - description: center fequencies of receiver 4 + description: center frequencies of receiver 4 type: integer format: int64 rx5CenterFrequency: - description: center fequencies of receiver 5 + description: center frequencies of receiver 5 type: integer format: int64 rx6CenterFrequency: - description: center fequencies of receiver 6 + description: center frequencies of receiver 6 type: integer format: int64 rx7CenterFrequency: - description: center fequencies of receiver 7 + description: center frequencies of receiver 7 type: integer format: int64 rx8CenterFrequency: - description: center fequencies of receiver 8 + description: center frequencies of receiver 8 type: integer format: int64 txCenterFrequency: diff --git a/sdrbase/resources/webapi/doc/swagger/include/MorseDecoder.yaml b/sdrbase/resources/webapi/doc/swagger/include/MorseDecoder.yaml index ff43965594..e0ddbe6094 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/MorseDecoder.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/MorseDecoder.yaml @@ -23,10 +23,10 @@ MorseDecoderSettings: * 0 - do not send udpAddress: type: string - description: Address to semd text via UDP + description: Address to send text via UDP udpPort: type: integer - description: Port to semd text via UDP + description: Port to send text via UDP logFiledName: type: string description: File to log the decoded text to diff --git a/sdrbase/resources/webapi/doc/swagger/include/Preferences.yaml b/sdrbase/resources/webapi/doc/swagger/include/Preferences.yaml index 271ddd6f3b..23dcb720b7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Preferences.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Preferences.yaml @@ -1,5 +1,5 @@ Preferences: - description: Repreents a Prefernce object + description: Represents a Preference object properties: sourceDevice: description: Identification of the source used in R0 tab (GUI flavor) at startup diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml index d3a8ddba0e..74ae025973 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteInput.yaml @@ -14,7 +14,7 @@ RemoteInputSettings: multicastJoin: type: integer description: > - Joim multicast group + Join multicast group * 0 - leave group * 1 - join group dcBlock: diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml index 6dbb3ae8fc..2f9a958047 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteOutput.yaml @@ -6,7 +6,7 @@ RemoteOutputSettings: nbTxBytes: type: integer description: > - Number of bytes in a transmited I or Q sample + Number of bytes in a transmitted I or Q sample * 1 * 2 * 4 diff --git a/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml index 6d37936238..e5ff44fe8c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/RemoteSink.yaml @@ -7,7 +7,7 @@ RemoteSinkSettings: nbTxBytes: type: integer description: > - Number of bytes in a transmited I or Q sample + Number of bytes in a transmitted I or Q sample * 1 * 2 * 4 diff --git a/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml b/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml index 6b4b0d31a8..bbe86d946c 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SSBDemod.yaml @@ -73,11 +73,11 @@ SSBDemodSettings: dnrAboveAvgFactor: type: number 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: type: number 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: type: integer description: Number of magnitude peak maxima selected in peaks scheme diff --git a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml index 1317c111fe..78c6063655 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SatelliteTracker.yaml @@ -48,7 +48,7 @@ SatelliteTrackerSettings: description: "Number of points used to draw ground tracks" type: integer 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 utc: description: "Times are UTC (1) or local (0)" diff --git a/sdrbase/resources/webapi/doc/swagger/include/SigMFFileInput.yaml b/sdrbase/resources/webapi/doc/swagger/include/SigMFFileInput.yaml index 4caa0e3c33..1a7b9c7dfc 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SigMFFileInput.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SigMFFileInput.yaml @@ -115,15 +115,15 @@ SigMFFileInputActions: description: Move to beginning of track given its number. Must stop first. seekTrackMillis: 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: 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: Capture: - descripion: Capture (track) information + description: Capture (track) information properties: tsms: description: Timestamp in milliseconds since epoch of capture start diff --git a/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml b/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml index b803b3fd67..61a9455893 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SigMFFileSink.yaml @@ -27,11 +27,11 @@ SigMFFileSinkSettings: description: Number of seconds to record before recording is triggered (manual or squelch) squelchPostRecordTime: type: integer - description: Number of seconds to record after spectrum squelch cloeses + description: Number of seconds to record after spectrum squelch closes squelchRecordingEnable: type: integer description: > - Automatic recording triggered by spectrum squalch + Automatic recording triggered by spectrum squelch * 0 - disabled * 1 - enabled log2RecordSampleSize: diff --git a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml index 637b7834ce..983fae7538 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/SoapySDR.yaml @@ -212,7 +212,7 @@ definitions: $ref: "/doc/swagger/include/Structs.yaml#/RangeFloat" ArgValue: - descripion: Generic argument value + description: Generic argument value properties: key: type: string @@ -223,7 +223,7 @@ definitions: type: string ArgInfo: - descripion: Generic argument information + description: Generic argument information properties: key: type: string diff --git a/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml b/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml index 6e41c77908..23934515c7 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/StarTracker.yaml @@ -159,7 +159,7 @@ StarTrackerTarget: type: number format: float airTemperature: - description: "Surface air temperature in degrees celsius at antenna location" + description: "Surface air temperature in degrees Celsius at antenna location" type: number format: float skyTemperature: diff --git a/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml b/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml index 08755b94b0..f5c1c1ddca 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/Structs.yaml @@ -17,7 +17,7 @@ Frequency: type: integer FrequencyBand: - description: A band of frequencies given its boudaries in Hertz (Hz) + description: A band of frequencies given its boundaries in Hertz (Hz) properties: name: type: string @@ -59,7 +59,7 @@ RangeFloat: format: float 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: min: type: integer diff --git a/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml b/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml index 9ae84dbd30..a78e2e93b1 100644 --- a/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml +++ b/sdrbase/resources/webapi/doc/swagger/include/UDPSource.yaml @@ -52,7 +52,7 @@ UDPSourceSettings: multicastJoin: type: integer description: > - Joim multicast group + Join multicast group * 0 - leave group * 1 - join group title: diff --git a/sdrbase/resources/webapi/doc/swagger/swagger.yaml b/sdrbase/resources/webapi/doc/swagger/swagger.yaml index 43511de318..3c50a474d4 100644 --- a/sdrbase/resources/webapi/doc/swagger/swagger.yaml +++ b/sdrbase/resources/webapi/doc/swagger/swagger.yaml @@ -1075,7 +1075,7 @@ paths: - Workspace responses: "202": - descriptions: Successful sending of the message + description: Successful sending of the message schema: $ref: "#/definitions/SuccessResponse" "500": @@ -1089,7 +1089,7 @@ paths: - Workspace responses: "202": - descriptions: Successful sending of the message + description: Successful sending of the message schema: $ref: "#/definitions/SuccessResponse" "500": @@ -3325,7 +3325,7 @@ definitions: description: "Name of the preset group" type: string centerFrequency: - description: "Center freqeuency in Hz" + description: "Center frequency in Hz" type: integer format: int64 type: @@ -3343,7 +3343,7 @@ definitions: - name properties: centerFrequency: - description: "Center freqeuency in Hz" + description: "Center frequency in Hz" type: integer format: int64 type: @@ -3458,7 +3458,7 @@ definitions: type: string ConfigurationImportExport: - description: "Details to impprt/export a configuration from/to file" + description: "Details to import/export a configuration from/to file" properties: filePath: description: "Path of the import file" diff --git a/sdrgui/CMakeLists.txt b/sdrgui/CMakeLists.txt index f1089b92a1..ac0ca15143 100644 --- a/sdrgui/CMakeLists.txt +++ b/sdrgui/CMakeLists.txt @@ -79,7 +79,6 @@ set(sdrgui_SOURCES gui/presetitem.cpp gui/profiledialog.cpp gui/rollupcontents.cpp - gui/rollupwidget.cpp gui/samplingdevicedialog.cpp gui/scaleengine.cpp gui/scaledimage.cpp @@ -210,7 +209,6 @@ set(sdrgui_HEADERS gui/profiledialog.h gui/qtcompatibility.h gui/rollupcontents.h - gui/rollupwidget.h gui/samplingdevicedialog.h gui/scaleengine.h gui/scaledimage.h diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp index 94271d2d68..98a1673746 100644 --- a/sdrgui/device/deviceuiset.cpp +++ b/sdrgui/device/deviceuiset.cpp @@ -347,7 +347,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA qDebug("DeviceUISet::loadRxChannelSettings: creating new channel [%s] from config [%s]", qPrintable((*channelRegistrations)[i].m_channelIdURI), qPrintable(channelConfig.m_channelIdURI)); - BasebandSampleSink *rxChannel; + BasebandSampleSink *rxChannel = nullptr; PluginInterface *pluginInterface = (*channelRegistrations)[i].m_plugin; pluginInterface->createRxChannel(m_deviceAPI, &rxChannel, &channelAPI); rxChannelGUI = pluginInterface->createRxChannelGUI(this, rxChannel); diff --git a/sdrgui/gui/aboutdialog.ui b/sdrgui/gui/aboutdialog.ui index 94819bb7b2..efac4d28d9 100644 --- a/sdrgui/gui/aboutdialog.ui +++ b/sdrgui/gui/aboutdialog.ui @@ -187,39 +187,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdrgui/gui/audiodialog.ui b/sdrgui/gui/audiodialog.ui index 5470be7a7c..aee8de1593 100644 --- a/sdrgui/gui/audiodialog.ui +++ b/sdrgui/gui/audiodialog.ui @@ -766,39 +766,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdrgui/gui/audioselectdialog.ui b/sdrgui/gui/audioselectdialog.ui index dc95755943..58d80e72d8 100644 --- a/sdrgui/gui/audioselectdialog.ui +++ b/sdrgui/gui/audioselectdialog.ui @@ -63,9 +63,7 @@ buttonBox - - - + buttonBox diff --git a/sdrgui/gui/commandoutputdialog.ui b/sdrgui/gui/commandoutputdialog.ui index 590aa9f39b..91a5d1b953 100644 --- a/sdrgui/gui/commandoutputdialog.ui +++ b/sdrgui/gui/commandoutputdialog.ui @@ -74,6 +74,7 @@ + Liberation Sans 8 @@ -105,6 +106,7 @@ + Liberation Sans 8 @@ -126,6 +128,7 @@ + Liberation Sans 8 @@ -285,6 +288,7 @@ Monospace + 9 diff --git a/sdrgui/gui/cwkeyergui.ui b/sdrgui/gui/cwkeyergui.ui index f9bf4bd325..7151594670 100644 --- a/sdrgui/gui/cwkeyergui.ui +++ b/sdrgui/gui/cwkeyergui.ui @@ -152,7 +152,6 @@ Liberation Sans 12 - 75 true @@ -219,7 +218,6 @@ Liberation Sans 12 - 75 true @@ -293,7 +291,6 @@ DejaVu Serif 9 - 75 true @@ -573,7 +570,6 @@ Liberation Sans 12 - 75 true @@ -662,7 +658,6 @@ Liberation Sans 12 - 75 true diff --git a/sdrgui/gui/fftdialog.ui b/sdrgui/gui/fftdialog.ui index 3419dbd406..b88036cb0e 100644 --- a/sdrgui/gui/fftdialog.ui +++ b/sdrgui/gui/fftdialog.ui @@ -64,9 +64,7 @@ Changes only apply to new devices / channels until SDRangel is restarted. - - - + buttonBox diff --git a/sdrgui/gui/fftnrdialog.ui b/sdrgui/gui/fftnrdialog.ui index f7cadafda8..75d0345776 100644 --- a/sdrgui/gui/fftnrdialog.ui +++ b/sdrgui/gui/fftnrdialog.ui @@ -280,9 +280,7 @@ - - - + buttonBox diff --git a/sdrgui/gui/graphicsdialog.ui b/sdrgui/gui/graphicsdialog.ui index bdda1e12ce..0b812440ff 100644 --- a/sdrgui/gui/graphicsdialog.ui +++ b/sdrgui/gui/graphicsdialog.ui @@ -209,9 +209,7 @@ Requires windows to be reopened to take effect mapMultisampling mapSmoothing - - - + buttonBox diff --git a/sdrgui/gui/profiledialog.ui b/sdrgui/gui/profiledialog.ui index 5456be1413..030ab6ccb9 100644 --- a/sdrgui/gui/profiledialog.ui +++ b/sdrgui/gui/profiledialog.ui @@ -83,9 +83,7 @@ - - - + buttonBox diff --git a/sdrgui/gui/rollupwidget.cpp b/sdrgui/gui/rollupwidget.cpp deleted file mode 100644 index 2543b661cc..0000000000 --- a/sdrgui/gui/rollupwidget.cpp +++ /dev/null @@ -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 // -// Copyright (C) 2020 Texas.C // -// Copyright (C) 2021-2022 Jon Beniston, M7RCE // -// // -// 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 . // -/////////////////////////////////////////////////////////////////////////////////// - -#include -#include -#include -#include -#include -#include - -#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(children()[i]); - -// if (r) { -// count++; -// } -// } - -// stream << VersionMarker; -// stream << version; -// stream << count; - -// for (int i = 0; i < children().count(); ++i) -// { -// QWidget* r = qobject_cast(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& childrenStates = state.getChildren(); - childrenStates.clear(); - - for (const auto &child : children()) - { - QWidget* r = qobject_cast(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(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& childrenStates = state.getChildren(); - - for (const auto &object : children()) - { - QWidget* r = qobject_cast(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(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(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(*n) != nullptr) { - break; - } - } - - for (w = n; w != c.end(); w = n) - { - if (n != c.end()) { - ++n; - } - - for (; n != c.end(); ++n) - { - if (qobject_cast(*n) != nullptr) { - break; - } - } - - pos += paintRollup(qobject_cast(*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(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(object), true); - } - } - else if (event->type() == QEvent::Hide) - { - if (children().contains(object)) - { - arrangeRollups(); - emit widgetRolled(qobject_cast(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(childWidget) == nullptr); // exclude Dialogs from rollups -} diff --git a/sdrgui/gui/rollupwidget.h b/sdrgui/gui/rollupwidget.h deleted file mode 100644 index be66144ee8..0000000000 --- a/sdrgui/gui/rollupwidget.h +++ /dev/null @@ -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 // -// Copyright (C) 2021 Jon Beniston, M7RCE // -// // -// 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 . // -/////////////////////////////////////////////////////////////////////////////////// - -#ifndef INCLUDE_ROLLUPWIDGET_H -#define INCLUDE_ROLLUPWIDGET_H - -#include -#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 diff --git a/sdrgui/gui/spectrummeasurementsdialog.ui b/sdrgui/gui/spectrummeasurementsdialog.ui index 47a1744c81..c1dd860199 100644 --- a/sdrgui/gui/spectrummeasurementsdialog.ui +++ b/sdrgui/gui/spectrummeasurementsdialog.ui @@ -405,9 +405,7 @@ harmonics resetMeasurements - - - + buttonBox diff --git a/sdrgui/gui/welcomedialog.ui b/sdrgui/gui/welcomedialog.ui index bbb9ce6979..ce797623ec 100644 --- a/sdrgui/gui/welcomedialog.ui +++ b/sdrgui/gui/welcomedialog.ui @@ -72,39 +72,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sdrgui/mainwindow.ui b/sdrgui/mainwindow.ui index a43ab495a3..7a9af5e3ea 100644 --- a/sdrgui/mainwindow.ui +++ b/sdrgui/mainwindow.ui @@ -966,7 +966,6 @@ Liberation Sans 9 - 50 false diff --git a/swagger/sdrangel/api/swagger/include/AFC.yaml b/swagger/sdrangel/api/swagger/include/AFC.yaml index 10861a19d4..880ee9d1fe 100644 --- a/swagger/sdrangel/api/swagger/include/AFC.yaml +++ b/swagger/sdrangel/api/swagger/include/AFC.yaml @@ -28,7 +28,7 @@ AFCSettings: type: integer format: int64 freqTolerance: - descritpion: Frequency shift tolerance before tracker frequency is (re)adjusted + description: Frequency shift tolerance before tracker frequency is (re)adjusted type: integer trackerAdjustPeriod: description: Tracker channel frequency adjustment period in seconds @@ -62,7 +62,7 @@ AFCReport: description: Tracker index in device set type: integer trackerDeviceFrequency: - descritpion: Center frequency of tracker device + description: Center frequency of tracker device type: integer format: int64 trackerChannelOffset: diff --git a/swagger/sdrangel/api/swagger/include/AudioCATSISO.yaml b/swagger/sdrangel/api/swagger/include/AudioCATSISO.yaml index adc2ca7b88..e4bf3db9d6 100644 --- a/swagger/sdrangel/api/swagger/include/AudioCATSISO.yaml +++ b/swagger/sdrangel/api/swagger/include/AudioCATSISO.yaml @@ -80,7 +80,7 @@ AudioCATSISOSettings: description: Tx volume in dB usually negative catSpeedIndex: type: integer - descriptoion: > + description: > CAT serial link baud rate * 0 - 1200 * 1 - 2400 @@ -99,7 +99,7 @@ AudioCATSISOSettings: catStopBitsIndex: type: integer description: > - CAT serial linkj stop bits + CAT serial link stop bits * 0 - 1 (default) * 1 - 2 catHandshakeIndex: @@ -112,7 +112,7 @@ AudioCATSISOSettings: catPTTMethodIndex: type: integer description: > - CAT PTT metgod + CAT PTT method * 0 - PTT (default) * 1 - DTR * 2 - RTS diff --git a/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml b/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml index fa3525da15..5cf7a58f9a 100644 --- a/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/ChirpChatDemod.yaml @@ -38,7 +38,7 @@ ChirpChatDemodSettings: spreadFactor: type: integer 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 fftWindow: type: integer @@ -203,5 +203,5 @@ ChirpChatDemodReport: type: integer description: > Boolean - decoding status - * 0 - no deconding + * 0 - no decoding * 1 - decoding diff --git a/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml b/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml index 31786edfcf..1568e40e1a 100644 --- a/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml +++ b/swagger/sdrangel/api/swagger/include/ChirpChatMod.yaml @@ -38,7 +38,7 @@ ChirpChatModSettings: spreadFactor: type: integer 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 preambleChirps: description: Number of preamble chirps diff --git a/swagger/sdrangel/api/swagger/include/Command.yaml b/swagger/sdrangel/api/swagger/include/Command.yaml index 2f64b4d876..9979542964 100644 --- a/swagger/sdrangel/api/swagger/include/Command.yaml +++ b/swagger/sdrangel/api/swagger/include/Command.yaml @@ -13,7 +13,7 @@ Command: description: Qt::Key type: integer keyModifiers: - sdescription: Qt::KeyboardModifiers + description: Qt::KeyboardModifiers type: integer associateKey: description: boolean diff --git a/swagger/sdrangel/api/swagger/include/DATVDemod.yaml b/swagger/sdrangel/api/swagger/include/DATVDemod.yaml index c2996f348e..3dfd2ce492 100644 --- a/swagger/sdrangel/api/swagger/include/DATVDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/DATVDemod.yaml @@ -74,7 +74,7 @@ DATVDemodSettings: type: integer filter: description: > - Type of sumbol filtering (see DATVDemodSettings::dvb_sampler) + Type of symbol filtering (see DATVDemodSettings::dvb_sampler) * 0 - Nearest * 1 - Linear * 2 - Root Raised Cosine diff --git a/swagger/sdrangel/api/swagger/include/DOA2.yaml b/swagger/sdrangel/api/swagger/include/DOA2.yaml index 8b6e3cca4a..b62a88a40b 100644 --- a/swagger/sdrangel/api/swagger/include/DOA2.yaml +++ b/swagger/sdrangel/api/swagger/include/DOA2.yaml @@ -23,7 +23,7 @@ DOA2Settings: description: Antennas baseline distance in millimeters from 1 to 99999 squelchdB: 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: type: integer description: Number of FFTs to average over. Use 1, 2, 5 or 10 times 10^0 to 10^5 (1 to 1M) diff --git a/swagger/sdrangel/api/swagger/include/FT8Demod.yaml b/swagger/sdrangel/api/swagger/include/FT8Demod.yaml index 0d15265ada..aa2b745f8f 100644 --- a/swagger/sdrangel/api/swagger/include/FT8Demod.yaml +++ b/swagger/sdrangel/api/swagger/include/FT8Demod.yaml @@ -51,7 +51,7 @@ FT8DemodSettings: decoderTimeBudget: type: number 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: type: integer description: > diff --git a/swagger/sdrangel/api/swagger/include/FileSink.yaml b/swagger/sdrangel/api/swagger/include/FileSink.yaml index 0d2493d641..50ace59f86 100644 --- a/swagger/sdrangel/api/swagger/include/FileSink.yaml +++ b/swagger/sdrangel/api/swagger/include/FileSink.yaml @@ -27,11 +27,11 @@ FileSinkSettings: description: Number of seconds to record before recording is triggered (manual or squelch) squelchPostRecordTime: type: integer - description: Number of seconds to record after spectrum squelch cloeses + description: Number of seconds to record after spectrum squelch closes squelchRecordingEnable: type: integer description: > - Automatic recording triggered by spectrum squalch + Automatic recording triggered by spectrum squelch * 0 - disabled * 1 - enabled streamIndex: diff --git a/swagger/sdrangel/api/swagger/include/GLSpectrum.yaml b/swagger/sdrangel/api/swagger/include/GLSpectrum.yaml index 9f36c6cd88..edaf0c805e 100644 --- a/swagger/sdrangel/api/swagger/include/GLSpectrum.yaml +++ b/swagger/sdrangel/api/swagger/include/GLSpectrum.yaml @@ -17,7 +17,7 @@ SpectrumHistogramMarker: * 2 - Max power markerColor: type: integer - description: Color in 8 bit BGR serie + description: Color in 8 bit BGR series show: type: integer description: > @@ -37,7 +37,7 @@ SpectrumWaterfallMarker: description: Time shift in seconds markerColor: type: integer - description: Color in 8 bit BGR serie + description: Color in 8 bit BGR series show: type: integer description: > @@ -55,7 +55,7 @@ SpectrumAnnotationMarker: type: integer markerColor: type: integer - description: Color in 8 bit BGR serie + description: Color in 8 bit BGR series show: type: integer description: > diff --git a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml index 586a79782f..0662d7492a 100644 --- a/swagger/sdrangel/api/swagger/include/GS232Controller.yaml +++ b/swagger/sdrangel/api/swagger/include/GS232Controller.yaml @@ -107,7 +107,7 @@ GS232ControllerReport: items: type: string targetAzimuth: - desription: "Target azimuth in degrees (0-450)" + description: "Target azimuth in degrees (0-450)" type: number format: float targetElevation: @@ -115,7 +115,7 @@ GS232ControllerReport: type: number format: float currentAzimuth: - desription: "Current azimuth in degrees (0-450)" + description: "Current azimuth in degrees (0-450)" type: number format: float currentElevation: diff --git a/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml b/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml index 7cbcd6b75a..0ac25e4f21 100644 --- a/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml +++ b/swagger/sdrangel/api/swagger/include/IEEE_802_15_4_Mod.yaml @@ -106,7 +106,7 @@ IEEE_802_15_4_ModSettings: beta: type: number format: float - description: Pulse shapint filter beta factor + description: Pulse shaping filter beta factor symbolSpan: type: integer udpEnabled: diff --git a/swagger/sdrangel/api/swagger/include/LimeRFE.yaml b/swagger/sdrangel/api/swagger/include/LimeRFE.yaml index 2fd55d0500..7c2f15413e 100644 --- a/swagger/sdrangel/api/swagger/include/LimeRFE.yaml +++ b/swagger/sdrangel/api/swagger/include/LimeRFE.yaml @@ -53,7 +53,7 @@ LimeRFESettings: description: Rx attenuation factor. Attenuation is 2 times this factor in dB (0..7 => 0..14dB) type: integer amfmNotch: - desciption: Rx AM/FM notch filter (boolean) + description: Rx AM/FM notch filter (boolean) type: integer txChannels: type: integer @@ -150,7 +150,7 @@ LimeRFEActions: * 1 - Tx deviceSetIndex: type: integer - dexcription: Index of device set to synchronize switch with + description: Index of device set to synchronize switch with switchChannel: type: integer description: > diff --git a/swagger/sdrangel/api/swagger/include/LimeSdr.yaml b/swagger/sdrangel/api/swagger/include/LimeSdr.yaml index 3ddb18de3b..7c54b524f0 100644 --- a/swagger/sdrangel/api/swagger/include/LimeSdr.yaml +++ b/swagger/sdrangel/api/swagger/include/LimeSdr.yaml @@ -329,7 +329,7 @@ LimeSdrInputReport: description: LimeSDR properties: success: - description: 1 if info was successfullt retrieved else 0 + description: 1 if info was successfully retrieved else 0 type: integer streamActive: description: 1 if active else 0 @@ -365,7 +365,7 @@ LimeSdrOutputReport: description: LimeSDR properties: success: - description: 1 if info was successfullt retrieved else 0 + description: 1 if info was successfully retrieved else 0 type: integer streamActive: description: 1 if active else 0 @@ -414,7 +414,7 @@ LimeSdrMIMOReport: type: integer format: int8 successRx: - description: 1 if Rx info was successfullt retrieved else 0 + description: 1 if Rx info was successfully retrieved else 0 type: integer streamActiveRx: description: 1 if active else 0 @@ -433,7 +433,7 @@ LimeSdrMIMOReport: type: number format: float successTx: - description: 1 if Tx info was successfullt retrieved else 0 + description: 1 if Tx info was successfully retrieved else 0 type: integer streamActiveTx: description: 1 if active else 0 diff --git a/swagger/sdrangel/api/swagger/include/MetisMISO.yaml b/swagger/sdrangel/api/swagger/include/MetisMISO.yaml index 404e26e618..361b0cf8f1 100644 --- a/swagger/sdrangel/api/swagger/include/MetisMISO.yaml +++ b/swagger/sdrangel/api/swagger/include/MetisMISO.yaml @@ -11,35 +11,35 @@ MetisMISOSettings: * 0 - disabled sends null payload to Metis device * 1 - enabled sends Tx payload to Metis device rx1CenterFrequency: - description: center fequencies of receiver 1 + description: center frequencies of receiver 1 type: integer format: int64 rx2CenterFrequency: - description: center fequencies of receiver 2 + description: center frequencies of receiver 2 type: integer format: int64 rx3CenterFrequency: - description: center fequencies of receiver 3 + description: center frequencies of receiver 3 type: integer format: int64 rx4CenterFrequency: - description: center fequencies of receiver 4 + description: center frequencies of receiver 4 type: integer format: int64 rx5CenterFrequency: - description: center fequencies of receiver 5 + description: center frequencies of receiver 5 type: integer format: int64 rx6CenterFrequency: - description: center fequencies of receiver 6 + description: center frequencies of receiver 6 type: integer format: int64 rx7CenterFrequency: - description: center fequencies of receiver 7 + description: center frequencies of receiver 7 type: integer format: int64 rx8CenterFrequency: - description: center fequencies of receiver 8 + description: center frequencies of receiver 8 type: integer format: int64 txCenterFrequency: diff --git a/swagger/sdrangel/api/swagger/include/MorseDecoder.yaml b/swagger/sdrangel/api/swagger/include/MorseDecoder.yaml index 623ae8a5c3..abacc57cdd 100644 --- a/swagger/sdrangel/api/swagger/include/MorseDecoder.yaml +++ b/swagger/sdrangel/api/swagger/include/MorseDecoder.yaml @@ -23,10 +23,10 @@ MorseDecoderSettings: * 0 - do not send udpAddress: type: string - description: Address to semd text via UDP + description: Address to send text via UDP udpPort: type: integer - description: Port to semd text via UDP + description: Port to send text via UDP logFiledName: type: string description: File to log the decoded text to diff --git a/swagger/sdrangel/api/swagger/include/Preferences.yaml b/swagger/sdrangel/api/swagger/include/Preferences.yaml index 271ddd6f3b..23dcb720b7 100644 --- a/swagger/sdrangel/api/swagger/include/Preferences.yaml +++ b/swagger/sdrangel/api/swagger/include/Preferences.yaml @@ -1,5 +1,5 @@ Preferences: - description: Repreents a Prefernce object + description: Represents a Preference object properties: sourceDevice: description: Identification of the source used in R0 tab (GUI flavor) at startup diff --git a/swagger/sdrangel/api/swagger/include/RemoteInput.yaml b/swagger/sdrangel/api/swagger/include/RemoteInput.yaml index d3a8ddba0e..74ae025973 100644 --- a/swagger/sdrangel/api/swagger/include/RemoteInput.yaml +++ b/swagger/sdrangel/api/swagger/include/RemoteInput.yaml @@ -14,7 +14,7 @@ RemoteInputSettings: multicastJoin: type: integer description: > - Joim multicast group + Join multicast group * 0 - leave group * 1 - join group dcBlock: diff --git a/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml b/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml index 6dbb3ae8fc..2f9a958047 100644 --- a/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml +++ b/swagger/sdrangel/api/swagger/include/RemoteOutput.yaml @@ -6,7 +6,7 @@ RemoteOutputSettings: nbTxBytes: type: integer description: > - Number of bytes in a transmited I or Q sample + Number of bytes in a transmitted I or Q sample * 1 * 2 * 4 diff --git a/swagger/sdrangel/api/swagger/include/RemoteSink.yaml b/swagger/sdrangel/api/swagger/include/RemoteSink.yaml index e7b71baf21..f560aeb39e 100644 --- a/swagger/sdrangel/api/swagger/include/RemoteSink.yaml +++ b/swagger/sdrangel/api/swagger/include/RemoteSink.yaml @@ -7,7 +7,7 @@ RemoteSinkSettings: nbTxBytes: type: integer description: > - Number of bytes in a transmited I or Q sample + Number of bytes in a transmitted I or Q sample * 1 * 2 * 4 diff --git a/swagger/sdrangel/api/swagger/include/SSBDemod.yaml b/swagger/sdrangel/api/swagger/include/SSBDemod.yaml index 9046158e53..a3322dcccb 100644 --- a/swagger/sdrangel/api/swagger/include/SSBDemod.yaml +++ b/swagger/sdrangel/api/swagger/include/SSBDemod.yaml @@ -73,11 +73,11 @@ SSBDemodSettings: dnrAboveAvgFactor: type: number 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: type: number 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: type: integer description: Number of magnitude peak maxima selected in peaks scheme diff --git a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml index 3031500ece..a565eae31a 100644 --- a/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml +++ b/swagger/sdrangel/api/swagger/include/SatelliteTracker.yaml @@ -48,7 +48,7 @@ SatelliteTrackerSettings: description: "Number of points used to draw ground tracks" type: integer 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 utc: description: "Times are UTC (1) or local (0)" diff --git a/swagger/sdrangel/api/swagger/include/SigMFFileInput.yaml b/swagger/sdrangel/api/swagger/include/SigMFFileInput.yaml index 4caa0e3c33..30c8b95a05 100644 --- a/swagger/sdrangel/api/swagger/include/SigMFFileInput.yaml +++ b/swagger/sdrangel/api/swagger/include/SigMFFileInput.yaml @@ -123,7 +123,7 @@ SigMFFileInputActions: definitions: Capture: - descripion: Capture (track) information + description: Capture (track) information properties: tsms: description: Timestamp in milliseconds since epoch of capture start diff --git a/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml b/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml index f6bc600250..d5638a0f48 100644 --- a/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml +++ b/swagger/sdrangel/api/swagger/include/SigMFFileSink.yaml @@ -27,11 +27,11 @@ SigMFFileSinkSettings: description: Number of seconds to record before recording is triggered (manual or squelch) squelchPostRecordTime: type: integer - description: Number of seconds to record after spectrum squelch cloeses + description: Number of seconds to record after spectrum squelch closes squelchRecordingEnable: type: integer description: > - Automatic recording triggered by spectrum squalch + Automatic recording triggered by spectrum squelch * 0 - disabled * 1 - enabled log2RecordSampleSize: diff --git a/swagger/sdrangel/api/swagger/include/SoapySDR.yaml b/swagger/sdrangel/api/swagger/include/SoapySDR.yaml index 87e9357e02..2d2c139e42 100644 --- a/swagger/sdrangel/api/swagger/include/SoapySDR.yaml +++ b/swagger/sdrangel/api/swagger/include/SoapySDR.yaml @@ -212,7 +212,7 @@ definitions: $ref: "http://swgserver:8081/api/swagger/include/Structs.yaml#/RangeFloat" ArgValue: - descripion: Generic argument value + description: Generic argument value properties: key: type: string @@ -223,7 +223,7 @@ definitions: type: string ArgInfo: - descripion: Generic argument information + description: Generic argument information properties: key: type: string diff --git a/swagger/sdrangel/api/swagger/include/StarTracker.yaml b/swagger/sdrangel/api/swagger/include/StarTracker.yaml index 9ad3cd87d1..84416821ad 100644 --- a/swagger/sdrangel/api/swagger/include/StarTracker.yaml +++ b/swagger/sdrangel/api/swagger/include/StarTracker.yaml @@ -159,7 +159,7 @@ StarTrackerTarget: type: number format: float airTemperature: - description: "Surface air temperature in degrees celsius at antenna location" + description: "Surface air temperature in degrees Celsius at antenna location" type: number format: float skyTemperature: diff --git a/swagger/sdrangel/api/swagger/include/Structs.yaml b/swagger/sdrangel/api/swagger/include/Structs.yaml index 08755b94b0..f5c1c1ddca 100644 --- a/swagger/sdrangel/api/swagger/include/Structs.yaml +++ b/swagger/sdrangel/api/swagger/include/Structs.yaml @@ -17,7 +17,7 @@ Frequency: type: integer FrequencyBand: - description: A band of frequencies given its boudaries in Hertz (Hz) + description: A band of frequencies given its boundaries in Hertz (Hz) properties: name: type: string @@ -59,7 +59,7 @@ RangeFloat: format: float 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: min: type: integer diff --git a/swagger/sdrangel/api/swagger/include/UDPSource.yaml b/swagger/sdrangel/api/swagger/include/UDPSource.yaml index 9f7c5316cf..6d9c40a718 100644 --- a/swagger/sdrangel/api/swagger/include/UDPSource.yaml +++ b/swagger/sdrangel/api/swagger/include/UDPSource.yaml @@ -52,7 +52,7 @@ UDPSourceSettings: multicastJoin: type: integer description: > - Joim multicast group + Join multicast group * 0 - leave group * 1 - join group title: diff --git a/swagger/sdrangel/api/swagger/swagger.yaml b/swagger/sdrangel/api/swagger/swagger.yaml index 342397bca4..c22ee88be3 100644 --- a/swagger/sdrangel/api/swagger/swagger.yaml +++ b/swagger/sdrangel/api/swagger/swagger.yaml @@ -1075,7 +1075,7 @@ paths: - Workspace responses: "202": - descriptions: Successful sending of the message + description: Successful sending of the message schema: $ref: "#/definitions/SuccessResponse" "500": @@ -1089,7 +1089,7 @@ paths: - Workspace responses: "202": - descriptions: Successful sending of the message + description: Successful sending of the message schema: $ref: "#/definitions/SuccessResponse" "500": @@ -3325,7 +3325,7 @@ definitions: description: "Name of the preset group" type: string centerFrequency: - description: "Center freqeuency in Hz" + description: "Center frequency in Hz" type: integer format: int64 type: @@ -3343,7 +3343,7 @@ definitions: - name properties: centerFrequency: - description: "Center freqeuency in Hz" + description: "Center frequency in Hz" type: integer format: int64 type: @@ -3458,7 +3458,7 @@ definitions: type: string ConfigurationImportExport: - description: "Details to impprt/export a configuration from/to file" + description: "Details to import/export a configuration from/to file" properties: filePath: description: "Path of the import file"