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

63
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@@ -19,10 +19,18 @@
#include "RimObservedDataCollection.h"
#include "RimObservedData.h"
#include "RiaLogging.h"
#include "RifKeywordVectorParser.h"
#include "RimColumnBasedUserData.h"
#include "RimObservedData.h"
#include "RimSummaryObservedDataFile.h"
#include "cafUtils.h"
#include <QFile>
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
//--------------------------------------------------------------------------------------------------
@@ -68,27 +76,46 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
{
RimObservedData* observedData = nullptr;
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
if (caf::Utils::fileExists(fileName))
{
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData();
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
RiaLogging::error(QString("Failed to open %1").arg(fileName));
observedData = columnBasedUserData;
}
// else
// {
// RimSummaryObservedDataFile* newObservedData = new RimSummaryObservedDataFile();
//
// observedData = newObservedData;
// }
return nullptr;
}
if (observedData)
{
this->m_observedDataArray.push_back(observedData);
observedData->setSummaryHeaderFileName(fileName);
observedData->createSummaryReaderInterface();
observedData->updateOptionSensitivity();
QTextStream in(&file);
QString fileContents = in.readAll();
this->updateConnectedEditors();
bool eclipseUserData = false;
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
{
eclipseUserData = true;
}
if (RifKeywordVectorParser::canBeParsed(fileContents))
{
eclipseUserData = true;
}
if (eclipseUserData)
{
RimColumnBasedUserData* columnBasedUserData = new RimColumnBasedUserData();
observedData = columnBasedUserData;
}
if (observedData)
{
this->m_observedDataArray.push_back(observedData);
observedData->setSummaryHeaderFileName(fileName);
observedData->createSummaryReaderInterface();
observedData->updateOptionSensitivity();
this->updateConnectedEditors();
}
}
return observedData;