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

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

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);
}