VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2025-08-05 07:22:24 -04:00
Code Issues Projects Releases Wiki Activity

Fix gcc warnings

Browse Source
This commit is contained in:
Jon Beniston 2022-09-28 19:47:44 +01:00
parent 2d43a5515e
commit f5a9d38616
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
sdrgui/gui/spectrummeasurements.cpp
View File

@ -167,6 +167,7 @@ const QStringList SpectrumMeasurements::m_tooltips = {
SpectrumMeasurements::SpectrumMeasurements(QWidget *parent) : SpectrumMeasurements::SpectrumMeasurements(QWidget *parent) :
QWidget(parent), QWidget(parent),
m_measurement(SpectrumSettings::MeasurementPeaks),
m_table(nullptr), m_table(nullptr),
m_peakTable(nullptr) m_peakTable(nullptr)
{ {
@ -384,8 +385,6 @@ void SpectrumMeasurements::tableContextMenu(QPoint pos)
QTableWidgetItem *item = m_table->itemAt(pos); QTableWidgetItem *item = m_table->itemAt(pos);
if (item) if (item)
{ {
int row = item->row();
QMenu* tableContextMenu = new QMenu(m_table); QMenu* tableContextMenu = new QMenu(m_table);
connect(tableContextMenu, &QMenu::aboutToHide, tableContextMenu, &QMenu::deleteLater); connect(tableContextMenu, &QMenu::aboutToHide, tableContextMenu, &QMenu::deleteLater);
@ -408,8 +407,6 @@ void SpectrumMeasurements::peakTableContextMenu(QPoint pos)
QTableWidgetItem *item = m_peakTable->itemAt(pos); QTableWidgetItem *item = m_peakTable->itemAt(pos);
if (item) if (item)
{ {
int row = item->row();
QMenu* tableContextMenu = new QMenu(m_peakTable); QMenu* tableContextMenu = new QMenu(m_peakTable);
connect(tableContextMenu, &QMenu::aboutToHide, tableContextMenu, &QMenu::deleteLater); connect(tableContextMenu, &QMenu::aboutToHide, tableContextMenu, &QMenu::deleteLater);
@ -458,35 +455,40 @@ void SpectrumMeasurements::resizePeakTable()
void SpectrumMeasurements::setMeasurementParams(SpectrumSettings::Measurement measurement, int peaks) void SpectrumMeasurements::setMeasurementParams(SpectrumSettings::Measurement measurement, int peaks)
{ {
// Tried using setVisible(), but that would hang, so delete and recreate if ((measurement != m_measurement) || ((m_peakTable == nullptr) && (m_table == nullptr)))
delete m_peakTable;
m_peakTable = nullptr;
delete m_table;
m_table = nullptr;
switch (measurement)
{ {
case SpectrumSettings::MeasurementPeaks: // Tried using setVisible(), but that would hang, so delete and recreate
createPeakTable(peaks); delete m_peakTable;
layout()->addWidget(m_peakTable); m_peakTable = nullptr;
break; delete m_table;
case SpectrumSettings::MeasurementChannelPower: m_table = nullptr;
reset();
createChannelPowerTable(); m_measurement = measurement;
layout()->addWidget(m_table);
break; switch (measurement)
case SpectrumSettings::MeasurementAdjacentChannelPower: {
reset(); case SpectrumSettings::MeasurementPeaks:
createAdjacentChannelPowerTable(); createPeakTable(peaks);
layout()->addWidget(m_table); layout()->addWidget(m_peakTable);
break; break;
case SpectrumSettings::MeasurementSNR: case SpectrumSettings::MeasurementChannelPower:
reset(); reset();
createSNRTable(); createChannelPowerTable();
layout()->addWidget(m_table); layout()->addWidget(m_table);
break; break;
default: case SpectrumSettings::MeasurementAdjacentChannelPower:
break; reset();
createAdjacentChannelPowerTable();
layout()->addWidget(m_table);
break;
case SpectrumSettings::MeasurementSNR:
reset();
createSNRTable();
layout()->addWidget(m_table);
break;
default:
break;
}
} }
} }
@ -605,6 +607,6 @@ void SpectrumMeasurements::setAdjacentChannelPower(float left, float leftACPR, f
void SpectrumMeasurements::setPeak(int peak, int64_t frequency, float power) void SpectrumMeasurements::setPeak(int peak, int64_t frequency, float power)
{ {
m_peakTable->item(peak, COL_FREQUENCY)->setData(Qt::DisplayRole, frequency); m_peakTable->item(peak, COL_FREQUENCY)->setData(Qt::DisplayRole, QVariant((qlonglong)frequency));
m_peakTable->item(peak, COL_POWER)->setData(Qt::DisplayRole, power); m_peakTable->item(peak, COL_POWER)->setData(Qt::DisplayRole, power);
} }

2
sdrgui/gui/spectrummeasurements.h
View File

@ -110,6 +110,8 @@ private:
void updateMeasurement(int row, float value); void updateMeasurement(int row, float value);
bool checkSpec(const QString &spec, double value) const; bool checkSpec(const QString &spec, double value) const;
SpectrumSettings::Measurement m_measurement;
QTableWidget *m_table; QTableWidget *m_table;
QMenu *m_rowMenu; QMenu *m_rowMenu;
QMenu *m_columnMenu; QMenu *m_columnMenu;