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

Dive list: update trip headers on filter-finish

Browse source 
On change of the filter, the headers of non-extended trips were not
updated. Therefore, on filter-finish-event loop over all trips
in DiveTripModel and signal data-changed.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2018-10-19 13:33:35 +02:00 • committed by Lubomir I. Ivanov
parent bca9c8f88c
commit 2f81890f49
2 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
qt-models/divetripmodel.cpp
View file

@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "qt-models/divetripmodel.h" #include "qt-models/divetripmodel.h"
#include "qt-models/filtermodels.h"
#include "core/gettextfromc.h" #include "core/gettextfromc.h"
#include "core/metrics.h" #include "core/metrics.h"
#include "core/divelist.h" #include "core/divelist.h"
@ -319,6 +320,9 @@ DiveTripModel::DiveTripModel(QObject *parent) :
connect(&diveListNotifier, &DiveListNotifier::divesSelected, this, &DiveTripModel::divesSelected); connect(&diveListNotifier, &DiveListNotifier::divesSelected, this, &DiveTripModel::divesSelected);
connect(&diveListNotifier, &DiveListNotifier::divesDeselected, this, &DiveTripModel::divesDeselected); connect(&diveListNotifier, &DiveListNotifier::divesDeselected, this, &DiveTripModel::divesDeselected);
connect(&diveListNotifier, &DiveListNotifier::currentDiveChanged, this, &DiveTripModel::currentDiveChanged); connect(&diveListNotifier, &DiveListNotifier::currentDiveChanged, this, &DiveTripModel::currentDiveChanged);
// Update trip headers if filter finished
connect(MultiFilterSortModel::instance(), &MultiFilterSortModel::filterFinished, this, &DiveTripModel::filterFinished);
} }
int DiveTripModel::columnCount(const QModelIndex&) const int DiveTripModel::columnCount(const QModelIndex&) const
@ -1095,3 +1099,15 @@ void DiveTripModel::currentDiveChanged()
emit newCurrentDive(createIndex(diveIdx, 0, idx)); emit newCurrentDive(createIndex(diveIdx, 0, idx));
} }
} }
void DiveTripModel::filterFinished()
{
// If the filter finished, update all trip items to show the correct number of displayed dives
// in each trip. Without doing this, only trip headers of expanded trips were updated.
if (currentLayout == LIST)
return; // No trips in list mode
for (int idx = 0; idx < (int)items.size(); ++idx) {
QModelIndex tripIndex = createIndex(idx, 0, noParent);
dataChanged(tripIndex, tripIndex);
}
}

1
qt-models/divetripmodel.h
View file

@ -75,6 +75,7 @@ private slots:
void divesSelected(dive_trip *trip, const QVector<dive *> &dives); void divesSelected(dive_trip *trip, const QVector<dive *> &dives);
void divesDeselected(dive_trip *trip, const QVector<dive *> &dives); void divesDeselected(dive_trip *trip, const QVector<dive *> &dives);
void currentDiveChanged(); void currentDiveChanged();
void filterFinished();
private: private:
// The model has up to two levels. At the top level, we have either trips or dives // The model has up to two levels. At the top level, we have either trips or dives
// that do not belong to trips. Such a top-level item is represented by the "Item" // that do not belong to trips. Such a top-level item is represented by the "Item"