summaryrefslogtreecommitdiffstats
path: root/core/divelist.c
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2020-05-05 00:12:36 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2020-05-07 08:43:27 -0700
commitfb6210a99a1eda0f7f7197ed57f3c61a82132dff (patch)
tree7562feb3291d06173b971437d1bd3395b2722eff /core/divelist.c
parentaeee2a08027b177495635262114374f085351ce7 (diff)
downloadsubsurface-fb6210a99a1eda0f7f7197ed57f3c61a82132dff.tar.gz
cleanup: invert control-flow when resetting the core structures
To reset the core data structures, the mobile and desktop UIs were calling into the dive-list models, which then reset the core data structures, themselves and the unrelated locationinformation model. The UI code then reset various other things, such as the TankInformation model or the map. . This was unsatisfying from a control-flow perspective, as the models should display the core data, not act on it. Moreover, this meant lots of intricate intermodule-dependencies. Thus, straighten up the control flow: give the C core the possibility to send a "all data reset" event. And do that in those functions that reset the core data structures. Let each module react to this event by itself. This removes inter-module dependencies. For example, the MainWindow now doesn't have to reset the TankInfoModel or the MapWidget. Then, to reset the core data structures, let the UI code simply directly call the respective core functions. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/divelist.c')
-rw-r--r--core/divelist.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/core/divelist.c b/core/divelist.c
index 4325df595..f224b3414 100644
--- a/core/divelist.c
+++ b/core/divelist.c
@@ -835,6 +835,9 @@ void process_loaded_dives()
autogroup_dives(&dive_table, &trip_table);
fulltext_populate();
+
+ /* Inform frontend of reset data. This should reset all the models. */
+ emit_reset_signal();
}
/*
@@ -1045,6 +1048,9 @@ void add_imported_dives(struct dive_table *import_table, struct trip_table *impo
* Choose the newest dive as selected (if any) */
current_dive = dive_table.nr > 0 ? dive_table.dives[dive_table.nr - 1] : NULL;
mark_divelist_changed(true);
+
+ /* Inform frontend of reset data. This should reset all the models. */
+ emit_reset_signal();
}
/* Helper function for process_imported_dives():
@@ -1373,6 +1379,9 @@ void clear_dive_file_data()
reset_min_datafile_version();
clear_git_id();
+
+ /* Inform frontend of reset data. This should reset all the models. */
+ emit_reset_signal();
}
bool dive_less_than(const struct dive *a, const struct dive *b)