VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-01 21:54:55 -04:00
Code Issues Projects Releases Wiki Activity

Fix compilation warnings and errors

Browse Source
This commit is contained in:
DreamNik
2024-09-03 18:38:32 +03:00
parent 027d6af6bb
commit f694ba04b8
104 changed files with 108 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sdrgui/gui/glscope.cpp
+4 -5
View File
@@ -858,7 +858,6 @@ void GLScope::paintGL()
void GLScope::drawMarkers()
{
QVector4D markerColor(1.0f, 1.0f, 1.0f, 0.3f);
QVector4D markerTextColor(1.0f, 1.0f, 1.0f, 0.8f);
if ((m_markers1.size() > 0) && ((m_displayMode == DisplayX) || (m_displayMode == DisplayXYH) || (m_displayMode == DisplayXYV))) // Draw markers1
{
@@ -2397,13 +2396,13 @@ QString GLScope::displayScaled(float value, char type, int precision)
}
else
{
if (posValue < 1000) {
if (posValue < 1000.0f) {
return tr("%1").arg(QString::number(value, type, precision));
} else if (posValue < 1000000) {
} else if (posValue < 1000000.0f) {
return tr("%1k").arg(QString::number(value / 1000.0, type, precision));
} else if (posValue < 1000000000) {
} else if (posValue < 1000000000.0f) {
return tr("%1M").arg(QString::number(value / 1000000.0, type, precision));
} else if (posValue < 1000000000000) {
} else if (posValue < 1000000000000.0f) {
return tr("%1G").arg(QString::number(value / 1000000000.0, type, precision));
} else {
return tr("%1").arg(QString::number(value, 'e', precision));