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 #1839 Observed Data : Add parsing of column based summary data

Browse Source
This commit is contained in:
Magne Sjaastad
2017-09-25 14:37:41 +02:00
parent 05c07693b6
commit ef56591555
15 changed files with 339 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,7 +18,9 @@
#include "RimObservedDataCollection.h"
#include "RimObservedData.h"
#include "RimObservedRsmspecColumnBasedData.h"
#include "RimSummaryObservedDataFile.h"
CAF_PDM_SOURCE_INIT(RimObservedDataCollection, "ObservedDataCollection");
@@ -62,18 +64,34 @@ void RimObservedDataCollection::addObservedData(RimObservedData* observedData)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryObservedDataFile* RimObservedDataCollection::createAndAddObservedDataFromFileName(const QString& fileName)
RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName(const QString& fileName)
{
RimSummaryObservedDataFile* newObservedData = new RimSummaryObservedDataFile();
RimObservedData* observedData = nullptr;
this->m_observedDataArray.push_back(newObservedData);
newObservedData->setSummaryHeaderFilename(fileName);
newObservedData->createSummaryReaderInterface();
newObservedData->updateOptionSensitivity();
if (fileName.endsWith(".rsm", Qt::CaseInsensitive))
{
RimObservedRsmspecColumnBasedData* rsmspecColumnBasedData = new RimObservedRsmspecColumnBasedData();
this->updateConnectedEditors();
observedData = rsmspecColumnBasedData;
}
else
{
RimSummaryObservedDataFile* newObservedData = new RimSummaryObservedDataFile();
return newObservedData;
observedData = newObservedData;
}
if (observedData)
{
this->m_observedDataArray.push_back(observedData);
observedData->setSummaryHeaderFileName(fileName);
observedData->createSummaryReaderInterface();
observedData->updateOptionSensitivity();
this->updateConnectedEditors();
}
return observedData;
}
//--------------------------------------------------------------------------------------------------