diff options
| author |  Giorgio Marzano <marzano.giorgio@gmail.com> | 2015-10-11 15:37:28 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-18 17:37:49 -0700 |
| commit | 44bdcffcd45904b621b37ffa6be0d7760173f492 (patch) | |
| tree | 0cdb2ec1333d47c544735396e34b0e75451015ee /qt-ui | |
| parent | 166d587197e9d1f227f603ed10de71bf06ccacb9 (diff) | |
| download | subsurface-44bdcffcd45904b621b37ffa6be0d7760173f492.tar.gz | |
Display divetime according to dive mode and translation
Many time stats in maintab display also seconds in short freediving
Signed-off-by: Giorgio Marzano <marzano.giorgio@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui')
| -rw-r--r-- | qt-ui/maintab.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index be63d5e11..0afb7b4c0 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -609,9 +609,13 @@ void MainTab::updateDiveInfo(bool clear) ui.gasUsedText->setText(volumes); ui.oxygenHeliumText->setText(gaslist); ui.dateText->setText(get_short_dive_date_string(displayed_dive.when)); - ui.diveTimeText->setText(QString::number((int)((displayed_dive.duration.seconds + 30) / 60))); + if (displayed_dive.dc.divemode != FREEDIVE) + ui.diveTimeText->setText(get_time_string_s(displayed_dive.duration.seconds + 30, 0, false)); + else + ui.diveTimeText->setText(get_time_string_s(displayed_dive.duration.seconds, 0, true)); if (prevd) - ui.surfaceIntervalText->setText(get_time_string(displayed_dive.when - (prevd->when + prevd->duration.seconds), 4)); + ui.surfaceIntervalText->setText(get_time_string_s(displayed_dive.when - (prevd->when + prevd->duration.seconds), 4, + (displayed_dive.dc.divemode == FREEDIVE))); else ui.surfaceIntervalText->clear(); if (mean[0]) @@ -662,14 +666,14 @@ void MainTab::updateDiveInfo(bool clear) ui.tempLimits->overrideMaxToolTipText(tr("Highest temperature")); ui.tempLimits->overrideMinToolTipText(tr("Lowest temperature")); ui.tempLimits->overrideAvgToolTipText(tr("Average temperature of all selected dives")); - ui.totalTimeAllText->setText(get_time_string(stats_selection.total_time.seconds, 0)); + ui.totalTimeAllText->setText(get_time_string_s(stats_selection.total_time.seconds, 0, (displayed_dive.dc.divemode == FREEDIVE))); int seconds = stats_selection.total_time.seconds; if (stats_selection.selection_size) seconds /= stats_selection.selection_size; - ui.timeLimits->setAverage(get_time_string(seconds, 0)); + ui.timeLimits->setAverage(get_time_string_s(seconds, 0,(displayed_dive.dc.divemode == FREEDIVE))); if (amount_selected > 1) { - ui.timeLimits->setMaximum(get_time_string(stats_selection.longest_time.seconds, 0)); - ui.timeLimits->setMinimum(get_time_string(stats_selection.shortest_time.seconds, 0)); + ui.timeLimits->setMaximum(get_time_string_s(stats_selection.longest_time.seconds, 0, (displayed_dive.dc.divemode == FREEDIVE))); + ui.timeLimits->setMinimum(get_time_string_s(stats_selection.shortest_time.seconds, 0, (displayed_dive.dc.divemode == FREEDIVE))); } ui.timeLimits->overrideMaxToolTipText(tr("Longest dive")); ui.timeLimits->overrideMinToolTipText(tr("Shortest dive")); |