diff --git a/ApplicationLibCode/Application/RiaApplication.cpp b/ApplicationLibCode/Application/RiaApplication.cpp index 32ba8a052c..92cc5d2f70 100644 --- a/ApplicationLibCode/Application/RiaApplication.cpp +++ b/ApplicationLibCode/Application/RiaApplication.cpp @@ -48,6 +48,7 @@ #include "RicImportGeneralDataFeature.h" #include "RicImportGridAndSummaryEnsembleFeature.h" +#include "RicImportEclipseCaseFeature.h" #include "RicfCommandFileExecutor.h" #include "RicfCommandObject.h" @@ -427,6 +428,12 @@ bool RiaApplication::openFile( const QString& fileName ) bool createPlot = true; loadingSucceded = RicImportGeneralDataFeature::openEclipseFilesFromFileNames( QStringList{ fileName }, createPlot, createView ); lastUsedDialogTag = RiaDefines::defaultDirectoryLabel( fileType ); + + if ( loadingSucceded && RiaDefines::isEclipseResultFileType( fileType ) ) + { + // Keep behavior consistent with menu-based Eclipse case import. + RicImportEclipseCaseFeature::importPvdSurfacesForGridFiles( QStringList{ fileName }, {} ); + } } if ( loadingSucceded ) diff --git a/ApplicationLibCode/Application/RiaConsoleApplication.cpp b/ApplicationLibCode/Application/RiaConsoleApplication.cpp index 906105e6d1..27789501d0 100644 --- a/ApplicationLibCode/Application/RiaConsoleApplication.cpp +++ b/ApplicationLibCode/Application/RiaConsoleApplication.cpp @@ -28,6 +28,7 @@ #include "RiuRecentFileActionProvider.h" +#include "RicImportEclipseCaseFeature.h" #include "RicImportGeneralDataFeature.h" #include "cvfProgramOptions.h" @@ -318,7 +319,11 @@ RiaApplication::ApplicationStatus RiaConsoleApplication::handleArguments( gsl::n bool createView = true; bool createPlot = true; - RicImportGeneralDataFeature::openEclipseFilesFromFileNames( fileNames, createPlot, createView ); + auto results = RicImportGeneralDataFeature::openEclipseFilesFromFileNames( fileNames, createPlot, createView ); + if ( results ) + { + RicImportEclipseCaseFeature::importPvdSurfacesForGridFiles( fileNames, {} ); + } } if ( cvf::Option o = progOpt->option( "commandFile" ) ) diff --git a/ApplicationLibCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp b/ApplicationLibCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp index 1cafe38325..d54ba23d69 100644 --- a/ApplicationLibCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp +++ b/ApplicationLibCode/Commands/EclipseCommands/RicImportEclipseCaseFeature.cpp @@ -178,7 +178,6 @@ std::vector RicImportEclipseCaseFeature::allEclipseViews( RimPr //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -#include QStringList RicImportEclipseCaseFeature::findPvdFilesToImport( const QStringList& fileNames ) { QStringList pvdFilesToImport; @@ -210,7 +209,6 @@ QStringList RicImportEclipseCaseFeature::findPvdFilesToImport( const QStringList otherBase.compare( baseName, Qt::CaseInsensitive ) != 0 ) { otherBases.insert( otherBase ); - std::cout << "Found other Eclipse case base: " << otherBase.toStdString() << " (from file " << fileName.toStdString() << ")" << std::endl; } break; } @@ -232,7 +230,6 @@ QStringList RicImportEclipseCaseFeature::findPvdFilesToImport( const QStringList if ( pvdFile.startsWith( otherBase, Qt::CaseInsensitive ) ) { matchesOtherBase = true; - std::cout << "Excluding PVD file: " << pvdFile.toStdString() << " (matches other base: " << otherBase.toStdString() << ")" << std::endl; break; } }