diff options
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divetripmodel.cpp | 72 | ||||
| -rw-r--r-- | qt-models/divetripmodel.h | 14 |
2 files changed, 77 insertions, 9 deletions
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index f8b5e0deb..7c027e4b4 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -440,6 +440,8 @@ DiveTripModel::DiveTripModel(QObject *parent) : connect(&diveListNotifier, &DiveListNotifier::divesChanged, this, &DiveTripModel::divesChanged); connect(&diveListNotifier, &DiveListNotifier::divesMovedBetweenTrips, this, &DiveTripModel::divesMovedBetweenTrips); connect(&diveListNotifier, &DiveListNotifier::divesTimeChanged, this, &DiveTripModel::divesTimeChanged); + connect(&diveListNotifier, &DiveListNotifier::divesSelected, this, &DiveTripModel::divesSelected); + connect(&diveListNotifier, &DiveListNotifier::divesDeselected, this, &DiveTripModel::divesDeselected); } int DiveTripModel::columnCount(const QModelIndex&) const @@ -978,7 +980,7 @@ void DiveTripModel::divesAdded(dive_trip *trip, bool addTrip, const QVector<dive void DiveTripModel::divesDeleted(dive_trip *trip, bool deleteTrip, const QVector<dive *> &divesIn) { // TODO: dives comes sorted by ascending time, but the model is sorted by descending time. - // Instead of being smart, simple reverse the input array. + // Instead of being smart, simply reverse the input array. QVector<dive *> dives = divesIn; std::reverse(dives.begin(), dives.end()); @@ -1033,7 +1035,7 @@ void DiveTripModel::divesDeleted(dive_trip *trip, bool deleteTrip, const QVector void DiveTripModel::divesChanged(dive_trip *trip, const QVector<dive *> &divesIn) { // TODO: dives comes sorted by ascending time, but the model is sorted by descending time. - // Instead of being smart, simple reverse the input array. + // Instead of being smart, simply reverse the input array. QVector<dive *> dives = divesIn; std::reverse(dives.begin(), dives.end()); @@ -1100,15 +1102,67 @@ void DiveTripModel::divesTimeChanged(dive_trip *trip, timestamp_t delta, const Q // order of the dives don't change. This is indeed the case, as all starting-times where // moved by the same delta. - // Unfortunately, deleting of the dives clears current_dive, so we have to remember it. - // TODO: remove this hack! - dive *current = current_dive; - // Cheating! divesDeleted(trip, false, dives); divesAdded(trip, false, dives); +} + +void DiveTripModel::divesSelected(dive_trip *trip, const QVector<dive *> &dives) +{ + changeDiveSelection(trip, dives, true); +} + +void DiveTripModel::divesDeselected(dive_trip *trip, const QVector<dive *> &dives) +{ + changeDiveSelection(trip, dives, false); +} + +void DiveTripModel::changeDiveSelection(dive_trip *trip, const QVector<dive *> &divesIn, bool select) +{ + // TODO: dives comes sorted by ascending time, but the model is sorted by descending time. + // Instead of being smart, simply reverse the input array. + QVector<dive *> dives = divesIn; + std::reverse(dives.begin(), dives.end()); + + // We got a number of dives that have been selected. Turn this into QModelIndexes and + // emit a signal, so that views can change the selection. + QVector<QModelIndex> indexes; + indexes.reserve(dives.count()); + + if (!trip || currentLayout == LIST) { + // Either this is outside of a trip or we're in list mode. + // Since both lists are sorted, we can do this linearly. Perhaps a binary search + // would be better? + int j = 0; // Index in items array + for (int i = 0; i < dives.size(); ++i) { + while (j < (int)items.size() && !items[j].isDive(dives[i])) + ++j; + if (j >= (int)items.size()) + break; + indexes.append(createIndex(j, 0, noParent)); + } + } else { + // Find the trip. + int idx = findTripIdx(trip); + if (idx < 0) { + // We don't know the trip - this shouldn't happen. We seem to have + // missed some signals! + qWarning() << "DiveTripModel::divesSelected(): unknown trip"; + return; + } + // Locate the indices inside the trip. + // Since both lists are sorted, we can do this linearly. Perhaps a binary search + // would be better? + int j = 0; // Index in items array + const Item &entry = items[idx]; + for (int i = 0; i < dives.size(); ++i) { + while (j < (int)entry.dives.size() && entry.dives[j] != dives[i]) + ++j; + if (j >= (int)entry.dives.size()) + break; + indexes.append(createIndex(j, 0, idx)); + } + } - // Now, restore current_dive - // TODO: remove this hack! - selected_dive = get_divenr(current); + emit selectionChanged(indexes, select); } diff --git a/qt-models/divetripmodel.h b/qt-models/divetripmodel.h index aa2e046d7..5cd69852c 100644 --- a/qt-models/divetripmodel.h +++ b/qt-models/divetripmodel.h @@ -109,12 +109,23 @@ public: int rowCount(const QModelIndex &parent) const; QModelIndex index(int row, int column, const QModelIndex &parent) const; QModelIndex parent(const QModelIndex &index) const; +signals: + // The propagation of selection changes is complex. + // The control flow of dive-selection goes: + // Commands/DiveListNotifier ---(dive */dive_trip *)---> DiveTripModel ---(QModelIndex)---> DiveListView + // i.e. The command objects send changes in terms of pointer-to-dives, which the DiveTripModel transforms + // into QModelIndexes according to the current view (tree/list). Finally, the DiveListView transforms these + // indexes into local indexes according to current sorting/filtering and instructs the QSelectionModel to + // perform the appropriate actions. + void selectionChanged(const QVector<QModelIndex> &indexes, bool select); private slots: void divesAdded(dive_trip *trip, bool addTrip, const QVector<dive *> &dives); void divesDeleted(dive_trip *trip, bool deleteTrip, const QVector<dive *> &dives); void divesChanged(dive_trip *trip, const QVector<dive *> &dives); void divesTimeChanged(dive_trip *trip, timestamp_t delta, const QVector<dive *> &dives); void divesMovedBetweenTrips(dive_trip *from, dive_trip *to, bool deleteFrom, bool createTo, const QVector<dive *> &dives); + void divesSelected(dive_trip *trip, const QVector<dive *> &dives); + void divesDeselected(dive_trip *trip, const QVector<dive *> &dives); private: // 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" @@ -142,6 +153,9 @@ private: int findDiveInTrip(int tripIdx, const dive *d) const; // Find dive inside trip. Second parameter is index of trip int findInsertionIndex(timestamp_t when) const; // Where to insert item with timestamp "when" + // Select or deselect dives + void changeDiveSelection(dive_trip *trip, const QVector<dive *> &dives, bool select); + // Addition and deletion of dives void addDivesToTrip(int idx, const QVector<dive *> &dives); |