diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | desktop-widgets/divelistview.cpp | 71 | ||||
| -rw-r--r-- | desktop-widgets/divelistview.h | 3 |
3 files changed, 42 insertions, 33 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index e82adedde..17d14e1b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ Mobile: (desktop only) new switch --testqml, allows to use qml files instead of resources. +Desktop: increase speed of multi-trip selection Mobile: ensure that all BT/BLE flavors of the OSTC are recognized as dive computers [#2358] Desktop: allow copy&pasting of multiple cylinders [#2386] Desktop: don't output random SAC values for cylinders without data [#2376] diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index 860e3bc95..55bcb4906 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -31,7 +31,7 @@ #include "desktop-widgets/mapwidget.h" DiveListView::DiveListView(QWidget *parent) : QTreeView(parent), mouseClickSelection(false), - currentLayout(DiveTripModelBase::TREE), dontEmitDiveChangedSignal(false), selectionSaved(false), + currentLayout(DiveTripModelBase::TREE), selectionSaved(false), initialColumnWidths(DiveTripModelBase::COLUMNS, 50) // Set up with default length 50 { setItemDelegate(new DiveListDelegate(this)); @@ -197,10 +197,6 @@ void DiveListView::reset() // If items were selected, inform the selection model void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indexes) { - // Since dives are selected dive-by-dive, send only a single signal at the - // end, not one for every dive. - dontEmitDiveChangedSignal = true; - clearSelection(); MultiFilterSortModel *m = MultiFilterSortModel::instance(); QItemSelectionModel *s = selectionModel(); @@ -225,8 +221,7 @@ void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indexes) } } - dontEmitDiveChangedSignal = false; - emit divesSelected(); + selectionChangeDone(); } void DiveListView::currentDiveChanged(QModelIndex index) @@ -312,10 +307,9 @@ void DiveListView::tripChanged(dive_trip *trip, TripField) if (selected.size() == 1 && selected[0] == trip) return; - dontEmitDiveChangedSignal = true; unselectDives(); - dontEmitDiveChangedSignal = false; selectTrip(trip); + selectionChangeDone(); } void DiveListView::selectTrip(dive_trip_t *trip) @@ -401,6 +395,7 @@ void DiveListView::selectDive(QModelIndex idx, bool scrollto, bool toggle) } if (scrollto) scrollTo(idx, PositionAtCenter); + selectionChangeDone(); } void DiveListView::selectDive(int i, bool scrollto, bool toggle) @@ -423,8 +418,6 @@ void DiveListView::selectDives(const QList<int> &newDiveSelection) if (!newDiveSelection.count()) return; - dontEmitDiveChangedSignal = true; - // First, clear the old selection unselectDives(); @@ -478,9 +471,7 @@ void DiveListView::selectDives(const QList<int> &newDiveSelection) } // now that everything is up to date, update the widgets - emit divesSelected(); - dontEmitDiveChangedSignal = false; - return; + selectionChangeDone(); } // Get index of first dive. This assumes that trips without dives are never shown. @@ -645,6 +636,39 @@ void DiveListView::currentChanged(const QModelIndex ¤t, const QModelIndex& scrollTo(current); } +void DiveListView::setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags flags) +{ + QTreeView::setSelection(rect, flags); + selectionChangeDone(); +} + +void DiveListView::selectAll() +{ + QTreeView::selectAll(); + selectionChangeDone(); +} + +void DiveListView::selectionChangeDone() +{ + // When receiving the divesSelected signal the main window will + // instruct the map to update the flags. Thus, make sure that + // the selected maps are registered correctly. + // But don't do this if we are in divesite mode, because then + // the dive-site selection is controlled by the filter not + // by the selected dives. + if (!DiveFilter::instance()->diveSiteMode()) { + QVector<dive_site *> selectedSites; + for (QModelIndex index: selectionModel()->selection().indexes()) { + const QAbstractItemModel *model = index.model(); + struct dive *dive = model->data(index, DiveTripModelBase::DIVE_ROLE).value<struct dive *>(); + if (dive && dive->dive_site) + selectedSites.push_back(dive->dive_site); + } + MapWidget::instance()->setSelected(selectedSites); + } + emit divesSelected(); +} + void DiveListView::selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) { if (diveListNotifier.inCommand()) { @@ -692,25 +716,6 @@ void DiveListView::selectionChanged(const QItemSelection &selected, const QItemS select_dive(dive); } } - if (!dontEmitDiveChangedSignal) { - // When receiving the divesSelected signal the main window will - // instruct the map to update the flags. Thus, make sure that - // the selected maps are registered correctly. - // But don't do this if we are in divesite mode, because then - // the dive-site selection is controlled by the filter not - // by the selected dives. - if (!DiveFilter::instance()->diveSiteMode()) { - QVector<dive_site *> selectedSites; - for (QModelIndex index: selectionModel()->selection().indexes()) { - const QAbstractItemModel *model = index.model(); - struct dive *dive = model->data(index, DiveTripModelBase::DIVE_ROLE).value<struct dive *>(); - if (dive && dive->dive_site) - selectedSites.push_back(dive->dive_site); - } - MapWidget::instance()->setSelected(selectedSites); - } - emit divesSelected(); - } // Display the new, processed, selection QTreeView::selectionChanged(selectionModel()->selection(), newDeselected); diff --git a/desktop-widgets/divelistview.h b/desktop-widgets/divelistview.h index 0d5117ca3..67b1b269b 100644 --- a/desktop-widgets/divelistview.h +++ b/desktop-widgets/divelistview.h @@ -70,6 +70,9 @@ slots: void filterFinished(); void tripChanged(dive_trip *trip, TripField); private: + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags flags) override; + void selectAll() override; + void selectionChangeDone(); bool mouseClickSelection; QList<int> expandedRows; DiveTripModelBase::Layout currentLayout; |