VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-16 13:21:50 -05:00
Code Issues Projects Releases Wiki Activity

Enhanced the display of the frequency for highlighted marker on the frequency scale

Browse Source
This commit is contained in:
f4exb 2015-05-11 17:46:59 +02:00
parent 44bbc89ace
commit 16838761a1
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sdrbase/gui/glspectrum.cpp
View File

@ -664,8 +664,8 @@ void GLSpectrum::paintGL()
glBegin(GL_QUADS); glBegin(GL_QUADS);
glVertex2f(0, 0); glVertex2f(0, 0);
glVertex2f(1, 0); glVertex2f(1, 0);
glVertex2f(1, 1); glVertex2f(1, 0.5);
glVertex2f(0, 1); glVertex2f(0, 0.5);
glEnd(); glEnd();
if (dv->m_channelMarker->getHighlighted()) { if (dv->m_channelMarker->getHighlighted()) {
@ -1129,10 +1129,18 @@ void GLSpectrum::applyChanges()
if (dv->m_channelMarker->getHighlighted()) if (dv->m_channelMarker->getHighlighted())
{ {
qreal xc; qreal xc;
int shift;
//ChannelMarker::sidebands_t sidebands = dv->m_channelMarker->getSidebands(); //ChannelMarker::sidebands_t sidebands = dv->m_channelMarker->getSidebands();
xc = m_centerFrequency + dv->m_channelMarker->getCenterFrequency(); // marker center frequency xc = m_centerFrequency + dv->m_channelMarker->getCenterFrequency(); // marker center frequency
QString ftext = QString::number((m_centerFrequency + dv->m_channelMarker->getCenterFrequency())/1e6, 'f', 6); 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);
} }
} }