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

Make sure the dialog doesn't show up when importing summary cases using python interface

Browse Source
This commit is contained in:
jonjenssen 2020-09-09 14:35:15 +02:00 committed by jonjenssen
parent dbec9dd3a5
commit 5eae17551f
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp
View File

@ -171,7 +171,8 @@ bool RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles( const QStr
//--------------------------------------------------------------------------------------------------
bool RicImportSummaryCasesFeature::createSummaryCasesFromFiles( const QStringList& fileNames,
std::vector<RimSummaryCase*>* newCases,
bool ensembleOrGroup )
bool ensembleOrGroup,
bool allowDialogs )
{
RiaApplication* app = RiaApplication::instance();
RimProject* proj = app->project();
@ -184,7 +185,7 @@ bool RicImportSummaryCasesFeature::createSummaryCasesFromFiles( const QStringLis
RifSummaryCaseRestartSelector fileSelector;
if ( !RiaGuiApplication::isRunning() )
if ( !RiaGuiApplication::isRunning() || !allowDialogs )
{
fileSelector.showDialog( false );
}

3
ApplicationCode/Commands/RicImportSummaryCasesFeature.h
View File

@ -43,7 +43,8 @@ public:
std::vector<RimSummaryCase*>* newCases = nullptr );
static bool createSummaryCasesFromFiles( const QStringList& fileName,
std::vector<RimSummaryCase*>* newCases,
bool ensembleOrGroup = false );
bool ensembleOrGroup = false,
bool allowDialogs = true );
static void addSummaryCases( const std::vector<RimSummaryCase*>& cases );
static void addCasesToGroupIfRelevant( const std::vector<RimSummaryCase*>& cases );

4
ApplicationCode/ProjectDataModelCommands/RimcProject.cpp
View File

@ -61,8 +61,10 @@ caf::PdmObjectHandle* RimProject_importSummaryCase::execute()
QStringList summaryFileNames{absolutePath};
std::vector<RimSummaryCase*> newCases;
bool ensembleOrGroup = false;
bool allowDialogs = false;
if ( RicImportSummaryCasesFeature::createSummaryCasesFromFiles( summaryFileNames, &newCases ) )
if ( RicImportSummaryCasesFeature::createSummaryCasesFromFiles( summaryFileNames, &newCases, ensembleOrGroup, allowDialogs ) )
{
RicImportSummaryCasesFeature::addSummaryCases( newCases );