diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 09:35:45 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-07 09:35:45 -0700 |
commit | c4d5ebb069d41f143d829da26693a72152809f20 (patch) | |
tree | 9b5e9ce6333ad74f144fa2cf168c160f4f73a276 /dive.h | |
parent | fdbd80a3a2e7185b931de139e043304ec5977350 (diff) | |
download | subsurface-c4d5ebb069d41f143d829da26693a72152809f20.tar.gz |
Do output unit conversion in the dive info window too
This should take care of it all, unless I missed some case.
Now we should just save the default units somewhere, and I should do the
divelist update much cleaner (instead of re-doing the divelist entirely,
it should just repaint it - now we lose the highlited dive etc).
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'dive.h')
-rw-r--r-- | dive.h | 16 |
1 files changed, 15 insertions, 1 deletions
@@ -95,7 +95,21 @@ static inline int to_C(temperature_t temp) { if (!temp.mkelvin) return 0; - return (temp.mkelvin - 273150) / 1000; + return (temp.mkelvin - 273150 + 499) / 1000; +} + +static inline int to_F(temperature_t temp) +{ + if (!temp.mkelvin) + return 0; + return temp.mkelvin * 9 / 5000.0 - 459.670 + 0.5; +} + +static inline int to_K(temperature_t temp) +{ + if (!temp.mkelvin) + return 0; + return (temp.mkelvin + 499)/1000; } static inline int to_PSI(pressure_t pressure) |