mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-01 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Correctly implement multi dive selection

Browse source 
The old code had several issues. It broke the synchronization between
dive->select and Qt selected status and worse, it would partially unselect
previously selected dives when called.

This patch, however, causes the selection via the map to be glacially slow
because it forces a redraw of every single selected profile.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-05-24 20:55:28 -07:00
parent 6009d770b2
commit a3d300ca91
1 changed files with 8 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
qt-ui/divelistview.cpp
View file

@ -241,54 +241,20 @@ void DiveListView::selectDives(const QList<int> &newDiveSelection)
if (!newDiveSelection.count()) if (!newDiveSelection.count())
return; return;
disconnect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)), // select the dives, highest index first - this way the oldest of the dives
this, SLOT(selectionChanged(QItemSelection, QItemSelection))); // becomes the selected_dive that we scroll to
disconnect(selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)), QList<int> sortedSelection = newDiveSelection;
this, SLOT(currentChanged(QModelIndex, QModelIndex))); qSort(sortedSelection.begin(), sortedSelection.end());
while (!sortedSelection.isEmpty())
selectDive(sortedSelection.takeLast());
setAnimated(false);
collapseAll();
QSortFilterProxyModel *m = qobject_cast<QSortFilterProxyModel *>(model()); QSortFilterProxyModel *m = qobject_cast<QSortFilterProxyModel *>(model());
QItemSelectionModel::SelectionFlags flags = QItemSelectionModel::Select | QItemSelectionModel::Rows;
QItemSelection newDeselected = selectionModel()->selection();
QModelIndexList diveList;
//TODO: This should be called find_first_selected_dive and be ported to C code.
int firstSelectedDive = -1;
/* context for temp. variables. */ {
int i = 0;
struct dive *dive;
for_each_dive (i, dive) {
dive->selected = newDiveSelection.contains(i) == true;
if (firstSelectedDive == -1 && dive->selected) {
firstSelectedDive = i;
break;
}
}
}
select_dive(firstSelectedDive);
Q_FOREACH (int i, newDiveSelection) {
diveList.append(m->match(m->index(0, 0), DiveTripModel::DIVE_IDX,
i, 2, Qt::MatchRecursive).first());
}
Q_FOREACH (const QModelIndex &idx, diveList) {
selectionModel()->select(idx, flags);
if (idx.parent().isValid() && !isExpanded(idx.parent())) {
expand(idx.parent());
}
}
setAnimated(true);
QTreeView::selectionChanged(selectionModel()->selection(), newDeselected);
connect(selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
this, SLOT(selectionChanged(QItemSelection, QItemSelection)));
connect(selectionModel(), SIGNAL(currentChanged(QModelIndex, QModelIndex)),
this, SLOT(currentChanged(QModelIndex, QModelIndex)));
Q_EMIT currentDiveChanged(selected_dive);
QModelIndex idx = m->match(m->index(0, 0), DiveTripModel::DIVE_IDX, selected_dive, 2, Qt::MatchRecursive).first(); QModelIndex idx = m->match(m->index(0, 0), DiveTripModel::DIVE_IDX, selected_dive, 2, Qt::MatchRecursive).first();
if (idx.parent().isValid()) if (idx.parent().isValid())
scrollTo(idx.parent()); scrollTo(idx.parent());
scrollTo(idx); scrollTo(idx);
return;
} }
void DiveListView::showSearchEdit() void DiveListView::showSearchEdit()