X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=65b812b06aaa615c02fa26e97c76317fde152cfe;hb=6500e943c18a416b4f628a963d067ee977da48ba;hp=de95d5e6614c0d0b05ef77700454b6474de29dce;hpb=621761233b2e1b139c07987b562ef2aa299ff35e;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index de95d5e..65b812b 100644 --- a/dive.h +++ b/dive.h @@ -92,13 +92,17 @@ typedef struct { const char *description; /* "integrated", "belt", "ankle" */ } weightsystem_t; -extern int cylinder_none(void *_data); -extern int weightsystem_none(void *_data); +extern gboolean cylinder_none(void *_data); +extern gboolean no_cylinders(cylinder_t *cyl); +extern gboolean cylinders_equal(cylinder_t *cyl1, cylinder_t *cyl2); +extern gboolean no_weightsystems(weightsystem_t *ws); +extern gboolean weightsystems_equal(weightsystem_t *ws1, weightsystem_t *ws2); extern int get_pressure_units(unsigned int mb, const char **units); extern double get_depth_units(unsigned int mm, int *frac, const char **units); -extern double get_volume_units(unsigned int mm, int *frac, const char **units); -extern double get_temp_units(unsigned int mm, const char **units); +extern double get_volume_units(unsigned int ml, int *frac, const char **units); +extern double get_temp_units(unsigned int mk, const char **units); +extern double get_weight_units(unsigned int grams, int *frac, const char **units); static inline double grams_to_lbs(int grams) { @@ -230,8 +234,13 @@ struct event { #define W_IDX_PRIMARY 0 #define W_IDX_SECONDARY 1 +typedef enum { TF_NONE, NO_TRIP, IN_TRIP, NUM_TRIPFLAGS } tripflag_t; +extern const char *tripflag_names[NUM_TRIPFLAGS]; + struct dive { int number; + tripflag_t tripflag; + int selected; time_t when; char *location; char *notes; @@ -244,12 +253,34 @@ struct dive { temperature_t airtemp, watertemp; cylinder_t cylinder[MAX_CYLINDERS]; weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS]; + char *suit; int sac, otu; struct event *events; int samples, alloc_samples; struct sample sample[]; }; +extern GList *dive_trip_list; +extern gboolean autogroup; +/* random threashold: three days without diving -> new trip + * this works very well for people who usually dive as part of a trip and don't + * regularly dive at a local facility; this is why trips are an optional feature */ +#define TRIP_THRESHOLD 3600*24*3 + +#define UNGROUPED_DIVE(_dive) ((_dive)->tripflag == NO_TRIP) +#define DIVE_IN_TRIP(_dive) ((_dive)->tripflag == IN_TRIP) +#define NEXT_TRIP(_entry, _list) ((_entry) ? g_list_next(_entry) : (_list)) +#define PREV_TRIP(_entry, _list) ((_entry) ? g_list_previous(_entry) : g_list_last(_list)) +#define DIVE_TRIP(_trip) ((struct dive *)(_trip)->data) +#define DIVE_FITS_TRIP(_dive, _dive_trip) ((_dive_trip)->when - TRIP_THRESHOLD <= (_dive)->when) + +static inline int dive_date_cmp(gconstpointer _a, gconstpointer _b) { + return ((struct dive *)(_a))->when - ((struct dive *)(_b))->when; +} + +#define INSERT_TRIP(_trip, _list) g_list_insert_sorted((_list), (_trip), dive_date_cmp) +#define FIND_TRIP(_trip, _list) g_list_find_custom((_list), (_trip), dive_date_cmp) + /* * We keep our internal data in well-specified units, but * the input and output may come in some random format. This @@ -340,14 +371,16 @@ extern void exit_ui(void); extern void report_error(GError* error); extern void add_cylinder_description(cylinder_type_t *); +extern void add_weightsystem_description(weightsystem_t *); extern void add_people(const char *string); extern void add_location(const char *string); +extern void add_suit(const char *string); extern void remember_event(const char *eventname); extern void evn_foreach(void (*callback)(const char *, int *, void *), void *data); extern int add_new_dive(struct dive *dive); extern int edit_dive_info(struct dive *dive); -extern int edit_multi_dive_info(int nr, int *indices); +extern int edit_multi_dive_info(int idx); extern void dive_list_update_dives(void); extern void flush_divelist(struct dive *dive);