X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=dive.h;h=cf11e1f89384bb34176e9eb5c14879cb89f73be1;hb=e38eb77e30c2d0d06eb61db0cd1bdf3f5e164e8d;hp=b121892e9296de5e8e2844124123fa0d728db9ea;hpb=3a77eb85101a5fb1dc186b88a3a02d2ae27690c7;p=ext%2Fsubsurface.git

diff --git a/dive.h b/dive.h
index b121892..cf11e1f 100644
--- a/dive.h
+++ b/dive.h
@@ -86,7 +86,20 @@ typedef struct {
 	pressure_t start, end;
 } cylinder_t;
 
+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 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)
 {
@@ -129,11 +142,31 @@ 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 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;
@@ -171,6 +204,7 @@ struct dive {
 	depth_t visibility;
 	temperature_t airtemp, watertemp;
 	cylinder_t cylinder[MAX_CYLINDERS];
+	int sac, otu;
 	struct event *events;
 	int samples, alloc_samples;
 	struct sample sample[];
@@ -181,6 +215,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;
@@ -195,7 +233,7 @@ extern struct units input_units, output_units;
 extern int verbose;
 
 struct dive_table {
-	int nr, allocated;
+	int nr, allocated, preexisting;
 	struct dive **dives;
 };
 
@@ -221,6 +259,8 @@ 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);
 
@@ -237,7 +277,7 @@ extern void record_dive(struct dive *dive);
 extern struct sample *prepare_sample(struct dive **divep);
 extern void finish_sample(struct dive *dive, struct sample *sample);
 
-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);
 
@@ -247,17 +287,21 @@ 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 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 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);