VE7UWU
/
sdrangel
mirror of https://github.com/f4exb/sdrangel.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Spectrum Markers: do not use QColorConstants. Added export for MSVC

This commit is contained in:
f4exb 2021-08-06 10:24:20 +02:00
parent 766647b754
commit 885bfb823f
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdrgui/CMakeLists.txt
View File

@ -59,6 +59,7 @@ set(sdrgui_SOURCES
gui/scaleengine.cpp gui/scaleengine.cpp
gui/scaledimage.cpp gui/scaledimage.cpp
gui/sdrangelsplash.cpp gui/sdrangelsplash.cpp
gui/spectrummarkers.cpp
gui/spectrummarkersdialog.cpp gui/spectrummarkersdialog.cpp
gui/tickedslider.cpp gui/tickedslider.cpp
gui/transverterbutton.cpp gui/transverterbutton.cpp

12
sdrgui/gui/glspectrum.cpp
View File

@ -1185,7 +1185,7 @@ void GLSpectrum::drawSpectrumMarkers()
QPointF ypoint = m_histogramMarkers.at(i).m_point; QPointF ypoint = m_histogramMarkers.at(i).m_point;
QString powerStr = m_histogramMarkers.at(i).m_powerStr; QString powerStr = m_histogramMarkers.at(i).m_powerStr;
if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarkerTypePower) if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypePower)
{ {
float power = m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin]; float power = m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin];
ypoint.ry() = ypoint.ry() =
@ -1200,7 +1200,7 @@ void GLSpectrum::drawSpectrumMarkers()
false false
); );
} }
else if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarkerTypePowerMax) else if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax)
{ {
float power = m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin]; float power = m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin];
@ -1262,17 +1262,17 @@ void GLSpectrum::drawSpectrumMarkers()
textColor.setAlpha(192); textColor.setAlpha(192);
float power0, poweri; float power0, poweri;
if (m_histogramMarkers.at(0).m_markerType == SpectrumHistogramMarkerTypePower) { if (m_histogramMarkers.at(0).m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypePower) {
power0 = m_currentSpectrum[m_histogramMarkers.at(0).m_fftBin]; power0 = m_currentSpectrum[m_histogramMarkers.at(0).m_fftBin];
} else if (m_histogramMarkers.at(0).m_markerType == SpectrumHistogramMarkerTypePowerMax) { } else if (m_histogramMarkers.at(0).m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax) {
power0 = m_histogramMarkers.at(0).m_powerMax; power0 = m_histogramMarkers.at(0).m_powerMax;
} else { } else {
power0 = m_linear ? m_histogramMarkers.at(0).m_power : CalcDb::dbPower(m_histogramMarkers.at(0).m_power); power0 = m_linear ? m_histogramMarkers.at(0).m_power : CalcDb::dbPower(m_histogramMarkers.at(0).m_power);
} }
if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarkerTypePower) { if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypePower) {
poweri = m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin]; poweri = m_currentSpectrum[m_histogramMarkers.at(i).m_fftBin];
} else if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarkerTypePowerMax) { } else if (m_histogramMarkers.at(i).m_markerType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax) {
poweri = m_histogramMarkers.at(i).m_powerMax; poweri = m_histogramMarkers.at(i).m_powerMax;
} else { } else {
poweri = m_linear ? m_histogramMarkers.at(i).m_power : CalcDb::dbPower(m_histogramMarkers.at(i).m_power); poweri = m_linear ? m_histogramMarkers.at(i).m_power : CalcDb::dbPower(m_histogramMarkers.at(i).m_power);

27
sdrgui/gui/spectrummarkers.h
View File

@ -25,21 +25,24 @@
#include <QPointF> #include <QPointF>
#include <QColor> #include <QColor>
enum SpectrumHistogramMarkerType { #include "export.h"
SpectrumHistogramMarkerTypeManual,
SpectrumHistogramMarkerTypePower,
SpectrumHistogramMarkerTypePowerMax
};
struct SpectrumHistogramMarker struct SDRGUI_API SpectrumHistogramMarker
{ {
enum SpectrumMarkerType
{
SpectrumMarkerTypeManual,
SpectrumMarkerTypePower,
SpectrumMarkerTypePowerMax
};
QPointF m_point; QPointF m_point;
float m_frequency; float m_frequency;
int m_fftBin; int m_fftBin;
float m_power; float m_power;
bool m_holdReset; bool m_holdReset;
float m_powerMax; float m_powerMax;
SpectrumHistogramMarkerType m_markerType; SpectrumMarkerType m_markerType;
QColor m_markerColor; QColor m_markerColor;
bool m_show; bool m_show;
QString m_frequencyStr; QString m_frequencyStr;
@ -55,8 +58,8 @@ struct SpectrumHistogramMarker
m_power(0), m_power(0),
m_holdReset(true), m_holdReset(true),
m_powerMax(0), m_powerMax(0),
m_markerType(SpectrumHistogramMarkerTypeManual), m_markerType(SpectrumMarkerTypeManual),
m_markerColor(QColorConstants::White), m_markerColor("white"),
m_show(true), m_show(true),
m_frequencyStr(), m_frequencyStr(),
m_powerStr(), m_powerStr(),
@ -71,7 +74,7 @@ struct SpectrumHistogramMarker
float power, float power,
bool holdReset, bool holdReset,
float powerMax, float powerMax,
SpectrumHistogramMarkerType markerType, SpectrumMarkerType markerType,
QColor markerColor, QColor markerColor,
bool show, bool show,
const QString& frequencyStr, const QString& frequencyStr,
@ -101,7 +104,7 @@ struct SpectrumHistogramMarker
bool deserialize(const QByteArray& data); bool deserialize(const QByteArray& data);
}; };
struct SpectrumWaterfallMarker struct SDRGUI_API SpectrumWaterfallMarker
{ {
QPointF m_point; QPointF m_point;
float m_frequency; float m_frequency;
@ -118,7 +121,7 @@ struct SpectrumWaterfallMarker
m_point(0, 0), m_point(0, 0),
m_frequency(0), m_frequency(0),
m_time(0), m_time(0),
m_markerColor(QColorConstants::White), m_markerColor("white"),
m_show(true), m_show(true),
m_frequencyStr(), m_frequencyStr(),
m_timeStr(), m_timeStr(),

4
sdrgui/gui/spectrummarkersdialog.cpp
View File

@ -264,10 +264,10 @@ void SpectrumMarkersDialog::on_powerMode_currentIndexChanged(int index)
return; return;
} }
SpectrumHistogramMarkerType newType = (SpectrumHistogramMarkerType) index; SpectrumHistogramMarker::SpectrumMarkerType newType = (SpectrumHistogramMarker::SpectrumMarkerType) index;
if ((m_histogramMarkers[m_histogramMarkerIndex].m_markerType != newType) if ((m_histogramMarkers[m_histogramMarkerIndex].m_markerType != newType)
&& (newType == SpectrumHistogramMarkerTypePowerMax)) && (newType == SpectrumHistogramMarker::SpectrumMarkerTypePowerMax))
{ {
m_histogramMarkers[m_histogramMarkerIndex].m_holdReset = true; m_histogramMarkers[m_histogramMarkerIndex].m_holdReset = true;
} }