#2003 Observed Data : Handle STEPTYPE with potentially missing text for first row

This commit is contained in:
Magne Sjaastad
2017-11-06 10:53:46 +01:00
parent 296bacf7f6
commit f53acbdce2
5 changed files with 123 additions and 6 deletions

View File

@@ -18,6 +18,7 @@
#include "RifColumnBasedUserDataParser.h"
#include "RifEclipseUserDataKeywordTools.h"
#include "RifEclipseUserDataParserTools.h"
#include "RiaDateStringParser.h"
@@ -103,6 +104,15 @@ void RifColumnBasedUserDataParser::parseTableData(const QString& data)
int columnCount = static_cast<int>(columnInfos.size());
if (columnCount == 0) break;
int stepTypeIndex = -1;
for (size_t i = 0; i < columnInfos.size(); i++)
{
if (RifEclipseUserDataKeywordTools::isStepType(columnInfos[i].summaryAddress.quantityName()))
{
stepTypeIndex = static_cast<int>(i);
}
}
std::string line;
std::getline(streamData, line);
@@ -111,6 +121,12 @@ void RifColumnBasedUserDataParser::parseTableData(const QString& data)
QString qLine = QString::fromStdString(line);
QStringList entries = qLine.split(" ", QString::SkipEmptyParts);
if (stepTypeIndex > -1 &&
entries.size() < columnInfos.size())
{
entries.insert(stepTypeIndex, " ");
}
if (entries.size() < columnCount) break;
for (int i = 0; i < columnCount; i++)