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

#2610 Add RifEnsambleParametersReader and RifFileParseTools

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-03-22 14:40:21 +01:00
parent 98c8f3305d
commit 81354e0408
9 changed files with 386 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ApplicationCode/FileInterface/RifElementPropertyTableReader.cpp
View File

@@ -17,6 +17,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RifElementPropertyTableReader.h"
#include "RifFileParseTools.h"
#include "RiaLogging.h"
#include "RiuMainWindow.h"
@@ -36,7 +37,6 @@
//--------------------------------------------------------------------------------------------------
static QFile* openFile(const QString &fileName);
static void closeFile(QFile *file);
static QStringList splitLineAndTrim(const QString& line, const QString& separator);
//--------------------------------------------------------------------------------------------------
///
@@ -70,7 +70,7 @@ RifElementPropertyMetadata RifElementPropertyTableReader::readMetadata(const QSt
if (!metadataBlockFound) continue;
QStringList cols = splitLineAndTrim(line, ",");
QStringList cols = RifFileParseTools::splitLineAndTrim(line, ",");
metadata.fileName = fileName;
for (QString s : cols)
@@ -119,7 +119,7 @@ void RifElementPropertyTableReader::readData(const RifElementPropertyMetadata *m
while (!stream.atEnd())
{
QString line = stream.readLine();
QStringList cols = splitLineAndTrim(line, ",");
QStringList cols = RifFileParseTools::splitLineAndTrim(line, ",");
lineNo++;
if (!dataBlockFound)
@@ -201,16 +201,3 @@ void closeFile(QFile *file)
delete file;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList splitLineAndTrim(const QString& line, const QString& separator)
{
QStringList cols = line.split(separator);
for (QString& col : cols)
{
col = col.trimmed();
}
return cols;
}