summaryrefslogtreecommitdiffstats
path: root/dive.h
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-11 12:53:59 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org>2011-09-11 15:49:50 -0700
commit0c4e1697db2d9e15a05bc76056fca13e9ccb9ba4 (patch)
treef46f240c6f19cf0c46e817190e451ab96e023fe1 /dive.h
parent61d0aa10e1a88ac2e5ddcab9e0f05a729b3ab9e9 (diff)
downloadsubsurface-0c4e1697db2d9e15a05bc76056fca13e9ccb9ba4.tar.gz
Be more careful about unit changes
When we change units, we need to flush any currently active dive information in the old units, and then carefully reload it in the new units. Otherwise crazy stuff happens - like having current cylinder working pressure values that are in PSI because that *used* to be the output unit, but then interpreting those values as BAR, because we changed the units. Also, since we now properly import working pressure from Diving Log, stop importing the (useless) cylinder description. The Diving Log cylinder descriptions are things like "Alu" or "Steel". We're better off just making up our own. Finally, since Diving Log has cylinder size in metric, make sure that we do the "match standard cylinder sizes" *after* we've done all the cylinder size conversions to proper units. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'dive.h')
-rw-r--r--dive.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/dive.h b/dive.h
index 3ed233ddb..9e5d2c49e 100644
--- a/dive.h
+++ b/dive.h
@@ -166,6 +166,9 @@ struct dive_table {
extern struct dive_table dive_table;
+extern int selected_dive;
+#define current_dive (get_dive(selected_dive))
+
static inline struct dive *get_dive(unsigned int nr)
{
if (nr >= dive_table.nr)