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

cleanup: create common QDateTime -> timestamp conversion function

Browse source 
In analogy to the timestamp -> QDateTime conversion, create a
common function.
1) For symmetry with the opposite conversion.
2) To remove numerous inconsistencies.
3) To remove use of the deprecated QDateTime::toTime_t() function.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2020-05-22 18:53:25 +02:00 • committed by Dirk Hohndel
parent e33e420ef3
commit 8f80129bac
9 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/gpslocation.cpp
View file

@ -169,7 +169,7 @@ void GpsLocation::newPosition(QGeoPositionInfo pos)
// if we are waiting for a position update or
// if we have no record stored or if at least the configured minimum
// time has passed or we moved at least the configured minimum distance
int64_t delta = (int64_t)pos.timestamp().toTime_t() + gettimezoneoffset() - lastTime;
int64_t delta = dateTimeToTimestamp(pos.timestamp()) + gettimezoneoffset() - lastTime;
if (!nr || waitingForPosition || delta > prefs.time_threshold ||
lastCoord.distanceTo(pos.coordinate()) > prefs.distance_threshold) {
QString msg = QStringLiteral("received new position %1 after delta %2 threshold %3 (now %4 last %5)");
@ -177,7 +177,7 @@ void GpsLocation::newPosition(QGeoPositionInfo pos)
waitingForPosition = false;
acquiredPosition();
gpsTracker gt;
gt.when = pos.timestamp().toTime_t();
gt.when = dateTimeToTimestamp(pos.timestamp());
gt.when += gettimezoneoffset(gt.when);
gt.location = create_location(pos.coordinate().latitude(), pos.coordinate().longitude());
addFixToStorage(gt);

8
core/metadata.cpp
View file

@ -271,7 +271,7 @@ static bool parseDate(const QString &s_in, timestamp_t &timestamp)
if (datetime.isValid()) {
// Not knowing any better, we suppose that time is give in UTC
datetime.setTimeSpec(Qt::UTC);
timestamp = datetime.toMSecsSinceEpoch() / 1000;
timestamp = dateTimeToTimestamp(datetime);
return true;
}
@ -312,7 +312,7 @@ static bool parseDate(const QString &s_in, timestamp_t &timestamp)
// Not knowing any better, we suppose that time is give in UTC
datetime = QDateTime(date, time, Qt::UTC);
if (datetime.isValid()) {
timestamp = datetime.toMSecsSinceEpoch() / 1000;
timestamp = dateTimeToTimestamp(datetime);
return true;
}
@ -542,9 +542,9 @@ extern "C" mediatype_t get_metadata(const char *filename_in, metadata *data)
// have a standard way of storing this datum), use the file creation date of the file.
if (data->timestamp == 0)
#if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0)
data->timestamp = QFileInfo(filename).birthTime().toMSecsSinceEpoch() / 1000;
data->timestamp = dateTimeToTimestamp(QFileInfo(filename).birthTime());
#else
data->timestamp = QFileInfo(filename).created().toMSecsSinceEpoch() / 1000;
data->timestamp = dateTimeToTimestamp(QFileInfo(filename).created());
#endif
return res;
}

5
core/qthelper.cpp
View file

@ -709,6 +709,11 @@ QDateTime timestampToDateTime(timestamp_t when)
return QDateTime::fromMSecsSinceEpoch(1000 * when, Qt::UTC);
}
timestamp_t dateTimeToTimestamp(const QDateTime &t)
{
return t.toSecsSinceEpoch();
}
QString render_seconds_to_string(int seconds)
{
if (seconds % 60 == 0)

1
core/qthelper.h
View file

@ -63,6 +63,7 @@ QString getPrintingTemplatePathUser();
QString getPrintingTemplatePathBundle();
int gettimezoneoffset(timestamp_t when = 0);
QDateTime timestampToDateTime(timestamp_t when);
timestamp_t dateTimeToTimestamp(const QDateTime &t);
int parseDurationToSeconds(const QString &text);
int parseLengthToMm(const QString &text);
int parseTemperatureToMkelvin(const QString &text);