From cec24b8078ba8a5e26edf634086333f1f82f3a46 Mon Sep 17 00:00:00 2001 From: f4exb Date: Sun, 10 Sep 2017 17:44:34 +0200 Subject: [PATCH] PlutoSDR input: cosmetic changes --- .../plutosdrinput/plutosdrinputgui.cpp | 2 +- .../plutosdrinput/plutosdrinputgui.ui | 33 ++++++++----------- .../plutosdrinput/plutosdrinputthread.cpp | 10 +++++- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp index 5ba50253f..be3e78b9e 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.cpp @@ -343,7 +343,7 @@ void PlutoSDRInputGui::updateStatus() { std::string rssiStr; ((PlutoSDRInput *) m_sampleSource)->getRSSI(rssiStr); - ui->rssiText->setText(QString::fromStdString(rssiStr)); + ui->rssiText->setText(tr("-%1").arg(QString::fromStdString(rssiStr))); } if (m_statusCounter % 10 == 0) // 5s diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui index c77706d1a..4086db4ea 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui +++ b/plugins/samplesource/plutosdrinput/plutosdrinputgui.ui @@ -176,25 +176,6 @@ - - - - - 20 - 0 - - - - Channel number - - - #0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -583,6 +564,13 @@ + + + + D + + + @@ -611,6 +599,13 @@ + + + + G + + + diff --git a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp index 12ac6fc53..89b078cc7 100644 --- a/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp +++ b/plugins/samplesource/plutosdrinput/plutosdrinputthread.cpp @@ -14,6 +14,8 @@ // along with this program. If not, see . // /////////////////////////////////////////////////////////////////////////////////// +#include + #include "plutosdr/deviceplutosdrbox.h" #include "plutosdrinputsettings.h" #include "plutosdrinputthread.h" @@ -85,7 +87,13 @@ void PlutoSDRInputThread::run() // Refill RX buffer nbytes_rx = m_plutoBox->rxBufferRefill(); - if (nbytes_rx < 0) { qWarning("PlutoSDRInputThread::run: error refilling buf %d\n",(int) nbytes_rx); break; } + + if (nbytes_rx < 0) + { + qWarning("PlutoSDRInputThread::run: error refilling buf %d\n",(int) nbytes_rx); + usleep(200000); + continue; + } // READ: Get pointers to RX buf and read IQ from RX buf port 0 p_inc = m_plutoBox->rxBufferStep();