9c253ee6c5
The parser API was very annoying, as a number of tables to-be-filled were passed in as pointers. The goal of this commit is to collect all these tables in a single struct. This should make it (more or less) clear what is actually written into the divelog files. Moreover, it should now be rather easy to search for instances, where the global logfile is accessed (and it turns out that there are many!). The divelog struct does not contain the tables as substructs, but only collects pointers. The idea is that the "divelog.h" file can be included without all the other files describing the numerous tables. To make it easier to use from C++ parts of the code, the struct implements a constructor and a destructor. Sadly, we can't use smart pointers, since the pointers are accessed from C code. Therfore the constructor and destructor are quite complex. The whole commit is large, but was mostly an automatic conversion. One oddity of note: the divelog structure also contains the "autogroup" flag, since that is saved in the divelog. This actually fixes a bug: Before, when importing dives from a different log, the autogroup flag was overwritten. This was probably not intended and does not happen anymore. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
75 lines
2.6 KiB
C
75 lines
2.6 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DIVELIST_H
|
|
#define DIVELIST_H
|
|
|
|
#include "units.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
struct dive;
|
|
struct divelog;
|
|
struct trip_table;
|
|
struct dive_site_table;
|
|
struct device_table;
|
|
struct deco_state;
|
|
|
|
struct dive_table {
|
|
int nr, allocated;
|
|
struct dive **dives;
|
|
};
|
|
static const struct dive_table empty_dive_table = { 0, 0, (struct dive **)0 };
|
|
|
|
/* this is used for both git and xml format */
|
|
#define DATAFORMAT_VERSION 3
|
|
|
|
extern void sort_dive_table(struct dive_table *table);
|
|
extern void update_cylinder_related_info(struct dive *);
|
|
extern int init_decompression(struct deco_state *ds, const struct dive *dive, bool in_planner);
|
|
|
|
/* divelist core logic functions */
|
|
extern void process_loaded_dives();
|
|
/* flags for process_imported_dives() */
|
|
#define IMPORT_PREFER_IMPORTED (1 << 0)
|
|
#define IMPORT_IS_DOWNLOADED (1 << 1)
|
|
#define IMPORT_MERGE_ALL_TRIPS (1 << 2)
|
|
#define IMPORT_ADD_TO_NEW_TRIP (1 << 3)
|
|
extern void add_imported_dives(struct divelog *log, int flags);
|
|
extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table,
|
|
struct dive_site_table *import_sites_table, struct device_table *import_devices_table,
|
|
int flags,
|
|
struct dive_table *dives_to_add, struct dive_table *dives_to_remove,
|
|
struct trip_table *trips_to_add, struct dive_site_table *sites_to_add,
|
|
struct device_table *devices_to_add);
|
|
|
|
extern int dive_table_get_insertion_index(struct dive_table *table, struct dive *dive);
|
|
extern void add_to_dive_table(struct dive_table *table, int idx, struct dive *dive);
|
|
extern void insert_dive(struct dive_table *table, struct dive *d);
|
|
extern void get_dive_gas(const struct dive *dive, int *o2_p, int *he_p, int *o2low_p);
|
|
extern int get_divenr(const struct dive *dive);
|
|
extern int remove_dive(const struct dive *dive, struct dive_table *table);
|
|
extern int get_dive_nr_at_idx(int idx);
|
|
extern timestamp_t get_surface_interval(timestamp_t when);
|
|
extern void delete_dive_from_table(struct dive_table *table, int idx);
|
|
extern struct dive *find_next_visible_dive(timestamp_t when);
|
|
|
|
extern int comp_dives(const struct dive *a, const struct dive *b);
|
|
|
|
int get_min_datafile_version();
|
|
void reset_min_datafile_version();
|
|
void report_datafile_version(int version);
|
|
int get_dive_id_closest_to(timestamp_t when);
|
|
void clear_dive_file_data();
|
|
void clear_dive_table(struct dive_table *table);
|
|
void move_dive_table(struct dive_table *src, struct dive_table *dst);
|
|
struct dive *unregister_dive(int idx);
|
|
extern void delete_single_dive(int idx);
|
|
extern bool has_dive(unsigned int deviceid, unsigned int diveid);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif // DIVELIST_H
|