mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-01-19 14:25:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Mobile: replace model-reset by row-addition in DiveListModel::reload()

Browse source 
Owing to apparent QML breakage, a model-reset leads to the DiveDetail
page being reloaded for every dive in the list(!). Therefore, add
rows instead.

This leads to extremely subtle code, as it is now imperative that
the model has been properly cleared beforehand. Nevertheless, for
now we have to do this to fix a severe performance regression.

Fixes #2295

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-09-26 13:47:49 +02:00 • committed by Dirk Hohndel
parent 649ac1f83a
commit eecca6aab0
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mobile-widgets/qml/DownloadFromDiveComputer.qml
View file

@ -391,7 +391,7 @@ Kirigami.Page {
manager.appendTextToLog("Save downloaded dives that were selected")
importModel.recordDives()
manager.saveChangesLocal()
diveModel.reload()
diveModel.resetInternaData()
pageStack.pop();
download.text = qsTr("Download")
divesDownloaded = false

14
qt-models/divelistmodel.cpp
View file

@ -73,7 +73,7 @@ int DiveListSortModel::getIdxForId(int id)
void DiveListSortModel::reload()
{
DiveListModel *mySourceModel = qobject_cast<DiveListModel *>(sourceModel());
mySourceModel->reload();
mySourceModel->resetInternalData();
}
// In QtQuick ListView, section headings can only be strings. To identify dives
@ -180,8 +180,16 @@ void DiveListModel::clear()
void DiveListModel::reload()
{
beginResetModel();
endResetModel();
// Note: instead of doing a (logical) beginResetModel()/endResetModel(),
// we add the rows (if any). The reason is that a beginResetModel()/endResetModel()
// pair resulted in the DiveDetailsPage being renedered for *every* dive in
// the list. It is unclear whether this is a Qt-bug or intended insanity.
// Therefore, this function must only be called after having called clear().
// Otherwise the model will become inconsistent!
if (dive_table.nr > 0) {
beginInsertRows(QModelIndex(), 0, dive_table.nr - 1);
endInsertRows();
}
}
void DiveListModel::resetInternalData()

2
qt-models/divelistmodel.h
View file

@ -53,7 +53,7 @@ public:
void removeDive(int i);
void removeDiveById(int id);
void updateDive(int i, dive *d);
void reload();
void reload(); // Only call after clearing the model!
struct dive *getDive(int i);
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int getDiveIdx(int id) const;