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 : Obseved Data : Add support for parsing of start date

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-28 09:06:40 +02:00
parent 9364efa4b7
commit 8bae516af7
3 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/FileInterface/RifColumnBasedUserData.cpp
View File

@@ -87,15 +87,34 @@ bool RifColumnBasedUserData::parse(const QString& data)
else
{
const ColumnInfo& ci = m_parser->tables()[tableIndex][timeColumnIndex];
QDateTime startDate;
QString startDateString = QString::fromStdString(ci.startDate);
if (!startDateString.isEmpty())
{
QString dateFormatString = "ddMMyyyy";
startDate = QDateTime::fromString(startDateString, dateFormatString);
}
m_timeSteps.resize(m_timeSteps.size() + 1);
quint64 scaleFactor = RiaDateTimeTools::secondsFromUnit(ci.unitName);
std::vector<time_t>& timeSteps = m_timeSteps.back();
if (startDate.isValid())
{
for (auto v : ci.values)
for (const auto& timeStepValue : ci.values)
{
timeSteps.push_back(v * scaleFactor);
QDateTime dateTime = startDate.addSecs(scaleFactor * timeStepValue);
timeSteps.push_back(dateTime.toTime_t());
}
}
else
{
for (const auto& timeStepValue : ci.values)
{
timeSteps.push_back(scaleFactor * timeStepValue);
}
}