VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-05-25 03:32:29 -04:00
Code Issues Projects Releases Wiki Activity

Scope: fixed power overlay display

Browse Source
This commit is contained in:
f4exb 2018-07-08 13:07:21 +02:00
parent ea780d72c4
commit 8a9e9da550
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sdrgui/gui/glscopeng.cpp
View File

@ -1911,17 +1911,18 @@ void GLScopeNG::drawChannelOverlay(
} }
QFontMetricsF metrics(m_channelOverlayFont); QFontMetricsF metrics(m_channelOverlayFont);
QRectF rect = metrics.boundingRect(text); QRectF textRect = metrics.boundingRect(text);
channelOverlayPixmap = QPixmap(rect.width() + 4.0f, rect.height()); QRectF overlayRect(0, 0, textRect.width()*1.05f + 4.0f, textRect.height());
channelOverlayPixmap = QPixmap(overlayRect.width(), overlayRect.height());
channelOverlayPixmap.fill(Qt::transparent); channelOverlayPixmap.fill(Qt::transparent);
QPainter painter(&channelOverlayPixmap); QPainter painter(&channelOverlayPixmap);
painter.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing, false); painter.setRenderHints(QPainter::Antialiasing|QPainter::TextAntialiasing, false);
painter.fillRect(rect, QColor(0, 0, 0, 0x80)); painter.fillRect(overlayRect, QColor(0, 0, 0, 0x80));
QColor textColor(color); QColor textColor(color);
textColor.setAlpha(0xC0); textColor.setAlpha(0xC0);
painter.setPen(textColor); painter.setPen(textColor);
painter.setFont(m_channelOverlayFont); painter.setFont(m_channelOverlayFont);
painter.drawText(QPointF(0, rect.height() - 2.0f), text); painter.drawText(QPointF(2.0f, overlayRect.height() - 4.0f), text);
painter.end(); painter.end();
m_glShaderPowerOverlay.initTexture(channelOverlayPixmap.toImage()); m_glShaderPowerOverlay.initTexture(channelOverlayPixmap.toImage());
@ -1940,11 +1941,12 @@ void GLScopeNG::drawChannelOverlay(
0, 0 0, 0
}; };
float shiftX = glScopeRect.width() - ((rect.width() + 4.0f) / width()); float shiftX = glScopeRect.width() - ((overlayRect.width() + 4.0f) / width());
float shiftY = 4.0f / height();
float rectX = glScopeRect.x() + shiftX; float rectX = glScopeRect.x() + shiftX;
float rectY = glScopeRect.y(); float rectY = glScopeRect.y() + shiftY;
float rectW = rect.width() / (float) width(); float rectW = overlayRect.width() / (float) width();
float rectH = rect.height() / (float) height(); float rectH = overlayRect.height() / (float) height();
QMatrix4x4 mat; QMatrix4x4 mat;
mat.setToIdentity(); mat.setToIdentity();