From 16838761a1976975126839bfea2b43623d337fb2 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 11 May 2015 17:46:59 +0200 Subject: [PATCH] Enhanced the display of the frequency for highlighted marker on the frequency scale --- sdrbase/gui/glspectrum.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sdrbase/gui/glspectrum.cpp b/sdrbase/gui/glspectrum.cpp index 418fa72a9..7e0a0a683 100644 --- a/sdrbase/gui/glspectrum.cpp +++ b/sdrbase/gui/glspectrum.cpp @@ -664,8 +664,8 @@ void GLSpectrum::paintGL() glBegin(GL_QUADS); glVertex2f(0, 0); glVertex2f(1, 0); - glVertex2f(1, 1); - glVertex2f(0, 1); + glVertex2f(1, 0.5); + glVertex2f(0, 0.5); glEnd(); if (dv->m_channelMarker->getHighlighted()) { @@ -1129,10 +1129,18 @@ void GLSpectrum::applyChanges() if (dv->m_channelMarker->getHighlighted()) { qreal xc; + int shift; //ChannelMarker::sidebands_t sidebands = dv->m_channelMarker->getSidebands(); xc = m_centerFrequency + dv->m_channelMarker->getCenterFrequency(); // marker center frequency QString ftext = QString::number((m_centerFrequency + dv->m_channelMarker->getCenterFrequency())/1e6, 'f', 6); - painter.drawText(QPointF(leftMargin + m_frequencyScale.getPosFromValue(xc), 2*fm.height() + fm.ascent() / 2 - 1), ftext); + if (dv->m_channelMarker->getCenterFrequency() < 0) { // left half of scale + ftext = " " + ftext; + shift = 0; + } else { // right half of scale + ftext = ftext + " "; + shift = - fm.width(ftext); + } + painter.drawText(QPointF(leftMargin + m_frequencyScale.getPosFromValue(xc) + shift, 2*fm.height() + fm.ascent() / 2 - 1), ftext); } }