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

Cleanup: remove DiveTripModelBase::sendShownChangedSignals()

Browse source 
This was used by the old filtering code. This is not necessary
anymore.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-02-10 20:54:47 +01:00 • committed by Dirk Hohndel
parent 77a1c7c1f4
commit ae5d2e6b45
2 changed files with 0 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

40
qt-models/divetripmodel.cpp
View file

@ -752,46 +752,6 @@ dive *DiveTripModelTree::diveOrNull(const QModelIndex &index) const
return tripOrDive(index).dive; return tripOrDive(index).dive;
} }
// 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, quintptr parentIndex)
{
bool showTrip = false;
std::vector<char> changed;
changed.reserve(dives.size());
for (dive *d: dives) {
bool shown = filter->showDive(d);
changed.push_back(filter_dive(d, shown));
showTrip |= shown;
}
// If any dive is shown, send changed-signals
if (showTrip)
sendShownChangedSignals(changed, parentIndex);
return showTrip;
}
// The tree-version of the model wants to process the dives per trip. // The tree-version of the model wants to process the dives per trip.
// This template takes a vector of dives and calls a function batchwise for each trip. // This template takes a vector of dives and calls a function batchwise for each trip.
template<typename Function> template<typename Function>

2
qt-models/divetripmodel.h
View file

@ -90,7 +90,6 @@ protected:
// Access trip and dive data // Access trip and dive data
static QVariant diveData(const struct dive *d, int column, int role); static QVariant diveData(const struct dive *d, int column, int role);
static QVariant tripData(const dive_trip *trip, int column, int role); static QVariant tripData(const dive_trip *trip, int column, int role);
void sendShownChangedSignals(const std::vector<char> &changed, quintptr parentIndex);
virtual dive *diveOrNull(const QModelIndex &index) const = 0; // Returns a dive if this index represents a dive, null otherwise virtual dive *diveOrNull(const QModelIndex &index) const = 0; // Returns a dive if this index represents a dive, null otherwise
virtual void clearData() = 0; virtual void clearData() = 0;
@ -127,7 +126,6 @@ private:
void divesShown(dive_trip *trip, const QVector<dive *> &dives); void divesShown(dive_trip *trip, const QVector<dive *> &dives);
void divesHidden(dive_trip *trip, const QVector<dive *> &dives); void divesHidden(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, 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"