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

#4773 Ensemble RFT: load formation file when loading observed data

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-09-26 15:43:13 +02:00
parent 912e2063df
commit 79da8ba5b5
3 changed files with 58 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/Commands/RicImportObservedFmuDataFeature.cpp
View File

@@ -18,6 +18,7 @@
#include "RicImportObservedFmuDataFeature.h"
#include "RiaApplication.h"
#include "RicImportFormationNamesFeature.h"
#include "RifReaderFmuRft.h"
#include "RimObservedDataCollection.h"
@@ -32,7 +33,9 @@
#include "cafSelectionManager.h"
#include <QAction>
#include <QDir>
#include <QFileDialog>
#include <QFileInfo>
#include <QMessageBox>
CAF_CMD_SOURCE_INIT( RicImportObservedFmuDataFeature, "RicImportObservedFmuDataFeature" );
@@ -62,6 +65,14 @@ void RicImportObservedFmuDataFeature::selectObservedDataPathInDialog()
for ( const QString& subDir : subDirsWithFmuData )
{
importedData = observedDataCollection->createAndAddFmuRftDataFromPath( subDir );
QDir dir( subDir );
QString layerZoneFile = dir.absoluteFilePath( "layer_zone_table.txt" );
if ( QFileInfo::exists( layerZoneFile ) )
{
QStringList fileNames;
fileNames << layerZoneFile;
RicImportFormationNamesFeature::importFormationFiles( fileNames );
}
}
if ( importedData != nullptr )
{