From f961ec7a8b399683b5b9aedc56827fa307511487 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Sat, 2 May 2020 14:41:52 +0200 Subject: selection: introduce clear_selection() function 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 --- core/divelist.c | 1 + core/selection.cpp | 13 +++++++++++++ core/selection.h | 1 + 3 files changed, 15 insertions(+) (limited to 'core') diff --git a/core/divelist.c b/core/divelist.c index 778811db5..4325df595 100644 --- a/core/divelist.c +++ b/core/divelist.c @@ -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); diff --git a/core/selection.cpp b/core/selection.cpp index f763afcc6..48bb1a76f 100644 --- a/core/selection.cpp +++ b/core/selection.cpp @@ -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; +} diff --git a/core/selection.h b/core/selection.h index 55055de4a..beab31eaf 100644 --- a/core/selection.h +++ b/core/selection.h @@ -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); -- cgit v1.2.3-70-g09d2