1 files changed, 34 insertions, 4 deletions

diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 1d4a9a2a0..55ba37a5c 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -691,14 +691,43 @@ dive *DiveTripModelTree::diveOrNull(const QModelIndex &index) const
 	return tripOrDive(index).dive;
 }
 
-static bool calculateFilterForTrip(const std::vector<dive *> &dives, const DiveFilter *filter)
+// Send data changed signals blockwise. Which entries are changed is collected
+// in the first parameter "changed".
+void DiveTripModelBase::sendShownChangedSignals(const std::vector<char> &changed, quintptr parentIndex)
+{
+	static const QVector<int> roles { SHOWN_ROLE };
+	for (size_t i = 0; i < changed.size(); ++i) {
+		// Find first and last block of changed items
+		if (!changed[i])
+			continue;
+		size_t j;
+		for (j = i + 1; j < changed.size() && changed[j]; ++j)
+			; // Pass
+		dataChanged(createIndex(i, 0, parentIndex), createIndex(j - 1, 0, parentIndex), roles);
+		i = j - 1;
+	}
+}
+
+// Applying the filter to trip-items is a bit tricky:
+// We only want to send changed-signals if one of the dives remains visible.
+// Because if no dive remains visible, we'll simply send a signal on the parent trip,
+// 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,
+// send the signals.
+bool DiveTripModelTree::calculateFilterForTrip(const std::vector<dive *> &dives, const DiveFilter *filter, int parentIndex)
 {
 	bool showTrip = false;
+	std::vector<char> changed;
+	changed.reserve(dives.size());
 	for (dive *d: dives) {
 		bool shown = filter->showDive(d);
-		filter_dive(d, shown);
+		changed.push_back(filter_dive(d, shown));
 		showTrip |= shown;
 	}
+
+	// If any dive is shown, send changed-signals
+	if (showTrip)
+		sendShownChangedSignals(changed, parentIndex);
 	return showTrip;
 }
 
@@ -714,14 +743,15 @@ void DiveTripModelTree::recalculateFilter()
 		// as a consequence of the filterReset signal right after the local scope.
 		auto marker = diveListNotifier.enterCommand();
 		DiveFilter *filter = DiveFilter::instance();
-		for (Item &item: items) {
+		for (size_t i = 0; i < items.size(); ++i) {
+			Item &item = items[i];
 			if (item.d_or_t.dive) {
 				dive *d = item.d_or_t.dive;
 				item.shown = filter->showDive(item.d_or_t.dive);
 				filter_dive(d, item.shown);
 			} else {
 				// Trips are shown if any of the dives is shown
-				item.shown = calculateFilterForTrip(item.dives, filter);
+				item.shown = calculateFilterForTrip(item.dives, filter, i);
 			}
 		}
 	}