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

Display divetime according to dive mode and translation

Browse source 
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>
This commit is contained in:
Giorgio Marzano 2015-10-11 15:37:28 +02:00 • committed by Dirk Hohndel
parent 166d587197
commit 44bdcffcd4
3 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
qt-ui/maintab.cpp
View file

@ -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"));