diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2017-09-30 18:00:34 +0200 |
|---|---|---|
| committer |  Lubomir I. Ivanov <neolit123@gmail.com> | 2017-10-01 23:55:37 +0300 |
| commit | 7713c7e607b11c0828decdbf35d910280153f880 (patch) | |
| tree | 8e08d80032ba7cdcaa344042da7e220f217b75c5 /desktop-widgets/tab-widgets | |
| parent | 325c4459ade70f626d6a39fecfb9e0c27f0c5cee (diff) | |
| download | subsurface-7713c7e607b11c0828decdbf35d910280153f880.tar.gz | |
Use helper function dive_endtime() where apropriate
Calculating dive.when + dive.duration doesn't always give the correct
endtime of a dive especially when a dive has surface interval(s) in
the middle.
Using the helper function dive_endtime() fixes this issue.
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'desktop-widgets/tab-widgets')
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveInformation.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp index 419e73739..ae3998ed8 100644 --- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp +++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp @@ -6,6 +6,7 @@ #include <core/helpers.h> #include <core/statistics.h> #include <core/display.h> +#include <core/dive.h> TabDiveInformation::TabDiveInformation(QWidget *parent) : TabBase(parent), ui(new Ui::TabDiveInformation()) { @@ -81,7 +82,7 @@ void TabDiveInformation::updateData() process_all_dives(&displayed_dive, &prevd); if (prevd) - ui->surfaceIntervalText->setText(get_dive_surfint_string(displayed_dive.when - (prevd->when + prevd->duration.seconds), tr("d"), tr("h"), tr("min"))); + ui->surfaceIntervalText->setText(get_dive_surfint_string(displayed_dive.when - (dive_endtime(prevd)), tr("d"), tr("h"), tr("min"))); else ui->surfaceIntervalText->clear(); |