From cded6772ae392bcc3a1584a5f6b5aca688aa60ae Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 22 Jun 2016 01:10:58 +0200 Subject: [PATCH] SDRdaemonFEC support: debug (4). Corrected buffer gauge display --- .../samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h | 12 +++--------- .../samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp | 6 +++--- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h index 83cd332c2..91a562aed 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecbuffer.h @@ -123,18 +123,12 @@ public: if (m_framesNbBytes) { int32_t val = (m_wrDeltaEstimate * 100) / (int32_t) m_framesNbBytes; - - if (val < -50) { - return val + 100; // read leads (positive) - } else if (val < 50) { - return val; // read leads (positive) or write leads (negative) - } else { - return val - 100; // write leads (negative) - } + // conversion: [-100:-50[ : read leads (+) / [-50:0[ : read lags (-) / [0:50[ : read leads (+) / [50:100{ : read lags (-) + return val < 0 ? -val - 50 : 50 -val; } else { - return -50; // default position + return 0; // default position } } diff --git a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp index 773f9bbca..3767c9b1e 100644 --- a/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp +++ b/plugins/samplesource/sdrdaemonfec/sdrdaemonfecgui.cpp @@ -608,11 +608,11 @@ void SDRdaemonFECGui::updateWithStreamTime() QString s = QString::number(m_bufferLengthInSecs, 'f', 1); ui->bufferLenSecsText->setText(tr("%1").arg(s)); - s = QString::number((m_bufferGauge < 0 ? -50 - m_bufferGauge : 50 - m_bufferGauge), 'f', 0); + s = QString::number(m_bufferGauge, 'f', 0); ui->bufferRWBalanceText->setText(tr("%1").arg(s)); - ui->bufferGaugeNegative->setValue((m_bufferGauge < 0 ? 50 + m_bufferGauge : 0)); - ui->bufferGaugePositive->setValue((m_bufferGauge < 0 ? 0 : 50 - m_bufferGauge)); + ui->bufferGaugeNegative->setValue((m_bufferGauge < 0 ? -m_bufferGauge : 0)); + ui->bufferGaugePositive->setValue((m_bufferGauge < 0 ? 0 : m_bufferGauge)); s = QString::number(m_curNbBlocks, 'f', 0); ui->avgNbBlocksText->setText(tr("%1").arg(s));