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

mobile/divelist: create memory management class for models

Browse source 
Since we want to add a second model, but not have to manage two models
everywhere, create a class MobileModels that contains both of the models. When
calling reset() on that class, it will reset both of the models, etc.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Berthold Stoeger 2019-12-11 10:37:50 +01:00 • committed by Dirk Hohndel
parent 8e9e536ffd
commit 7e1ac2167b
4 changed files with 45 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

48
qt-models/mobilelistmodel.cpp
View file

@ -2,20 +2,9 @@
#include "mobilelistmodel.h"
#include "core/divelist.h" // for shown_dives
MobileListModel::MobileListModel(DiveTripModelBase *sourceIn) : source(sourceIn),
MobileListModel::MobileListModel(DiveTripModelBase *sourceIn) :
source(sourceIn),
expandedRow(-1)
{
connectSignals();
}
MobileListModel *MobileListModel::instance()
{
static DiveTripModelTree source;
static MobileListModel self(&source);
return &self;
}
void MobileListModel::connectSignals()
{
connect(source, &DiveTripModelBase::modelAboutToBeReset, this, &MobileListModel::beginResetModel);
connect(source, &DiveTripModelBase::modelReset, this, &MobileListModel::endResetModel);
@ -246,14 +235,6 @@ QVariant MobileListModel::data(const QModelIndex &index, int role) const
return source->data(mapToSource(index), role);
}
void MobileListModel::resetModel()
{
beginResetModel();
source->reset();
connectSignals();
endResetModel();
}
// Trivial helper to return and erase the last element of a stack
template<typename T>
static T pop(std::vector<T> &v)
@ -544,3 +525,28 @@ void MobileListModel::toggle(int row)
else
expand(row);
}
MobileModels *MobileModels::instance()
{
static MobileModels self;
return &self;
}
MobileModels::MobileModels() :
lm(&source)
{
}
MobileListModel *MobileModels::listModel()
{
return &lm;
}
void MobileModels::clear()
{
source.clear();
}
void MobileModels::reset()
{
source.reset();
}

16
qt-models/mobilelistmodel.h
View file

@ -45,8 +45,6 @@ public:
SelectedRole,
};
MobileListModel(DiveTripModelBase *source);
static MobileListModel *instance();
void resetModel();
void expand(int row);
void unexpand();
Q_INVOKABLE void toggle(int row);
@ -58,7 +56,6 @@ private:
bool visible;
int first, last;
};
void connectSignals();
std::vector<IndexRange> rangeStack;
QModelIndex sourceIndex(int row, int col, int parentRow = -1) const;
int numSubItems() const;
@ -93,6 +90,19 @@ private slots:
void changed(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles);
};
// This convenience class provides access to the two mobile models.
// Moreover, it provides an interface to the source trip-model.
class MobileModels {
public:
static MobileModels *instance();
MobileListModel *listModel();
void clear(); // Clear all dive data
void reset(); // Reset model after having reloaded the core data
private:
MobileModels();
DiveTripModelTree source;
MobileListModel lm;
};
// Helper functions - these are actually defined in DiveObjectHelper.cpp. Why declare them here?
QString formatSac(const dive *d);