X-Git-Url: http://git.tdb.fi/?p=ext%2Fsubsurface.git;a=blobdiff_plain;f=dive.h;h=a25fafb39e95cc4b0eee571f94b195165b2200f4;hp=42d91d630a0776f63b8605d61e6e5f1c429578a0;hb=618a20ba5f2a9adc0e5a35117535f8eaa9fd34a4;hpb=2a8f7ab78f8d00b699b683b122ad2cf0ddc094b6 diff --git a/dive.h b/dive.h index 42d91d6..a25fafb 100644 --- a/dive.h +++ b/dive.h @@ -5,6 +5,7 @@ #include #include +#include /* * Some silly typedefs to make our units very explicit. @@ -83,31 +84,72 @@ typedef struct { typedef struct { cylinder_type_t type; struct gasmix gasmix; - pressure_t start, end; + pressure_t start, end, sample_start, sample_end; } cylinder_t; +typedef struct { + weight_t weight; + const char *description; /* "integrated", "belt", "ankle" */ +} weightsystem_t; + +extern int cylinder_none(void *_data); +extern int weightsystem_none(void *_data); + +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); + +static inline double grams_to_lbs(int grams) +{ + return grams / 453.6; +} + +static inline int lbs_to_grams(double lbs) +{ + return lbs * 453.6 + 0.5; +} + +static inline double ml_to_cuft(int ml) +{ + return ml / 28316.8466; +} + +static inline double cuft_to_l(double cuft) +{ + return cuft * 28.3168466; +} static inline double mm_to_feet(int mm) { return mm * 0.00328084; } +static inline unsigned long feet_to_mm(double feet) +{ + return feet * 304.8 + 0.5; +} + static inline int to_feet(depth_t depth) { return mm_to_feet(depth.mm) + 0.5; } -static double mkelvin_to_C(int mkelvin) +static inline double mkelvin_to_C(int mkelvin) { return (mkelvin - 273150) / 1000.0; } -static double mkelvin_to_F(int mkelvin) +static inline double mkelvin_to_F(int mkelvin) { return mkelvin * 9 / 5000.0 - 459.670; } +static inline unsigned long F_to_mkelvin(double f) +{ + return (f-32) * 1000 / 1.8 + 273150.5; +} + static inline int to_C(temperature_t temp) { if (!temp.mkelvin) @@ -129,16 +171,37 @@ static inline int to_K(temperature_t temp) return (temp.mkelvin + 499)/1000; } +static inline double psi_to_bar(double psi) +{ + return psi / 14.5037738; +} + +static inline unsigned long psi_to_mbar(double psi) +{ + return psi_to_bar(psi)*1000 + 0.5; +} + static inline int to_PSI(pressure_t pressure) { return pressure.mbar * 0.0145037738 + 0.5; } +static inline double bar_to_atm(double bar) +{ + return bar / 1.01325; +} + static inline double to_ATM(pressure_t pressure) { return pressure.mbar / 1013.25; } +static inline int mbar_to_PSI(int mbar) +{ + pressure_t p = {mbar}; + return to_PSI(p); +} + struct sample { duration_t time; depth_t depth; @@ -163,6 +226,7 @@ struct event { }; #define MAX_CYLINDERS (8) +#define MAX_WEIGHTSYSTEMS (4) struct dive { int number; @@ -170,13 +234,15 @@ struct dive { char *location; char *notes; char *divemaster, *buddy; + int rating; double latitude, longitude; depth_t maxdepth, meandepth; duration_t duration, surfacetime; depth_t visibility; temperature_t airtemp, watertemp; cylinder_t cylinder[MAX_CYLINDERS]; - int otu; + weightsystem_t weightsystem[MAX_WEIGHTSYSTEMS]; + int sac, otu; struct event *events; int samples, alloc_samples; struct sample sample[]; @@ -187,6 +253,10 @@ struct dive { * the input and output may come in some random format. This * keeps track of those units. */ +/* turns out in Win32 PASCAL is defined as a calling convention */ +#ifdef WIN32 +#undef PASCAL +#endif struct units { enum { METERS, FEET } length; enum { LITER, CUFT } volume; @@ -201,7 +271,7 @@ extern struct units input_units, output_units; extern int verbose; struct dive_table { - int nr, allocated; + int nr, allocated, preexisting; struct dive **dives; }; @@ -218,14 +288,20 @@ 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 parse_xml_buffer(const char *url, const char *buf, int size, GError **error); extern void set_filename(const char *filename); +extern void parse_file(const char *filename, GError **error); + +#ifdef XSLT +extern xmlDoc *test_xslt_transforms(xmlDoc *doc); +#endif + extern void show_dive_info(struct dive *); -extern void flush_dive_info_changes(struct dive *); extern void show_dive_equipment(struct dive *); -extern void flush_dive_equipment_changes(struct dive *); + +extern void show_dive_stats(struct dive *); extern void update_dive(struct dive *new_dive); extern void save_dives(const char *filename); @@ -239,11 +315,12 @@ extern time_t utc_mktime(struct tm *tm); extern struct dive *alloc_dive(void); extern void record_dive(struct dive *dive); +extern void delete_dive(struct dive *dive); extern struct sample *prepare_sample(struct dive **divep); -extern void finish_sample(struct dive *dive, struct sample *sample); +extern void finish_sample(struct dive *dive); -extern void report_dives(void); +extern void report_dives(gboolean imported); extern struct dive *fixup_dive(struct dive *dive); extern struct dive *try_to_merge(struct dive *a, struct dive *b); @@ -253,17 +330,24 @@ extern void add_event(struct dive *dive, int time, int type, int flags, int valu /* UI related protopypes */ -extern void init_ui(int argc, char **argv); +extern void init_ui(int *argcp, char ***argvp); extern void run_ui(void); +extern void exit_ui(void); extern void report_error(GError* error); +extern void add_cylinder_description(cylinder_type_t *); +extern void add_people(const char *string); +extern void add_location(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 void dive_list_update_dives(void); extern void flush_divelist(struct dive *dive); -extern int open_import_file_dialog(char *filterpattern, char *filtertext, - void(* parse_function)(char *)); #define DIVE_ERROR_PARSE 1 const char *weekday(int wday); @@ -271,5 +355,16 @@ const char *monthname(int mon); #define UTF8_DEGREE "\xc2\xb0" #define UTF8_SUBSCRIPT_2 "\xe2\x82\x82" +#define UTF8_WHITESTAR "\xe2\x98\x86" +#define UTF8_BLACKSTAR "\xe2\x98\x85" +#define ZERO_STARS UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR +#define ONE_STARS UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR +#define TWO_STARS UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR UTF8_WHITESTAR +#define THREE_STARS UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR UTF8_WHITESTAR +#define FOUR_STARS UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_WHITESTAR +#define FIVE_STARS UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR UTF8_BLACKSTAR +extern const char *star_strings[]; + +#define AIR_PERMILLE 209 #endif /* DIVE_H */