From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Nov 2011 19:39:55 +0000 (-0700)
Subject: Merge branch 'add-info-stats-page' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=55352a051cfa7ac519e397cd3d18851e5050517b;hp=-c;p=ext%2Fsubsurface.git

Merge branch 'add-info-stats-page' of git://github.com/dirkhh/subsurface

* 'add-info-stats-page' of git://github.com/dirkhh/subsurface:
  Add Info & Stats page to the notebook
  Even more places with pressure and volume conversions
  Further cleanup of pressure and volume conversions
  Use unit functions to get column headers, add unit function for pressure
  More consistency improvements
  Add new helper function to get temperature and unit
---

55352a051cfa7ac519e397cd3d18851e5050517b
diff --combined dive.h
index eda8d6b,2fae0c9..cf11e1f
--- a/dive.h
+++ b/dive.h
@@@ -86,7 -86,20 +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,16 -142,31 +142,31 @@@ static inline int to_K(temperature_t te
  	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;
@@@ -176,7 -204,7 +204,7 @@@ struct dive 
  	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[];
@@@ -231,6 -259,8 +259,8 @@@ extern void flush_dive_info_changes(str
  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);
  
@@@ -257,7 -287,7 +287,7 @@@ extern void add_event(struct dive *dive
  
  /* UI related protopypes */
  
 -extern void init_ui(int argc, char **argv);
 +extern void init_ui(int *argcp, char ***argvp);
  
  extern void run_ui(void);
  
diff --combined gtk-gui.c
index 676c0d0,dd79f73..339b13f
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@@ -739,13 -739,14 +739,14 @@@ static int get_from_registry(HKEY hkey
  }
  #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;
@@@ -755,7 -756,7 +756,7 @@@
  		"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");
  
@@@ -875,6 -876,10 +876,10 @@@
  	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);
  
diff --combined main.c
index 471abc7,680bf21..9aaa5d1
--- a/main.c
+++ b/main.c
@@@ -193,6 -193,7 +193,7 @@@ void update_dive(struct dive *new_dive
  	if (new_dive) {
  		show_dive_info(new_dive);
  		show_dive_equipment(new_dive);
+ 		show_dive_stats(new_dive);
  	}
  	buffered_dive = new_dive;
  }
@@@ -217,7 -218,7 +218,7 @@@ int main(int argc, char **argv
  
  	parse_xml_init();
  
 -	init_ui(argc, argv);
 +	init_ui(&argc, &argv);
  	
  	for (i = 1; i < argc; i++) {
  		const char *a = argv[i];