diff options
| author |  Rick Walsh <rickmwalsh@gmail.com> | 2016-07-06 22:40:28 +1000 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2016-07-09 12:07:25 -0700 |
| commit | b1ed04a7f462d88b28b1abab881a0e1a8acc212a (patch) | |
| tree | 3281beb6fb2789d790330e14a07266ec8df4c5c9 /core/qthelper.cpp | |
| parent | 066f79223cf49cda5f762b3b9413774b8417cb9f (diff) | |
| download | subsurface-b1ed04a7f462d88b28b1abab881a0e1a8acc212a.tar.gz | |
Have divedatapoint store cylinder id instead of gasmix
Determining the correct cylinder index from a known gas mix can be
complicated, but it is trivial to look up the gasmix from the cylinder_t
structure.
It makes sense to remember which cylinder is being used. This simplifies
handling changing a cylinder's gas mix, either directly by the user, or
indirectly in the planner. It also permits tracking of multiple cylinders of
the same mix, e.g. independent twins / sidemount.
Signed-off-by: Rick Walsh <rickmwalsh@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'core/qthelper.cpp')
| -rw-r--r-- | core/qthelper.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/qthelper.cpp b/core/qthelper.cpp index d6a6c2579..01351376d 100644 --- a/core/qthelper.cpp +++ b/core/qthelper.cpp @@ -1215,9 +1215,10 @@ QString get_gas_string(struct gasmix gas) return result; } -QString get_divepoint_gas_string(const divedatapoint &p) +QString get_divepoint_gas_string(struct dive *d, const divedatapoint &p) { - return get_gas_string(p.gasmix); + int idx = p.cylinderid; + return get_gas_string(d->cylinder[idx].gasmix); } weight_t string_to_weight(const char *str) |