OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#7630 Ensemble Import : Show options Unified and Skip

Browse Source
This commit is contained in:
Magne Sjaastad 2021-04-28 08:24:32 +02:00
parent 7aa8175fb3
commit 46f186b72d
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/Commands/RicSummaryCaseRestartDialog.cpp
View File

@ -214,6 +214,7 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog( const
bool useFirstSummaryCaseAsTemplate,
ImportOptions defaultSummaryImportOption,
ImportOptions defaultGridImportOption,
bool hideSplitCases,
RicSummaryCaseRestartDialogResult* lastResult,
QWidget* parent )
{
@ -324,6 +325,15 @@ RicSummaryCaseRestartDialogResult RicSummaryCaseRestartDialog::openDialog( const
originSummaryFileInfos.push_back( ofi );
}
if ( hideSplitCases )
{
dialog.m_summarySeparateCasesBtn->hide();
}
else
{
dialog.m_summarySeparateCasesBtn->show();
}
// Set default import options
switch ( defaultSummaryImportOption )
{

5
ApplicationLibCode/Commands/RicSummaryCaseRestartDialog.h
View File

@ -73,8 +73,9 @@ public:
bool useFirstSummaryCaseAsTemplate,
ImportOptions defaultSummaryImportOption,
ImportOptions defaultGridImportOption,
RicSummaryCaseRestartDialogResult* lastResult = nullptr,
QWidget* parent = nullptr );
bool hideSplitCases,
RicSummaryCaseRestartDialogResult* lastResult,
QWidget* parent );
ImportOptions selectedSummaryImportOption() const;
ImportOptions selectedGridImportOption() const;

4
ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -197,7 +197,9 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser( const st
m_ensembleOrGroupMode,
defaultSummaryImportMode,
defaultGridImportMode,
&lastResult );
m_ensembleOrGroupMode,
&lastResult,
nullptr );
if ( result.status == RicSummaryCaseRestartDialogResult::SUMMARY_CANCELLED )
{