From 5eae17551f5b9e39bdb36d2da228c1a0c1c0ef37 Mon Sep 17 00:00:00 2001 From: jonjenssen Date: Wed, 9 Sep 2020 14:35:15 +0200 Subject: [PATCH] Make sure the dialog doesn't show up when importing summary cases using python interface --- ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp | 5 +++-- ApplicationCode/Commands/RicImportSummaryCasesFeature.h | 3 ++- ApplicationCode/ProjectDataModelCommands/RimcProject.cpp | 4 +++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp b/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp index 7e0d2b907d..173bde27a2 100644 --- a/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp +++ b/ApplicationCode/Commands/RicImportSummaryCasesFeature.cpp @@ -171,7 +171,8 @@ bool RicImportSummaryCasesFeature::createAndAddSummaryCasesFromFiles( const QStr //-------------------------------------------------------------------------------------------------- bool RicImportSummaryCasesFeature::createSummaryCasesFromFiles( const QStringList& fileNames, std::vector* 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 ); } diff --git a/ApplicationCode/Commands/RicImportSummaryCasesFeature.h b/ApplicationCode/Commands/RicImportSummaryCasesFeature.h index 2a1511e188..81dad2f177 100644 --- a/ApplicationCode/Commands/RicImportSummaryCasesFeature.h +++ b/ApplicationCode/Commands/RicImportSummaryCasesFeature.h @@ -43,7 +43,8 @@ public: std::vector* newCases = nullptr ); static bool createSummaryCasesFromFiles( const QStringList& fileName, std::vector* newCases, - bool ensembleOrGroup = false ); + bool ensembleOrGroup = false, + bool allowDialogs = true ); static void addSummaryCases( const std::vector& cases ); static void addCasesToGroupIfRelevant( const std::vector& cases ); diff --git a/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp b/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp index 93fcc01074..0b40519185 100644 --- a/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp +++ b/ApplicationCode/ProjectDataModelCommands/RimcProject.cpp @@ -61,8 +61,10 @@ caf::PdmObjectHandle* RimProject_importSummaryCase::execute() QStringList summaryFileNames{absolutePath}; std::vector newCases; + bool ensembleOrGroup = false; + bool allowDialogs = false; - if ( RicImportSummaryCasesFeature::createSummaryCasesFromFiles( summaryFileNames, &newCases ) ) + if ( RicImportSummaryCasesFeature::createSummaryCasesFromFiles( summaryFileNames, &newCases, ensembleOrGroup, allowDialogs ) ) { RicImportSummaryCasesFeature::addSummaryCases( newCases );