mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
fb6210a99a
To reset the core data structures, the mobile and desktop UIs were calling into the dive-list models, which then reset the core data structures, themselves and the unrelated locationinformation model. The UI code then reset various other things, such as the TankInformation model or the map. . This was unsatisfying from a control-flow perspective, as the models should display the core data, not act on it. Moreover, this meant lots of intricate intermodule-dependencies. Thus, straighten up the control flow: give the C core the possibility to send a "all data reset" event. And do that in those functions that reset the core data structures. Let each module react to this event by itself. This removes inter-module dependencies. For example, the MainWindow now doesn't have to reset the TankInfoModel or the MapWidget. Then, to reset the core data structures, let the UI code simply directly call the respective core functions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
66 lines
2 KiB
C++
66 lines
2 KiB
C++
// SPDX-License-Identifier: GPL-2.0
|
|
#include "qt-models/filtermodels.h"
|
|
#include "core/display.h"
|
|
#include "core/qthelper.h"
|
|
#include "core/trip.h"
|
|
#include "core/subsurface-string.h"
|
|
#include "core/subsurface-qt/divelistnotifier.h"
|
|
#include "qt-models/divetripmodel.h"
|
|
#include "qt-models/divelocationmodel.h"
|
|
|
|
MultiFilterSortModel *MultiFilterSortModel::instance()
|
|
{
|
|
static MultiFilterSortModel self;
|
|
return &self;
|
|
}
|
|
|
|
MultiFilterSortModel::MultiFilterSortModel(QObject *parent) : QSortFilterProxyModel(parent)
|
|
{
|
|
resetModel(DiveTripModelBase::TREE);
|
|
}
|
|
|
|
void MultiFilterSortModel::resetModel(DiveTripModelBase::Layout layout)
|
|
{
|
|
if (layout == DiveTripModelBase::TREE)
|
|
model.reset(new DiveTripModelTree);
|
|
else
|
|
model.reset(new DiveTripModelList);
|
|
|
|
setSourceModel(model.get());
|
|
connect(model.get(), &DiveTripModelBase::selectionChanged, this, &MultiFilterSortModel::selectionChangedSlot);
|
|
connect(model.get(), &DiveTripModelBase::currentDiveChanged, this, &MultiFilterSortModel::currentDiveChangedSlot);
|
|
model->initSelection();
|
|
LocationInformationModel::instance()->update();
|
|
}
|
|
|
|
// Translate selection into local indices and re-emit signal
|
|
void MultiFilterSortModel::selectionChangedSlot(const QVector<QModelIndex> &indices)
|
|
{
|
|
QVector<QModelIndex> indicesLocal;
|
|
indicesLocal.reserve(indices.size());
|
|
for (const QModelIndex &index: indices) {
|
|
QModelIndex local = mapFromSource(index);
|
|
if (local.isValid())
|
|
indicesLocal.push_back(local);
|
|
}
|
|
emit selectionChanged(indicesLocal);
|
|
}
|
|
|
|
// Translate current dive into local indices and re-emit signal
|
|
void MultiFilterSortModel::currentDiveChangedSlot(QModelIndex index)
|
|
{
|
|
QModelIndex local = mapFromSource(index);
|
|
if (local.isValid())
|
|
emit currentDiveChanged(mapFromSource(index));
|
|
}
|
|
|
|
bool MultiFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
bool MultiFilterSortModel::lessThan(const QModelIndex &i1, const QModelIndex &i2) const
|
|
{
|
|
// Hand sorting down to the source model.
|
|
return model->lessThan(i1, i2);
|
|
}
|