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)
{
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;
depth_t visibility;
temperature_t airtemp, watertemp;
cylinder_t cylinder[MAX_CYLINDERS];
- int otu;
+ int sac, otu;
struct event *events;
int samples, alloc_samples;
struct sample sample[];
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);
/* UI related protopypes */
-extern void init_ui(int argc, char **argv);
+extern void init_ui(int *argcp, char ***argvp);
extern void run_ui(void);
}
#endif
-void init_ui(int argc, char **argv)
+void init_ui(int *argcp, char ***argvp)
{
GtkWidget *win;
GtkWidget *notebook;
GtkWidget *dive_info;
GtkWidget *dive_list;
GtkWidget *equipment;
+ GtkWidget *stats;
GtkWidget *menubar;
GtkWidget *vbox;
GdkScreen *screen;
"GTK_NOTEBOOK_TAB", GTK_TARGET_SAME_APP, 0
};
- gtk_init(&argc, &argv);
+ gtk_init(argcp, argvp);
settings = gtk_settings_get_default();
gtk_settings_set_long_property(settings, "gtk_tooltip_timeout", 10, "subsurface setting");
equipment = equipment_widget();
gtk_notebook_append_page(GTK_NOTEBOOK(notebook), equipment, gtk_label_new("Equipment"));
+ /* Frame for dive statistics */
+ stats = stats_widget();
+ gtk_notebook_append_page(GTK_NOTEBOOK(notebook), stats, gtk_label_new("Info & Stats"));
+
gtk_widget_set_app_paintable(win, TRUE);
gtk_widget_show_all(win);