diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2020-04-13 18:58:16 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2020-05-07 08:56:56 -0700 |
| commit | 326772cbdbdbfd29b953a21fabb722676ffedfdc (patch) | |
| tree | 4b1f53791ab87abb1bee73e9beb953f83c8dbe7c | |
| parent | 5febb534b8dc4f603bc8e83a4583ebedfe417246 (diff) | |
| download | subsurface-326772cbdbdbfd29b953a21fabb722676ffedfdc.tar.gz | |
statistics tab: use current_dive to decide whether user is freediving
This used the displayed_dive object. However, we now use current_dive
to designate the currently displayed dive. Thus, use this instead.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | desktop-widgets/tab-widgets/TabDiveStatistics.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp index 83df3ab2c..bedc15402 100644 --- a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp +++ b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp @@ -107,20 +107,18 @@ void TabDiveStatistics::updateData() } + bool is_freedive = current_dive && current_dive->dc.divemode == FREEDIVE; ui->divesAllText->setText(QString::number(stats_selection.selection_size)); - ui->totalTimeAllText->setText(get_dive_duration_string(stats_selection.total_time.seconds, tr("h"), tr("min"), tr("sec"), - " ", displayed_dive.dc.divemode == FREEDIVE)); + ui->totalTimeAllText->setText(get_dive_duration_string(stats_selection.total_time.seconds, tr("h"), tr("min"), tr("sec"), " ", is_freedive)); int seconds = stats_selection.total_time.seconds; if (stats_selection.selection_size) seconds /= stats_selection.selection_size; ui->timeLimits->setAverage(get_dive_duration_string(seconds, tr("h"), tr("min"), tr("sec"), - " ", displayed_dive.dc.divemode == FREEDIVE)); + " ", is_freedive)); if (amount_selected > 1) { - ui->timeLimits->setMaximum(get_dive_duration_string(stats_selection.longest_time.seconds, tr("h"), tr("min"), tr("sec"), - " ", displayed_dive.dc.divemode == FREEDIVE)); - ui->timeLimits->setMinimum(get_dive_duration_string(stats_selection.shortest_time.seconds, tr("h"), tr("min"), tr("sec"), - " ", displayed_dive.dc.divemode == FREEDIVE)); + ui->timeLimits->setMaximum(get_dive_duration_string(stats_selection.longest_time.seconds, tr("h"), tr("min"), tr("sec"), " ", is_freedive)); + ui->timeLimits->setMinimum(get_dive_duration_string(stats_selection.shortest_time.seconds, tr("h"), tr("min"), tr("sec"), " ", is_freedive)); } else { ui->timeLimits->setMaximum(""); ui->timeLimits->setMinimum(""); |