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

#2685 Origin summary. Split preferences settings into two fields

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-04-09 13:21:48 +02:00
parent 3116a4a223
commit ee9e9b2989
6 changed files with 40 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@@ -46,6 +46,17 @@ bool vectorContains(const std::vector<T>& vector, T item)
return false;
}
//--------------------------------------------------------------------------------------------------
/// INternal function
//--------------------------------------------------------------------------------------------------
RicSummaryCaseRestartDialog::ReadOptions mapReadOption(RiaPreferences::SummaryRestartFilesImportMode mode)
{
return
mode == RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ? RicSummaryCaseRestartDialog::ReadOptions::NOT_IMPORT :
mode == RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ? RicSummaryCaseRestartDialog::ReadOptions::SEPARATE_CASES :
RicSummaryCaseRestartDialog::ReadOptions::IMPORT_ALL;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -71,10 +82,10 @@ std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImp
RiaPreferences* prefs = app->preferences();
std::vector<RifSummaryCaseFileInfo> fileInfos;
if (prefs->summaryRestartFilesImportMode == RiaPreferences::ASK_USER)
if (prefs->summaryRestartFilesShowImportDialog)
{
bool enableApplyToAllField = selectedFiles.size() > 1;
fileInfos = getFilesToImportByAskingUser(selectedFiles, enableApplyToAllField);
fileInfos = getFilesToImportByAskingUser(selectedFiles, enableApplyToAllField, prefs->summaryRestartFilesImportMode);
}
else
{
@@ -88,19 +99,20 @@ std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImp
///
//--------------------------------------------------------------------------------------------------
std::vector<RifSummaryCaseFileInfo> RifSummaryCaseRestartSelector::getFilesToImportByAskingUser(const QStringList& initialFiles,
bool enableApplyToAllField)
bool enableApplyToAllField,
RiaPreferences::SummaryRestartFilesImportModeType defaultSummaryRestartMode)
{
std::vector<RifSummaryCaseFileInfo> filesToImport;
RicSummaryCaseRestartDialogResult lastResult;
for (const QString& file : initialFiles)
{
RicSummaryCaseRestartDialogResult result = RicSummaryCaseRestartDialog::openDialog(file, enableApplyToAllField, &lastResult);
RicSummaryCaseRestartDialogResult result = RicSummaryCaseRestartDialog::openDialog(file, enableApplyToAllField, mapReadOption(defaultSummaryRestartMode), &lastResult);
if (result.ok)
{
for (const QString& file : result.files)
{
RifSummaryCaseFileInfo fi(file, result.option == RicSummaryCaseRestartDialog::READ_ALL);
RifSummaryCaseFileInfo fi(file, result.option == RicSummaryCaseRestartDialog::IMPORT_ALL);
if (!vectorContains(filesToImport, fi))
{
filesToImport.push_back(fi);

3
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.h
View File

@@ -43,7 +43,8 @@ public:
private:
std::vector<RifSummaryCaseFileInfo> getFilesToImportByAskingUser(const QStringList& initialFiles,
bool enableApplyToAllField);
bool enableApplyToAllField,
RiaPreferences::SummaryRestartFilesImportModeType defaultSummaryRestartMode);
std::vector<RifSummaryCaseFileInfo> getFilesToImportUsingPrefs(const QStringList& initialFiles,
RiaPreferences::SummaryRestartFilesImportModeType summaryRestartMode);