1593f2ebad
The old way of merging log-files was not well defined: Trips were recognized as the same if and only if the first dives started at the same instant. Later dives did not matter. Change this to merge dives if they are overlapping. Moreover, on parsing and download generate trips in a separate trip-table. This will be fundamental for undo of dive-import: Firstly, we don't want to mix trips of imported and not-yet imported dives. Secondly, by merging trip-wise, we can autogroup the dives in the import-data to trips and merge these at once. This will simplify the code to decide to which trip dives should be autogrouped. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
74 lines
3.0 KiB
C
74 lines
3.0 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#ifndef DIVELIST_H
|
|
#define DIVELIST_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/* this is used for both git and xml format */
|
|
#define DATAFORMAT_VERSION 3
|
|
|
|
struct dive;
|
|
|
|
extern void update_cylinder_related_info(struct dive *);
|
|
extern void mark_divelist_changed(bool);
|
|
extern int unsaved_changes(void);
|
|
extern int init_decompression(struct deco_state *ds, struct dive *dive);
|
|
|
|
/* divelist core logic functions */
|
|
extern void process_loaded_dives();
|
|
extern void process_imported_dives(struct dive_table *import_table, struct trip_table *import_trip_table, bool prefer_imported, bool downloaded);
|
|
extern char *get_dive_gas_string(const struct dive *dive);
|
|
|
|
extern struct dive **grow_dive_table(struct dive_table *table);
|
|
extern int dive_table_get_insertion_index(struct dive_table *table, struct dive *dive);
|
|
extern void add_single_dive(int idx, struct dive *dive);
|
|
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 get_divesite_idx(const struct dive_site *ds);
|
|
extern struct dive_trip *unregister_dive_from_trip(struct dive *dive);
|
|
extern void remove_dive_from_trip(struct dive *dive, struct trip_table *trip_table);
|
|
extern dive_trip_t *alloc_trip(void);
|
|
extern dive_trip_t *create_trip_from_dive(struct dive *dive);
|
|
extern dive_trip_t *create_and_hookup_trip_from_dive(struct dive *dive, struct trip_table *trip_table);
|
|
extern dive_trip_t *get_dives_to_autogroup(struct dive_table *table, int start, int *from, int *to, bool *allocated);
|
|
extern dive_trip_t *get_trip_for_new_dive(struct dive *new_dive, bool *allocated);
|
|
extern bool consecutive_selected();
|
|
extern void select_dive(struct dive *dive);
|
|
extern void deselect_dive(struct dive *dive);
|
|
extern void select_dives_in_trip(struct dive_trip *trip);
|
|
extern void deselect_dives_in_trip(struct dive_trip *trip);
|
|
extern void filter_dive(struct dive *d, bool shown);
|
|
extern dive_trip_t *combine_trips(struct dive_trip *trip_a, struct dive_trip *trip_b);
|
|
extern struct dive *first_selected_dive();
|
|
extern struct dive *last_selected_dive();
|
|
extern bool is_trip_before_after(const struct dive *dive, bool before);
|
|
extern int get_dive_nr_at_idx(int idx);
|
|
extern void set_dive_nr_for_current_dive();
|
|
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 bool trip_is_single_day(const struct dive_trip *trip);
|
|
extern int trip_shown_dives(const struct dive_trip *trip);
|
|
|
|
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_table(struct dive_table *table);
|
|
|
|
typedef enum {PO2VAL, SINGLE_EXP, SINGLE_SLOPE, DAILY_EXP, DAILY_SLOPE, NO_COLUMNS} cns_table_headers;
|
|
|
|
#ifdef DEBUG_TRIP
|
|
extern void dump_selection(void);
|
|
extern void dump_trip_list(void);
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif // DIVELIST_H
|