From 04241ebb9d6459b3a5e7b1e29f8f1bc734a21756 Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Fri, 11 Mar 2022 23:35:35 +0100 Subject: [PATCH] core: remove select_dc() function The only caller misused this function to get access to the current divecomputer. Remove it, since selection of the current divecomputer is handled by the MainWindow. Signed-off-by: Berthold Stoeger --- core/display.h | 2 -- core/profile.c | 12 ------------ desktop-widgets/tab-widgets/TabDiveInformation.cpp | 5 +++-- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/core/display.h b/core/display.h index e2741493f..7c8b9d12c 100644 --- a/core/display.h +++ b/core/display.h @@ -26,8 +26,6 @@ struct plot_info { struct plot_pressure_data *pressures; /* cylinders.nr blocks of nr entries. */ }; -extern struct divecomputer *select_dc(struct dive *); - extern int is_default_dive_computer_device(const char *); typedef void (*device_callback_t)(const char *name, void *userdata); diff --git a/core/profile.c b/core/profile.c index 6d79ca41f..725fc3d09 100644 --- a/core/profile.c +++ b/core/profile.c @@ -1311,18 +1311,6 @@ void create_plot_info_new(const struct dive *dive, const struct divecomputer *dc analyze_plot_info(pi); } -struct divecomputer *select_dc(struct dive *dive) -{ - unsigned int max = number_of_computers(dive); - unsigned int i = dc_number; - - /* Reset 'dc_number' if we've switched dives and it is now out of range */ - if (i >= max) - dc_number = i = 0; - - return get_dive_dc(dive, i); -} - static void plot_string(const struct dive *d, const struct plot_info *pi, int idx, struct membuffer *b) { int pressurevalue, mod, ead, end, eadd; diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp index 663f29de2..84a8fee6d 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp +++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp @@ -116,8 +116,9 @@ void TabDiveInformation::updateProfile() volume_t *gases = get_gas_used(current_dive); QString volumes; std::vector mean(current_dive->cylinders.nr), duration(current_dive->cylinders.nr); - if (current_dive->cylinders.nr >= 0) - per_cylinder_mean_depth(current_dive, select_dc(current_dive), mean.data(), duration.data()); + struct divecomputer *currentdc = get_dive_dc(current_dive, dc_number); + if (currentdc && current_dive->cylinders.nr >= 0) + per_cylinder_mean_depth(current_dive, currentdc, mean.data(), duration.data()); volume_t sac; QString gaslist, SACs, separator;