mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
c32e71e64d
The old surface interval calculation had fundamental issues: 1) process_all_dives(), which calculates the statistics over *all* dives was used to get the pointer to the previous dive. 2) If two dives in the table had the same time, one of those would have been considered the "previous" dive. 3) If the dive, for which the surface interval is calculated is not yet in the table, no previous dive would be determined. Fix all this by creating a get_surface_interval() function and removing the "get previous dive" functionality of process_all_dives(). Remove the process_all_dives() call from TabDiveInformation::updateData(). Reported-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
60 lines
1.3 KiB
C
60 lines
1.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* statistics.h
|
|
*
|
|
* core logic functions called from statistics UI
|
|
* common types and variables
|
|
*/
|
|
|
|
#ifndef STATISTICS_H
|
|
#define STATISTICS_H
|
|
|
|
#include "core/units.h"
|
|
#include "core/dive.h" // For MAX_CYLINDERS
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef struct
|
|
{
|
|
int period;
|
|
duration_t total_time;
|
|
/* total time of dives with non-zero average depth */
|
|
duration_t total_average_depth_time;
|
|
/* avg_time is simply total_time / nr -- let's not keep this */
|
|
duration_t shortest_time;
|
|
duration_t longest_time;
|
|
depth_t max_depth;
|
|
depth_t min_depth;
|
|
depth_t avg_depth;
|
|
volume_t max_sac;
|
|
volume_t min_sac;
|
|
volume_t avg_sac;
|
|
temperature_t max_temp;
|
|
temperature_t min_temp;
|
|
temperature_sum_t combined_temp;
|
|
unsigned int combined_count;
|
|
unsigned int selection_size;
|
|
duration_t total_sac_time;
|
|
bool is_year;
|
|
bool is_trip;
|
|
char *location;
|
|
} stats_t;
|
|
extern stats_t stats_selection;
|
|
extern stats_t *stats_yearly;
|
|
extern stats_t *stats_monthly;
|
|
extern stats_t *stats_by_trip;
|
|
extern stats_t *stats_by_type;
|
|
|
|
extern char *get_minutes(int seconds);
|
|
extern void process_all_dives();
|
|
extern void get_gas_used(struct dive *dive, volume_t gases[MAX_CYLINDERS]);
|
|
extern void process_selected_dives(void);
|
|
void selected_dives_gas_parts(volume_t *o2_tot, volume_t *he_tot);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif // STATISTICS_H
|