mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup: use DiveTripModelBase::clear() to reset the log

Browse source 
Introduce a DiveTripModelBase::clear() function that cleanly
clears all dive data inside a beginResetModel()/endResetModel()
pair. Thus, the UI will be cleanly reset and we can remove
explicit calls to
 - graphics->setEmptyState()
 - mainTab->clearTabs()
 - mainTab->clearTabs()
 - diveList->reload()
from MainWindow::closeCurrentFile().

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-11-15 20:59:13 +01:00 • committed by Dirk Hohndel
parent f0a89759bf
commit 8a33c04894
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
desktop-widgets/mainwindow.cpp
View file

@ -657,12 +657,8 @@ void MainWindow::closeCurrentFile()
{ {
/* free the dives and trips */ /* free the dives and trips */
clear_git_id(); clear_git_id();
clear_dive_file_data(); DiveTripModelBase::instance()->clear();
setCurrentFile(nullptr); setCurrentFile(nullptr);
graphics->setEmptyState();
mainTab->clearTabs();
mainTab->updateDiveInfo();
diveList->reload();
diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder); diveList->setSortOrder(DiveTripModelBase::NR, Qt::DescendingOrder);
MapWidget::instance()->reload(); MapWidget::instance()->reload();
LocationInformationModel::instance()->update(); LocationInformationModel::instance()->update();

7
qt-models/divetripmodel.cpp
View file

@ -372,6 +372,13 @@ void DiveTripModelBase::resetModel(DiveTripModelBase::Layout layout)
currentModel.reset(new DiveTripModelList); currentModel.reset(new DiveTripModelList);
} }
void DiveTripModelBase::clear()
{
beginResetModel();
clear_dive_file_data();
endResetModel();
}
DiveTripModelBase::DiveTripModelBase(QObject *parent) : QAbstractItemModel(parent) DiveTripModelBase::DiveTripModelBase(QObject *parent) : QAbstractItemModel(parent)
{ {
} }

3
qt-models/divetripmodel.h
View file

@ -70,6 +70,9 @@ public:
// by instance(). // by instance().
static void resetModel(Layout layout); static void resetModel(Layout layout);
// Clear all dives
void clear();
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;