OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

1941 Observed data: Set UTC time spec for parsed QDateTime object

Browse Source
This commit is contained in:
Unknown
2017-09-29 11:17:29 +02:00
committed by Rebecca Cox
parent 9db96cbb1b
commit 500aaed00b
2 changed files with 82 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ApplicationCode/FileInterface/RifColumnBasedUserData.cpp
View File

@@ -95,29 +95,37 @@ bool RifColumnBasedUserData::parse(const QString& data)
startDate = QDateTime::fromString(startDateString, dateFormatString);
}
else
{
startDate.setDate(QDate(01, 01, 1970));
}
m_timeSteps.resize(m_timeSteps.size() + 1);
quint64 scaleFactor = RiaDateTimeTools::secondsFromUnit(ci.unitName);
std::vector<time_t>& timeSteps = m_timeSteps.back();
if (startDate.isValid())
QString unit = QString::fromStdString(ci.unitName).trimmed().toUpper();
if (unit == "DAY" || unit == "DAYS")
{
for (const auto& timeStepValue : ci.values)
{
QDateTime dateTime = startDate.addSecs(scaleFactor * timeStepValue);
QDateTime dateTime = startDate.addDays((int)timeStepValue);
dateTime.setTimeSpec(Qt::UTC);
timeSteps.push_back(dateTime.toTime_t());
}
}
else
else if (unit == "YEAR" || unit == "YEARS")
{
for (const auto& timeStepValue : ci.values)
{
timeSteps.push_back(scaleFactor * timeStepValue);
QDateTime dateTime = startDate.addYears((int)timeStepValue);
dateTime.setTimeSpec(Qt::UTC);
timeSteps.push_back(dateTime.toTime_t());
}
}
for (size_t columIndex = 0; columIndex < m_parser->tables()[tableIndex].size(); columIndex++)
{
const ColumnInfo& ci = m_parser->tables()[tableIndex][columIndex];