diff options
author | Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-10-03 17:03:28 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2020-10-05 12:59:02 -0700 |
commit | 6729428b6a942f83892129d7b8d1e5ef04930d05 (patch) | |
tree | 6188d5cb5b28039ba4ebefc4b2c344b93f1dc49f /core/picture.h | |
parent | 6f8837eca3c001d8389cfcbcfa6dfc511bd78b47 (diff) | |
download | subsurface-6729428b6a942f83892129d7b8d1e5ef04930d05.tar.gz |
core: improve merging of cylinders pressures
When merging cylinders pressures derived from samples were taken
as maximum of the start and minimum of the end pressure, which
makes sense, since we believe that this is the same cylinder.
However, for manually entered pressures, this was not done.
Moreover, when one dive had manual pressures and the other only
pressure from samples, the manual pressure was taken. However,
that could have been the wrong one, for example if the end
pressure was manually set for the cylinder of the first part of
the dive, but not the last.
Therefore, improve merging of manuall set pressures in two ways:
1) use maximum/minimum for start/end pressure
2) if the pressure of one cylinder was manually set, but not for
the other, complete with the sample pressure (if that exists).
Fixes #2884.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/picture.h')
0 files changed, 0 insertions, 0 deletions