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

selection: move dive selection, current dive and dc through signals

Browse source 
To reduce access of global variables.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2022-09-03 22:45:08 +02:00 • committed by bstoeger
parent 616dbd9671
commit 72a15c46d9
10 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

37
desktop-widgets/divelistview.cpp
View file

@ -225,7 +225,7 @@ void DiveListView::reset()
}
// If items were selected, inform the selection model
void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indices, QModelIndex currentDive)
void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indices, QModelIndex currentDive, int currentDC)
{
// This is the entry point for programmatical selection changes.
// Set a flag so that selection changes are not further processed,
@ -258,7 +258,14 @@ void DiveListView::diveSelectionChanged(const QVector<QModelIndex> &indices, QMo
}
setAnimated(oldAnimated);
selectionChangeDone();
// This is truly sad, but taking the list of selected indices and turning them
// into dives turned out to be unreasonably slow. Therefore, let's access
// the core list directly.
std::vector<dive *> selected = getDiveSelection();
selectDiveSitesOnMap(selected);
struct dive *current = currentDive.data(DiveTripModelBase::DIVE_ROLE).value<struct dive *>();
emit divesSelected(selected, current, currentDC);
programmaticalSelectionChange = false;
// Set the currently activated row.
@ -305,7 +312,14 @@ void DiveListView::tripSelected(QModelIndex trip, QModelIndex currentDive)
// funny side-effects).
selectionModel()->setCurrentIndex(currentDive, QItemSelectionModel::Current);
selectionChangeDone();
// This is truly sad, but taking the list of selected indices and turning them
// into dives turned out to be unreasonably slow. Therefore, let's access
// the core list directly.
std::vector<dive *> selection = getDiveSelection();
selectDiveSitesOnMap(selection);
struct dive *current = currentDive.data(DiveTripModelBase::DIVE_ROLE).value<struct dive *>();
emit divesSelected(selection, current, -1);
programmaticalSelectionChange = false;
}
@ -415,7 +429,7 @@ void DiveListView::currentChanged(const QModelIndex &current, const QModelIndex&
scrollTo(current);
}
void DiveListView::selectionChangeDone()
void DiveListView::selectDiveSitesOnMap(const std::vector<dive *> &dives)
{
#ifdef MAP_SUPPORT
// When receiving the divesSelected signal the main window will
@ -425,21 +439,15 @@ void DiveListView::selectionChangeDone()
// the dive-site selection is controlled by the filter not
// by the selected dives.
if (!DiveFilter::instance()->diveSiteMode()) {
// This is truly sad, but taking the list of selected indices and turning them
// into dive sites turned out to be unreasonably slow. Therefore, let's access
// the core list directly. In my tests, this went down from 700 to 0 ms!
QVector<dive_site *> selectedSites;
selectedSites.reserve(amount_selected);
int i;
dive *d;
for_each_dive(i, d) {
if (d->selected && !d->hidden_by_filter && d->dive_site && !selectedSites.contains(d->dive_site))
selectedSites.reserve(dives.size());
for (dive *d: dives) {
if (!d->hidden_by_filter && d->dive_site && !selectedSites.contains(d->dive_site))
selectedSites.push_back(d->dive_site);
}
MapWidget::instance()->setSelected(selectedSites);
}
#endif
emit divesSelected();
}
void DiveListView::selectTripItems(QModelIndex index)
@ -524,7 +532,8 @@ void DiveListView::selectionChanged(const QItemSelection &selected, const QItemS
// Display the new, processed, selection
QTreeView::selectionChanged(selectionModel()->selection(), newDeselected);
selectionChangeDone();
selectDiveSitesOnMap(selection);
emit divesSelected(selection, newCurrent, -1);
programmaticalSelectionChange = false;
}

7
desktop-widgets/divelistview.h
View file

@ -29,7 +29,8 @@ public:
void loadImages();
void loadWebImages();
signals:
void divesSelected();
// currentDC = -1: don't change dc number.
void divesSelected(const std::vector<dive *> &dives, dive *currentDive, int currentDC);
public
slots:
void settingsChanged();
@ -51,13 +52,13 @@ slots:
void renumberDives();
void addDivesToTrip();
void shiftTimes();
void diveSelectionChanged(const QVector<QModelIndex> &indices, QModelIndex currentDive);
void diveSelectionChanged(const QVector<QModelIndex> &indices, QModelIndex currentDive, int currentDC);
void tripSelected(QModelIndex trip, QModelIndex currentDive);
private:
void rowsInserted(const QModelIndex &parent, int start, int end) override;
void reset() override;
void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override;
void selectionChangeDone();
void selectDiveSitesOnMap(const std::vector<dive *> &dives);
void selectTripItems(QModelIndex index);
DiveTripModelBase::Layout currentLayout;
QModelIndex contextMenuIndex;

6
desktop-widgets/mainwindow.cpp
View file

@ -176,7 +176,7 @@ MainWindow::MainWindow() :
if (!QIcon::hasThemeIcon("window-close")) {
QIcon::setThemeName("subsurface");
}
connect(diveList.get(), &DiveListView::divesSelected, this, &MainWindow::selectionChanged);
connect(diveList.get(), &DiveListView::divesSelected, this, &MainWindow::divesSelected);
connect(&diveListNotifier, &DiveListNotifier::settingsChanged, this, &MainWindow::readSettings);
for (int i = 0; i < NUM_RECENT_FILES; i++) {
actionsRecent[i] = new QAction(this);
@ -331,10 +331,10 @@ void MainWindow::updateAutogroup()
ui.actionAutoGroup->setChecked(divelog.autogroup);
}
void MainWindow::selectionChanged()
void MainWindow::divesSelected(const std::vector<dive *> &selection, dive *currentDive, int currentDC)
{
mainTab->updateDiveInfo();
if (current_dive)
if (currentDive)
enableDisableOtherDCsActions();
profile->plotCurrentDive();
#ifdef MAP_SUPPORT

2
desktop-widgets/mainwindow.h
View file

@ -129,7 +129,7 @@ slots:
void on_actionReplanDive_triggered();
void on_action_Check_for_Updates_triggered();
void selectionChanged();
void divesSelected(const std::vector<dive *> &selection, dive *currentDive, int currentDC);
void initialUiSetup();
void on_actionImportDiveLog_triggered();