mirror of https://github.com/f4exb/sdrangel.git
Fix compiler warnings.
This commit is contained in:
parent
8d57e040ff
commit
20371ae8fc
Before Width: | Height: | Size: 915 KiB After Width: | Height: | Size: 915 KiB |
|
@ -468,12 +468,18 @@ void SIDGUI::applyAllSettings()
|
||||||
|
|
||||||
void SIDGUI::chartSplitterMoved(int pos, int index)
|
void SIDGUI::chartSplitterMoved(int pos, int index)
|
||||||
{
|
{
|
||||||
|
(void) pos;
|
||||||
|
(void) index;
|
||||||
|
|
||||||
m_settings.m_chartSplitterSizes = ui->chartSplitter->sizes();
|
m_settings.m_chartSplitterSizes = ui->chartSplitter->sizes();
|
||||||
applySetting("chartSplitterSizes");
|
applySetting("chartSplitterSizes");
|
||||||
}
|
}
|
||||||
|
|
||||||
void SIDGUI::sdoSplitterMoved(int pos, int index)
|
void SIDGUI::sdoSplitterMoved(int pos, int index)
|
||||||
{
|
{
|
||||||
|
(void) pos;
|
||||||
|
(void) index;
|
||||||
|
|
||||||
m_settings.m_sdoSplitterSizes = ui->sdoSplitter->sizes();
|
m_settings.m_sdoSplitterSizes = ui->sdoSplitter->sizes();
|
||||||
applySetting("chartSplitterSizes");
|
applySetting("chartSplitterSizes");
|
||||||
}
|
}
|
||||||
|
@ -1153,7 +1159,6 @@ void SIDGUI::showContextMenu(QContextMenuEvent *contextEvent)
|
||||||
|
|
||||||
if (chartView)
|
if (chartView)
|
||||||
{
|
{
|
||||||
qreal closestDistance;
|
|
||||||
int closestPoint;
|
int closestPoint;
|
||||||
|
|
||||||
if (m_grbSeries && findClosestPoint(contextEvent, chartView->chart(), m_grbSeries, closestPoint)) {
|
if (m_grbSeries && findClosestPoint(contextEvent, chartView->chart(), m_grbSeries, closestPoint)) {
|
||||||
|
@ -1589,7 +1594,8 @@ void SIDGUI::xRayDataUpdated(const QList<GOESXRay::XRayData>& data, bool primary
|
||||||
{
|
{
|
||||||
if (!start.isValid() || (measurement.m_dateTime > start))
|
if (!start.isValid() || (measurement.m_dateTime > start))
|
||||||
{
|
{
|
||||||
ChannelMeasurement* measurements = nullptr;
|
ChannelMeasurement* measurements;
|
||||||
|
|
||||||
switch (measurement.m_band)
|
switch (measurement.m_band)
|
||||||
{
|
{
|
||||||
case GOESXRay::XRayData::SHORT:
|
case GOESXRay::XRayData::SHORT:
|
||||||
|
@ -1598,6 +1604,9 @@ void SIDGUI::xRayDataUpdated(const QList<GOESXRay::XRayData>& data, bool primary
|
||||||
case GOESXRay::XRayData::LONG:
|
case GOESXRay::XRayData::LONG:
|
||||||
measurements = &m_xrayLongMeasurements[idx];
|
measurements = &m_xrayLongMeasurements[idx];
|
||||||
break;
|
break;
|
||||||
|
default:
|
||||||
|
measurements = nullptr;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
// Ignore flux measurements of 0, as log10(0) is -Inf
|
// Ignore flux measurements of 0, as log10(0) is -Inf
|
||||||
if (measurements && (measurement.m_flux != 0.0))
|
if (measurements && (measurement.m_flux != 0.0))
|
||||||
|
@ -1613,7 +1622,10 @@ void SIDGUI::xRayDataUpdated(const QList<GOESXRay::XRayData>& data, bool primary
|
||||||
|
|
||||||
void SIDGUI::protonDataUpdated(const QList<GOESXRay::ProtonData>& data, bool primary)
|
void SIDGUI::protonDataUpdated(const QList<GOESXRay::ProtonData>& data, bool primary)
|
||||||
{
|
{
|
||||||
|
(void) primary;
|
||||||
|
|
||||||
QDateTime start;
|
QDateTime start;
|
||||||
|
|
||||||
if (m_protonMeasurements[0].m_measurements.size() > 0) {
|
if (m_protonMeasurements[0].m_measurements.size() > 0) {
|
||||||
start = m_protonMeasurements[0].m_measurements.last().m_dateTime;
|
start = m_protonMeasurements[0].m_measurements.last().m_dateTime;
|
||||||
}
|
}
|
||||||
|
@ -1678,12 +1690,7 @@ void SIDGUI::grbDataUpdated(const QList<GRB::Data>& data)
|
||||||
|
|
||||||
void SIDGUI::sdoImageUpdated(const QImage& image)
|
void SIDGUI::sdoImageUpdated(const QImage& image)
|
||||||
{
|
{
|
||||||
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
|
bool setSize = ui->sdoImage->pixmap(Qt::ReturnByValueConstant()).isNull();
|
||||||
const QPixmap *currentPixmap = ui->sdoImage->pixmap();
|
|
||||||
bool setSize = (currentPixmap == nullptr) || currentPixmap->isNull();
|
|
||||||
#else
|
|
||||||
bool setSize = ui->sdoImage->pixmap().isNull();
|
|
||||||
#endif
|
|
||||||
|
|
||||||
QPixmap pixmap;
|
QPixmap pixmap;
|
||||||
pixmap.convertFromImage(image);
|
pixmap.convertFromImage(image);
|
||||||
|
|
|
@ -135,7 +135,7 @@ void SIDSettingsDialog::getChannels(QStringList& ids, QStringList& titles)
|
||||||
{
|
{
|
||||||
DeviceSet *deviceSet = deviceSets[deviceSetIndex];
|
DeviceSet *deviceSet = deviceSets[deviceSetIndex];
|
||||||
|
|
||||||
for (unsigned int channelIndex = 0; channelIndex < deviceSet->getNumberOfChannels(); channelIndex++)
|
for (int channelIndex = 0; channelIndex < deviceSet->getNumberOfChannels(); channelIndex++)
|
||||||
{
|
{
|
||||||
QString title;
|
QString title;
|
||||||
ChannelWebAPIUtils::getChannelSetting(deviceSetIndex, channelIndex, "title", title);
|
ChannelWebAPIUtils::getChannelSetting(deviceSetIndex, channelIndex, "title", title);
|
||||||
|
|
Loading…
Reference in New Issue