diff options
| author |  Stefan Fuchs <sfuchs@gmx.de> | 2017-05-11 22:43:36 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2017-05-26 15:50:52 -0700 |
| commit | e6d884cf26161df65c2b4b8c39d6b4133760537b (patch) | |
| tree | 2b9132e7d057c514c852a7cf7bed39fa67455a6f /qt-models | |
| parent | 53a8075bd8d7231f2bb483b9adca0fc60d4446f1 (diff) | |
| download | subsurface-e6d884cf26161df65c2b4b8c39d6b4133760537b.tar.gz | |
Creation of dive duration string and surface interval string
Update the function to create the dive duration string in a way that
it can be used also in info and stats tab and added some more flexibility.
Changed layout for <1h freedives to "0:05:35" (w/o units) or "5:35min"
(with units and :) or "5min 35sec" (with units with space).
Add a new function to create the surface interval string.
Completely remove old function get_time_string() and get_time_string_s().
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
Diffstat (limited to 'qt-models')
| -rw-r--r-- | qt-models/divetripmodel.cpp | 4 | ||||
| -rw-r--r-- | qt-models/yearlystatisticsmodel.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp index c57541ccd..0293f6a45 100644 --- a/qt-models/divetripmodel.cpp +++ b/qt-models/divetripmodel.cpp @@ -343,7 +343,9 @@ int DiveItem::countPhotos(dive *dive) const QString DiveItem::displayDuration() const { struct dive *dive = get_dive_by_uniq_id(diveId); - return get_dive_duration_string(dive->duration.seconds, ":", "m", "s", dive->dc.divemode == FREEDIVE); + return get_dive_duration_string(dive->duration.seconds, "", "", "", ":", dive->dc.divemode == FREEDIVE); + // Next line is test for alternative display with units + // return get_dive_duration_string(dive->duration.seconds, tr("h"), tr("min"), "", ":", dive->dc.divemode == FREEDIVE); } QString DiveItem::displayTemperature() const diff --git a/qt-models/yearlystatisticsmodel.cpp b/qt-models/yearlystatisticsmodel.cpp index b27dc8140..54941ac80 100644 --- a/qt-models/yearlystatisticsmodel.cpp +++ b/qt-models/yearlystatisticsmodel.cpp @@ -61,7 +61,7 @@ QVariant YearStatisticsItem::data(int column, int role) const ret = stats_interval.selection_size; break; case TOTAL_TIME: - ret = get_time_string(stats_interval.total_time.seconds, 0); + ret = get_dive_duration_string(stats_interval.total_time.seconds, tr("h"), tr("min"), tr("sec"), " "); break; case AVERAGE_TIME: ret = get_minutes(stats_interval.total_time.seconds / stats_interval.selection_size); |