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

selection: introduce clear_selection() function

Browse source 
The DiveListView would touch the selection-innards directly.
Let's encapsulate that. Moreover, take care to reset the trip
selection when resetting the core data.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-05-02 14:41:52 +02:00 • committed by Dirk Hohndel
parent 09b7fcbcf4
commit f961ec7a8b
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/divelist.c
View file

@ -1354,6 +1354,7 @@ int get_dive_id_closest_to(timestamp_t when)
void clear_dive_file_data()
{
fulltext_unregister_all();
clear_selection();
while (dive_table.nr)
delete_single_dive(0);

13
core/selection.cpp
View file

@ -253,3 +253,16 @@ extern "C" void deselect_trip(struct dive_trip *trip)
amount_trips_selected--;
}
}
extern "C" void clear_selection(void)
{
current_dive = nullptr;
amount_selected = 0;
amount_trips_selected = 0;
int i;
struct dive *dive;
for_each_dive (i, dive)
dive->selected = false;
for (int i = 0; i < trip_table.nr; ++i)
trip_table.trips[i]->selected = false;
}

1
core/selection.h
View file

@ -23,6 +23,7 @@ extern void select_newest_visible_dive();
extern void select_single_dive(struct dive *d); // wrapper for setSelection() with a single dive. NULL clears the selection.
extern void select_trip(struct dive_trip *trip);
extern void deselect_trip(struct dive_trip *trip);
extern void clear_selection(void);
#if DEBUG_SELECTION_TRACKING
extern void dump_selection(void);

13
desktop-widgets/divelistview.cpp
View file

@ -292,20 +292,9 @@ void DiveListView::selectTrip(dive_trip_t *trip)
void DiveListView::unselectDives()
{
// make sure we don't try to redraw the dives during the selection change
current_dive = nullptr;
amount_selected = 0;
clear_selection();
// clear the Qt selection
selectionModel()->clearSelection();
// clearSelection should emit selectionChanged() but sometimes that
// appears not to happen
// since we are unselecting all dives there is no need to use deselect_dive() - that
// would only cause pointless churn
int i;
struct dive *dive;
for_each_dive (i, dive) {
dive->selected = false;
}
}
// This function returns a trip if there is one selected trip or NULL.