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 trip model: send changed signals for top-level items

Browse source 
Send signals if the shown-status of top level items changed.
Do this in two passes to be able to use the previously created
function.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2019-11-19 21:54:18 +01:00 • committed by bstoeger
parent 4ca65894c8
commit c54e58e078
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
qt-models/divetripmodel.cpp
View file

@ -714,7 +714,7 @@ void DiveTripModelBase::sendShownChangedSignals(const std::vector<char> &changed
// which will then be hidden and all the dives will be hidden implicitly as well. // which will then be hidden and all the dives will be hidden implicitly as well.
// Thus, do this in two passes: collect changed dives and only if any dive is visible, // Thus, do this in two passes: collect changed dives and only if any dive is visible,
// send the signals. // send the signals.
bool DiveTripModelTree::calculateFilterForTrip(const std::vector<dive *> &dives, const DiveFilter *filter, int parentIndex) bool DiveTripModelTree::calculateFilterForTrip(const std::vector<dive *> &dives, const DiveFilter *filter, quintptr parentIndex)
{ {
bool showTrip = false; bool showTrip = false;
std::vector<char> changed; std::vector<char> changed;
@ -733,6 +733,13 @@ bool DiveTripModelTree::calculateFilterForTrip(const std::vector<dive *> &dives,
void DiveTripModelTree::recalculateFilter() void DiveTripModelTree::recalculateFilter()
{ {
// Collect the changes in a vector used later to send signals.
// This could be solved more efficiently in one pass, but
// doing it in two passes allows us to use a common function without
// resorting to co-routines, lambdas or similar techniques.
std::vector<char> changed;
changed.reserve(items.size());
{ {
// This marker prevents the UI from getting notifications on selection changes. // This marker prevents the UI from getting notifications on selection changes.
// It is active until the end of the scope. // It is active until the end of the scope.
@ -743,8 +750,10 @@ void DiveTripModelTree::recalculateFilter()
// as a consequence of the filterReset signal right after the local scope. // as a consequence of the filterReset signal right after the local scope.
auto marker = diveListNotifier.enterCommand(); auto marker = diveListNotifier.enterCommand();
DiveFilter *filter = DiveFilter::instance(); DiveFilter *filter = DiveFilter::instance();
for (size_t i = 0; i < items.size(); ++i) { for (size_t i = 0; i < items.size(); ++i) {
Item &item = items[i]; Item &item = items[i];
bool oldShown = item.shown;
if (item.d_or_t.dive) { if (item.d_or_t.dive) {
dive *d = item.d_or_t.dive; dive *d = item.d_or_t.dive;
item.shown = filter->showDive(item.d_or_t.dive); item.shown = filter->showDive(item.d_or_t.dive);
@ -753,9 +762,13 @@ void DiveTripModelTree::recalculateFilter()
// Trips are shown if any of the dives is shown // Trips are shown if any of the dives is shown
item.shown = calculateFilterForTrip(item.dives, filter, i); item.shown = calculateFilterForTrip(item.dives, filter, i);
} }
changed.push_back(item.shown != oldShown);
} }
} }
// Send the data-changed signals if some items changed visibility.
sendShownChangedSignals(changed, noParent);
// Rerender all trip headers. TODO: be smarter about this and only rerender if the number // Rerender all trip headers. TODO: be smarter about this and only rerender if the number
// of shown dives changed. // of shown dives changed.
for (int idx = 0; idx < (int)items.size(); ++idx) { for (int idx = 0; idx < (int)items.size(); ++idx) {

2
qt-models/divetripmodel.h
View file

@ -133,7 +133,7 @@ private:
void recalculateFilter(); void recalculateFilter();
void divesChangedTrip(dive_trip *trip, const QVector<dive *> &dives); void divesChangedTrip(dive_trip *trip, const QVector<dive *> &dives);
void divesTimeChangedTrip(dive_trip *trip, timestamp_t delta, const QVector<dive *> &dives); void divesTimeChangedTrip(dive_trip *trip, timestamp_t delta, const QVector<dive *> &dives);
bool calculateFilterForTrip(const std::vector<dive *> &dives, const DiveFilter *filter, int parentIndex); bool calculateFilterForTrip(const std::vector<dive *> &dives, const DiveFilter *filter, quintptr parentIndex);
// The tree model has two levels. At the top level, we have either trips or dives // The tree model has 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"