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

Merge pull request #841 from srcejon/fix_table_clear_assertion

Browse Source 
Fix assertion when removing all elements from model
This commit is contained in:
Edouard Griffiths 2021-04-13 22:53:48 +02:00 committed by GitHub
commit cd0fc3dfd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/channelrx/demodadsb/adsbdemodgui.h
View File

@ -378,7 +378,9 @@ public:
} }
void removeAllAirports() { void removeAllAirports() {
beginRemoveRows(QModelIndex(), 0, m_airports.count()); if (m_airports.count() > 0)
{
beginRemoveRows(QModelIndex(), 0, m_airports.count() - 1);
m_airports.clear(); m_airports.clear();
m_airportDataFreq.clear(); m_airportDataFreq.clear();
m_airportDataFreqRows.clear(); m_airportDataFreqRows.clear();
@ -387,6 +389,7 @@ public:
m_elevation.clear(); m_elevation.clear();
endRemoveRows(); endRemoveRows();
} }
}
int rowCount(const QModelIndex &parent = QModelIndex()) const override { int rowCount(const QModelIndex &parent = QModelIndex()) const override {
Q_UNUSED(parent) Q_UNUSED(parent)

5
plugins/channelrx/demodvor/vordemodgui.h
View File

@ -143,13 +143,16 @@ public:
} }
void removeAllVORs() { void removeAllVORs() {
beginRemoveRows(QModelIndex(), 0, m_vors.count()); if (m_vors.count() > 0)
{
beginRemoveRows(QModelIndex(), 0, m_vors.count() - 1);
m_vors.clear(); m_vors.clear();
m_selected.clear(); m_selected.clear();
m_radials.clear(); m_radials.clear();
m_vorGUIs.clear(); m_vorGUIs.clear();
endRemoveRows(); endRemoveRows();
} }
}
QHash<int, QByteArray> roleNames() const { QHash<int, QByteArray> roleNames() const {
QHash<int, QByteArray> roles; QHash<int, QByteArray> roles;

3
plugins/feature/map/mapgui.h
View File

@ -350,12 +350,15 @@ public:
} }
void removeAll() void removeAll()
{
if (m_items.count() > 0)
{ {
beginRemoveRows(QModelIndex(), 0, m_items.count()); beginRemoveRows(QModelIndex(), 0, m_items.count());
m_items.clear(); m_items.clear();
m_selected.clear(); m_selected.clear();
endRemoveRows(); endRemoveRows();
} }
}
void setDisplayNames(bool displayNames) void setDisplayNames(bool displayNames)
{ {

5
plugins/feature/vorlocalizer/vorlocalizergui.h
View File

@ -144,13 +144,16 @@ public:
} }
void removeAllVORs() { void removeAllVORs() {
beginRemoveRows(QModelIndex(), 0, m_vors.count()); if (m_vors.count() > 0)
{
beginRemoveRows(QModelIndex(), 0, m_vors.count() - 1);
m_vors.clear(); m_vors.clear();
m_selected.clear(); m_selected.clear();
m_radials.clear(); m_radials.clear();
m_vorGUIs.clear(); m_vorGUIs.clear();
endRemoveRows(); endRemoveRows();
} }
}
QHash<int, QByteArray> roleNames() const { QHash<int, QByteArray> roleNames() const {
QHash<int, QByteArray> roles; QHash<int, QByteArray> roles;