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

Fix import of well paths and well log files from Python when the folder is not provided

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-02-24 11:45:21 +01:00
parent c63c7f2eac
commit 76b108d068
2 changed files with 44 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/CommandFileInterface/RicfImportWellLogFiles.cpp
View File

@@ -19,6 +19,7 @@
#include "WellLogCommands/RicWellLogsImportFileFeature.h"
#include "RiaApplication.h"
#include "RimWellLogFile.h"
#include <QDir>
@@ -52,15 +53,24 @@ RicfCommandResponse RicfImportWellLogFiles::execute()
QStringList errorMessages, warningMessages;
QStringList wellLogFilePaths;
QDir wellPathFolder( m_wellLogFileFolder );
if ( wellPathFolder.exists() )
QDir wellLogDir;
if ( m_wellLogFileFolder().isEmpty() )
{
wellLogDir = QDir( RiaApplication::instance()->startDir() );
}
else
{
wellLogDir = QDir( m_wellLogFileFolder );
}
if ( !m_wellLogFileFolder().isEmpty() )
{
QStringList nameFilters;
nameFilters << RicWellLogsImportFileFeature::wellLogFileNameFilters();
QStringList relativePaths = wellPathFolder.entryList( nameFilters, QDir::Files | QDir::NoDotAndDotDot );
QStringList relativePaths = wellLogDir.entryList( nameFilters, QDir::Files | QDir::NoDotAndDotDot );
for ( QString relativePath : relativePaths )
{
wellLogFilePaths.push_back( wellPathFolder.absoluteFilePath( relativePath ) );
wellLogFilePaths.push_back( wellLogDir.absoluteFilePath( relativePath ) );
}
}
else
@@ -74,6 +84,10 @@ RicfCommandResponse RicfImportWellLogFiles::execute()
{
wellLogFilePaths.push_back( wellLogFilePath );
}
else if ( QFileInfo::exists( wellLogDir.absoluteFilePath( wellLogFilePath ) ) )
{
wellLogFilePaths.push_back( wellLogDir.absoluteFilePath( wellLogFilePath ) );
}
else
{
errorMessages << ( wellLogFilePath + " doesn't exist" );

37
ApplicationCode/Commands/WellPathCommands/RicImportWellPaths.cpp
View File

@@ -71,21 +71,32 @@ RicfCommandResponse RicImportWellPaths::execute()
QStringList errorMessages, warningMessages;
QStringList wellPathFiles;
QDir wellPathFolder( m_wellPathFolder );
if ( wellPathFolder.exists() )
QDir wellPathDir;
if ( m_wellPathFolder().isEmpty() )
{
QStringList nameFilters;
nameFilters << RicImportWellPaths::wellPathNameFilters();
QStringList relativePaths = wellPathFolder.entryList( nameFilters, QDir::Files | QDir::NoDotAndDotDot );
for ( QString relativePath : relativePaths )
{
wellPathFiles.push_back( wellPathFolder.absoluteFilePath( relativePath ) );
}
wellPathDir = QDir( RiaApplication::instance()->startDir() );
}
else
{
errorMessages << ( m_wellPathFolder() + " does not exist" );
wellPathDir = QDir( m_wellPathFolder );
}
if ( !m_wellPathFolder().isEmpty() )
{
if ( wellPathDir.exists() )
{
QStringList nameFilters;
nameFilters << RicImportWellPaths::wellPathNameFilters();
QStringList relativePaths = wellPathDir.entryList( nameFilters, QDir::Files | QDir::NoDotAndDotDot );
for ( QString relativePath : relativePaths )
{
wellPathFiles.push_back( wellPathDir.absoluteFilePath( relativePath ) );
}
}
else
{
errorMessages << ( wellPathDir.absolutePath() + " does not exist" );
}
}
for ( QString wellPathFile : m_wellPathFiles() )
@@ -94,6 +105,10 @@ RicfCommandResponse RicImportWellPaths::execute()
{
wellPathFiles.push_back( wellPathFile );
}
else if ( QFileInfo::exists( wellPathDir.absoluteFilePath( wellPathFile ) ) )
{
wellPathFiles.push_back( wellPathDir.absoluteFilePath( wellPathFile ) );
}
else
{
errorMessages << ( wellPathFile + " does not exist" );