OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1962 : Observed Data : Add helper class for QDateTime and use from parsers

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-03 14:14:16 +02:00
parent f3f78995fa
commit db981e2eee
7 changed files with 148 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/FileInterface/RifKeywordVectorUserData.cpp
+18 -16
View File
@@ -18,7 +18,7 @@
#include "RifKeywordVectorUserData.h"
#include "RiaDateTimeTools.h"
#include "RiaQDateTimeTools.h"
#include "RiaLogging.h"
#include "RifEclipseSummaryAddress.h"
@@ -106,26 +106,28 @@ bool RifKeywordVectorUserData::parse(const QString& data)
dateFormatString = "DD MM YYYY";
}
startDate = QDateTime::fromString(startDateString, dateFormatString);
}
QString unitText = valueForKey(keyValuePairs, "UNITS");
quint64 scaleFactor = RiaDateTimeTools::secondsFromUnit(unitText.toStdString());
if (startDate.isValid())
{
for (const auto& timeStepValue : m_parser->keywordBasedVectors()[i].values)
{
QDateTime dateTime = startDate.addSecs(scaleFactor * timeStepValue);
ts.push_back(dateTime.toTime_t());
}
startDate = RiaQDateTimeTools::fromString(startDateString, dateFormatString);
}
else
{
startDate = RiaQDateTimeTools::epoch();
}
QString unitText = valueForKey(keyValuePairs, "UNITS");
if (unitText == "DAY" || unitText == "DAYS")
{
for (const auto& timeStepValue : m_parser->keywordBasedVectors()[i].values)
{
ts.push_back(scaleFactor * timeStepValue);
QDateTime dateTime = RiaQDateTimeTools::addDays(startDate, timeStepValue);
ts.push_back(dateTime.toTime_t());
}
}
else if (unitText == "YEAR" || unitText == "YEARS")
{
for (const auto& timeStepValue : m_parser->keywordBasedVectors()[i].values)
{
QDateTime dateTime = RiaQDateTimeTools::fromYears(timeStepValue);
ts.push_back(dateTime.toTime_t());
}
}
}