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 /core/helpers.h | |
| 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 'core/helpers.h')
| -rw-r--r-- | core/helpers.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/helpers.h b/core/helpers.h index a6e152cbf..06c1c8527 100644 --- a/core/helpers.h +++ b/core/helpers.h @@ -36,7 +36,8 @@ int parseWeightToGrams(const QString &text); int parsePressureToMbar(const QString &text); int parseGasMixO2(const QString &text); int parseGasMixHE(const QString &text); -QString get_dive_duration_string(timestamp_t when, QString hourText, QString minutesText, QString secondsText = "", bool isFreeDive = false); +QString get_dive_duration_string(timestamp_t when, QString hoursText, QString minutesText, QString secondsText = QObject::tr("sec"), QString separator = ":", bool isFreeDive = false); +QString get_dive_surfint_string(timestamp_t when, QString daysText, QString hoursText, QString minutesText, QString separator = " ", int maxdays = 4); QString get_dive_date_string(timestamp_t when); QString get_short_dive_date_string(timestamp_t when); bool is_same_day (timestamp_t trip_when, timestamp_t dive_when); |