mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the DC ceiling in the profile.

Browse source 
entry->ndl is computed and therefore should not be used for showing
the DC's ceiling. That made the DC ceiling jump to 0m when the computed
celing was at 0.

Signed-off-by: Patrick Valsecchi <patrick@thus.ch>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Patrick Valsecchi 2013-10-14 21:20:53 +02:00 • committed by Dirk Hohndel
parent 39d7ae5f3a
commit 291ce1d9ac
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
qt-ui/profilegraphics.cpp
View file

@ -1037,8 +1037,8 @@ void ProfileGraphicsView::plot_depth_profile()
/* Show any ceiling we may have encountered */ /* Show any ceiling we may have encountered */
if (prefs.profile_dc_ceiling) { if (prefs.profile_dc_ceiling) {
for (i = gc.pi.nr - 1; i >= 0; i--, entry--) { for (i = gc.pi.nr - 1; i >= 0; i--, entry--) {
if (entry->ndl) { if (!entry->in_deco) {
/* non-zero NDL implies this is a safety stop, no ceiling */ /* not in deco implies this is a safety stop, no ceiling */
p.append(QPointF(SCALEGC(entry->sec, 0))); p.append(QPointF(SCALEGC(entry->sec, 0)));
} else if (entry->stopdepth < entry->depth) { } else if (entry->stopdepth < entry->depth) {
p.append(QPointF(SCALEGC(entry->sec, entry->stopdepth))); p.append(QPointF(SCALEGC(entry->sec, entry->stopdepth)));
@ -1068,8 +1068,8 @@ void ProfileGraphicsView::plot_depth_profile()
entry = gc.pi.entry; entry = gc.pi.entry;
p.append(QPointF(SCALEGC(0, 0))); p.append(QPointF(SCALEGC(0, 0)));
for (i = 0; i < gc.pi.nr; i++, entry++) { for (i = 0; i < gc.pi.nr; i++, entry++) {
if (entry->ndl == 0 && entry->stopdepth) { if (entry->in_deco && entry->stopdepth) {
if (entry->ndl == 0 && entry->stopdepth < entry->depth) { if (entry->stopdepth < entry->depth) {
p.append(QPointF(SCALEGC(entry->sec, entry->stopdepth))); p.append(QPointF(SCALEGC(entry->sec, entry->stopdepth)));
} else { } else {
p.append(QPointF(SCALEGC(entry->sec, entry->depth))); p.append(QPointF(SCALEGC(entry->sec, entry->depth)));
@ -1143,7 +1143,7 @@ void ProfileGraphicsView::plot_depth_profile()
p.append(QPointF(SCALEGC(entry->sec, entry->depth))); p.append(QPointF(SCALEGC(entry->sec, entry->depth)));
for (i-- , entry--; i >= 0; i--, entry--) { for (i-- , entry--; i >= 0; i--, entry--) {
if (entry->ndl == 0 && entry->stopdepth > entry->depth) { if (entry->in_deco && entry->stopdepth > entry->depth) {
p.append(QPointF(SCALEGC(entry->sec, entry->stopdepth))); p.append(QPointF(SCALEGC(entry->sec, entry->stopdepth)));
} else { } else {
p.append(QPointF(SCALEGC(entry->sec, entry->depth))); p.append(QPointF(SCALEGC(entry->sec, entry->depth)));