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

#1934 Observed Data : Support for vector based files

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-27 15:12:55 +02:00
parent 53ec396449
commit cdd1a96f44
8 changed files with 422 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/FileInterface/RifColumnBasedUserData.cpp
View File

@@ -48,31 +48,21 @@ RifColumnBasedUserData::~RifColumnBasedUserData()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RifColumnBasedUserData::open(const QString& headerFileName)
bool RifColumnBasedUserData::parse(const QString& data)
{
if (!caf::Utils::fileExists(headerFileName)) return false;
m_allResultAddresses.clear();
m_timeSteps.clear();
m_mapFromAddressToTimeStepIndex.clear();
m_mapFromAddressToResultIndex.clear();
QFile file(headerFileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
RiaLogging::error(QString("Failed to open %1").arg(headerFileName));
return false;
}
QTextStream in(&file);
QString fileContents = in.readAll();
m_parser = std::unique_ptr<RifColumnBasedUserDataParser>(new RifColumnBasedUserDataParser(fileContents));
m_parser = std::unique_ptr<RifColumnBasedUserDataParser>(new RifColumnBasedUserDataParser(data));
if (!m_parser)
{
RiaLogging::error(QString("Failed to parse file %1").arg(headerFileName));
RiaLogging::error(QString("Failed to parse file"));
return false;
}
m_allResultAddresses.clear();
for (size_t tableIndex = 0; tableIndex < m_parser->tables().size(); tableIndex++)
{
size_t timeColumnIndex = m_parser->tables()[tableIndex].size();
@@ -90,7 +80,7 @@ bool RifColumnBasedUserData::open(const QString& headerFileName)
if (timeColumnIndex == m_parser->tables()[tableIndex].size())
{
RiaLogging::warning(QString("Failed to find time data for table %1 in file %2").arg(tableIndex).arg(headerFileName));
RiaLogging::warning(QString("Failed to find time data for table %1 in file %2").arg(tableIndex));
RiaLogging::warning(QString("No data for this table is imported"));
}
else
@@ -106,7 +96,7 @@ bool RifColumnBasedUserData::open(const QString& headerFileName)
timeSteps.push_back(v);
}
}
for (size_t columIndex = 0; columIndex < m_parser->tables()[tableIndex].size(); columIndex++)
{
const ColumnInfo& ci = m_parser->tables()[tableIndex][columIndex];
@@ -123,6 +113,7 @@ bool RifColumnBasedUserData::open(const QString& headerFileName)
}
return true;
}
//--------------------------------------------------------------------------------------------------