VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2026-06-09 09:25:07 -04:00
Code Issues Projects Releases Wiki Activity

Fix assertion when removing all elements from model

Browse Source
This commit is contained in:
Jon Beniston
2021-04-13 10:14:54 +01:00
parent 6ad057e935
commit 53cccf7298
4 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/channelrx/demodadsb/adsbdemodgui.h
+11 -8
View File
@@ -378,14 +378,17 @@ public:
}
void removeAllAirports() {
beginRemoveRows(QModelIndex(), 0, m_airports.count());
m_airports.clear();
m_airportDataFreq.clear();
m_airportDataFreqRows.clear();
m_showFreq.clear();
m_azimuth.clear();
m_elevation.clear();
endRemoveRows();
if (m_airports.count() > 0)
{
beginRemoveRows(QModelIndex(), 0, m_airports.count() - 1);
m_airports.clear();
m_airportDataFreq.clear();
m_airportDataFreqRows.clear();
m_showFreq.clear();
m_azimuth.clear();
m_elevation.clear();
endRemoveRows();
}
}
int rowCount(const QModelIndex &parent = QModelIndex()) const override {
plugins/channelrx/demodvor/vordemodgui.h
+9 -6
View File
@@ -143,12 +143,15 @@ public:
}
void removeAllVORs() {
beginRemoveRows(QModelIndex(), 0, m_vors.count());
m_vors.clear();
m_selected.clear();
m_radials.clear();
m_vorGUIs.clear();
endRemoveRows();
if (m_vors.count() > 0)
{
beginRemoveRows(QModelIndex(), 0, m_vors.count() - 1);
m_vors.clear();
m_selected.clear();
m_radials.clear();
m_vorGUIs.clear();
endRemoveRows();
}
}
QHash<int, QByteArray> roleNames() const {
plugins/feature/map/mapgui.h
+7 -4
View File
@@ -351,10 +351,13 @@ public:
void removeAll()
{
beginRemoveRows(QModelIndex(), 0, m_items.count());
m_items.clear();
m_selected.clear();
endRemoveRows();
if (m_items.count() > 0)
{
beginRemoveRows(QModelIndex(), 0, m_items.count());
m_items.clear();
m_selected.clear();
endRemoveRows();
}
}
void setDisplayNames(bool displayNames)
plugins/feature/vorlocalizer/vorlocalizergui.h
+9 -6
View File
@@ -144,12 +144,15 @@ public:
}
void removeAllVORs() {
beginRemoveRows(QModelIndex(), 0, m_vors.count());
m_vors.clear();
m_selected.clear();
m_radials.clear();
m_vorGUIs.clear();
endRemoveRows();
if (m_vors.count() > 0)
{
beginRemoveRows(QModelIndex(), 0, m_vors.count() - 1);
m_vors.clear();
m_selected.clear();
m_radials.clear();
m_vorGUIs.clear();
endRemoveRows();
}
}
QHash<int, QByteArray> roleNames() const {