OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-20 11:48:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Date string parser. Fix build error. Set UTC time spec

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2017-10-05 11:26:21 +02:00
parent d5034d8011
commit a6e2a00122
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Application/Tools/RiaDateStringParser.cpp
View File

@ -47,7 +47,10 @@ QDateTime RiaDateStringParser::parseDateString(const QString& dateString)
tryParseYearFirst(s, year, month, day) ||
tryParseDayFirst(s, year, month, day);
return parsedOk ? QDateTime(QDate(year, month, day)) : QDateTime();
QDateTime dt;
dt.setTimeSpec(Qt::UTC);
if (parsedOk) dt.setDate(QDate(year, month, day));
return dt;
}
//--------------------------------------------------------------------------------------------------

7
ApplicationCode/FileInterface/RifColumnBasedUserDataParser.cpp
View File

@ -76,7 +76,6 @@ void RifColumnBasedUserDataParser::parseData(const QString& data)
// If a DATE column is present, use the first date as the start date of the samples
// This date is then used as basis for times defined by days or years given as double values
QDateTime startDate;
startDate.setTimeSpec(Qt::UTC);
std::vector<double> values;
QString qLine;
@ -91,14 +90,14 @@ void RifColumnBasedUserDataParser::parseData(const QString& data)
{
if (dateColumnIndex < columnCount)
{
QDate observationDate = RiaDateStringParser::parseDateString(entries[static_cast<int>(dateColumnIndex)].toStdString());
QDateTime observationDate = RiaDateStringParser::parseDateString(entries[static_cast<int>(dateColumnIndex)]);
if (observationDate.isValid() && !startDate.isValid())
{
startDate.setDate(observationDate);
startDate = observationDate;
}
table[i].observationDateTimes.push_back(QDateTime(observationDate));
table[i].observationDateTimes.push_back(observationDate);
}
double entry = entries.at(static_cast<int>(i)).toDouble();