X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=5cb32412308ee2219efa8f1c2e5faabeadfc5ab1;hb=d5c86ebe3dd67397f0f61d57ae9c07d995c38728;hp=1927da7215a68e69ece2ce062cb58e61b6914bd9;hpb=682135838ff313594c7f67fabd9be8f88a33883b;p=ext%2Fsubsurface.git diff --git a/dive.h b/dive.h index 1927da7..5cb3241 100644 --- a/dive.h +++ b/dive.h @@ -86,6 +86,8 @@ typedef struct { pressure_t start, end; } cylinder_t; +extern double get_depth_units(unsigned int mm, int *frac, const char **units); + static inline double mm_to_feet(int mm) { return mm * 0.00328084; @@ -132,6 +134,11 @@ static inline int to_PSI(pressure_t pressure) return pressure.mbar * 0.0145037738 + 0.5; } +static inline double to_ATM(pressure_t pressure) +{ + return pressure.mbar / 1013.25; +} + struct sample { duration_t time; depth_t depth; @@ -154,6 +161,7 @@ struct dive { depth_t visibility; temperature_t airtemp, watertemp; cylinder_t cylinder[MAX_CYLINDERS]; + int otu; int samples, alloc_samples; struct sample sample[]; }; @@ -195,6 +203,7 @@ static inline struct dive *get_dive(unsigned int nr) extern void parse_xml_init(void); extern void parse_xml_file(const char *filename, GError **error); +extern void set_filename(const char *filename); extern void show_dive_info(struct dive *); extern void flush_dive_info_changes(struct dive *); @@ -242,4 +251,7 @@ extern int open_import_file_dialog(char *filterpattern, char *filtertext, const char *weekday(int wday); const char *monthname(int mon); +#define UTF8_DEGREE "\xc2\xb0" +#define UTF8_SUBSCRIPT_2 "\xe2\x82\x82" + #endif /* DIVE_H */