mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use unit functions to get column headers, add unit function for pressure

Browse source 
Finally getting more consistent overall in how we convert between the
different units and how we decide which units to display.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2011-11-01 20:13:14 -07:00
parent a487f6c931
commit b26ca781b8
4 changed files with 34 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
dive.c
View file

@ -29,6 +29,30 @@ void add_event(struct dive *dive, int time, int type, int flags, int value, cons
remember_event(name);
}
int get_pressure_units(unsigned int mb, const char **units)
{
int pressure;
const char* unit;
switch (output_units.pressure) {
case PASCAL:
pressure = mb * 100;
unit = "pascal";
break;
case BAR:
pressure = (mb + 500) / 1000;
unit = "bar";
break;
case PSI:
pressure = mbar_to_PSI(mb);
unit = "psi";
break;
}
if (units)
*units = unit;
return pressure;
}
double get_temp_units(unsigned int mk, const char **units)
{
double deg;

7
dive.h
View file

@ -86,6 +86,7 @@ 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);
@ -146,6 +147,12 @@ 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;

21
divelist.c
View file

@ -420,27 +420,10 @@ void update_dive_list_units(void)
const char *unit;
GtkTreeModel *model = GTK_TREE_MODEL(dive_list.model);
switch (output_units.length) {
case METERS:
unit = "m";
break;
case FEET:
unit = "ft";
break;
}
(void) get_depth_units(0, NULL, &unit);
gtk_tree_view_column_set_title(dive_list.depth, unit);
switch (output_units.temperature) {
case CELSIUS:
unit = UTF8_DEGREE "C";
break;
case FAHRENHEIT:
unit = UTF8_DEGREE "F";
break;
case KELVIN:
unit = "Kelvin";
break;
}
(void) get_temp_units(0, &unit);
gtk_tree_view_column_set_title(dive_list.temperature, unit);
gtk_tree_model_foreach(model, set_one_dive, NULL);

21
profile.c
View file

@ -611,32 +611,13 @@ static void plot_cylinder_pressure(struct graphics_context *gc, struct plot_info
plot_pressure_helper(gc, pi, INTERPOLATED_PR);
}
static int mbar_to_PSI(int mbar)
{
pressure_t p = {mbar};
return to_PSI(p);
}
static void plot_pressure_value(struct graphics_context *gc, int mbar, int sec,
int xalign, int yalign)
{
int pressure;
const char *unit;
switch (output_units.pressure) {
case PASCAL:
pressure = mbar * 100;
unit = "pascal";
break;
case BAR:
pressure = (mbar + 500) / 1000;
unit = "bar";
break;
case PSI:
pressure = mbar_to_PSI(mbar);
unit = "psi";
break;
}
pressure = get_pressure_units(mbar, &unit);
text_render_options_t tro = {10, 0.2, 1.0, 0.2, xalign, yalign};
plot_text(gc, &tro, sec, mbar, "%d %s", pressure, unit);
}