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

#4402 Ensembles: Remove Preference import option 'Separate Case' for Origin ensembles

Browse Source
This commit is contained in:
Magne Sjaastad 2019-06-21 09:11:10 +02:00
parent 8997ec00e0
commit a3d521e272
4 changed files with 60 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ApplicationCode/Application/RiaPreferences.cpp
View File

@ -116,6 +116,7 @@ RiaPreferences::RiaPreferences(void)
CAF_PDM_InitFieldNoDefault(&summaryRestartFilesShowImportDialog, "summaryRestartFilesShowImportDialog", "Show Import Dialog", "", "", ""); CAF_PDM_InitFieldNoDefault(&summaryRestartFilesShowImportDialog, "summaryRestartFilesShowImportDialog", "Show Import Dialog", "", "", "");
CAF_PDM_InitField(&summaryImportMode, "summaryImportMode", SummaryRestartFilesImportModeType(RiaPreferences::IMPORT), "Default Summary Import Option", "", "", ""); CAF_PDM_InitField(&summaryImportMode, "summaryImportMode", SummaryRestartFilesImportModeType(RiaPreferences::IMPORT), "Default Summary Import Option", "", "", "");
CAF_PDM_InitField(&gridImportMode, "gridImportMode", SummaryRestartFilesImportModeType(RiaPreferences::NOT_IMPORT), "Default Grid Import Option", "", "", ""); CAF_PDM_InitField(&gridImportMode, "gridImportMode", SummaryRestartFilesImportModeType(RiaPreferences::NOT_IMPORT), "Default Grid Import Option", "", "", "");
CAF_PDM_InitField(&summaryEnsembleImportMode, "summaryEnsembleImportMode", SummaryRestartFilesImportModeType(RiaPreferences::IMPORT), "Default Ensemble Summary Import Option", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", "");
m_holoLensExportFolder.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); m_holoLensExportFolder.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
@ -241,10 +242,21 @@ void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup("Origin Files"); caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup("Origin Files");
restartBehaviourGroup->add(&summaryRestartFilesShowImportDialog); restartBehaviourGroup->add(&summaryRestartFilesShowImportDialog);
caf::PdmUiGroup* summaryImportOptionGroup = restartBehaviourGroup->addNewGroup("Origin Summary Files");
summaryImportOptionGroup->add(&summaryImportMode); {
caf::PdmUiGroup* gridImportOptionGroup = restartBehaviourGroup->addNewGroup("Origin Grid Files"); caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup("Origin Summary Files");
gridImportOptionGroup->add(&gridImportMode); group->add(&summaryImportMode);
}
{
caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup("Origin Grid Files");
group->add(&gridImportMode);
}
{
caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup("Origin Ensemble Summary Files");
group->add(&summaryEnsembleImportMode);
}
} }
else if (uiConfigName == m_tabNames[2]) else if (uiConfigName == m_tabNames[2])
{ {
@ -294,6 +306,15 @@ QList<caf::PdmOptionItemInfo> RiaPreferences::calculateValueOptions(const caf::P
options.push_back(caf::PdmOptionItemInfo(skip.uiText(), RiaPreferences::NOT_IMPORT)); options.push_back(caf::PdmOptionItemInfo(skip.uiText(), RiaPreferences::NOT_IMPORT));
options.push_back(caf::PdmOptionItemInfo(separate.uiText(), RiaPreferences::SEPARATE_CASES)); options.push_back(caf::PdmOptionItemInfo(separate.uiText(), RiaPreferences::SEPARATE_CASES));
} }
else if (fieldNeedingOptions == &summaryEnsembleImportMode)
{
// Manual option handling in order to one only a subset of the enum values
SummaryRestartFilesImportModeType skip(RiaPreferences::NOT_IMPORT);
SummaryRestartFilesImportModeType allowImport(RiaPreferences::IMPORT);
options.push_back(caf::PdmOptionItemInfo(skip.uiText(), RiaPreferences::NOT_IMPORT));
options.push_back(caf::PdmOptionItemInfo(allowImport.uiText(), RiaPreferences::IMPORT));
}
return options; return options;
} }

1
ApplicationCode/Application/RiaPreferences.h
View File

@ -106,6 +106,7 @@ public: // Pdm Fields
caf::PdmField<bool> summaryRestartFilesShowImportDialog; caf::PdmField<bool> summaryRestartFilesShowImportDialog;
caf::PdmField<SummaryRestartFilesImportModeType> summaryImportMode; caf::PdmField<SummaryRestartFilesImportModeType> summaryImportMode;
caf::PdmField<SummaryRestartFilesImportModeType> gridImportMode; caf::PdmField<SummaryRestartFilesImportModeType> gridImportMode;
caf::PdmField<SummaryRestartFilesImportModeType> summaryEnsembleImportMode;
caf::PdmField<bool> holoLensDisableCertificateVerification; caf::PdmField<bool> holoLensDisableCertificateVerification;

44
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -70,11 +70,8 @@ RifSummaryCaseRestartSelector::RifSummaryCaseRestartSelector()
{ {
RiaPreferences* prefs = RiaApplication::instance()->preferences(); RiaPreferences* prefs = RiaApplication::instance()->preferences();
m_showDialog = prefs->summaryRestartFilesShowImportDialog(); m_showDialog = prefs->summaryRestartFilesShowImportDialog();
m_defaultSummaryImportMode = mapReadOption(prefs->summaryImportMode());
m_defaultGridImportMode = mapReadOption(prefs->gridImportMode());
m_ensembleOrGroupMode = false; m_ensembleOrGroupMode = false;
//m_buildGridFileList = false;
m_gridFiles.clear(); m_gridFiles.clear();
} }
@ -176,7 +173,21 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
m_summaryFileInfos.clear(); m_summaryFileInfos.clear();
m_gridFiles.clear(); m_gridFiles.clear();
m_summaryFileErrors.clear(); m_summaryFileErrors.clear();
RiaPreferences* prefs = RiaApplication::instance()->preferences();
RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode;
if (m_ensembleOrGroupMode)
{
defaultSummaryImportMode = mapReadOption(prefs->summaryEnsembleImportMode());
}
else
{
defaultSummaryImportMode = mapReadOption(prefs->summaryImportMode());
}
RicSummaryCaseRestartDialog::ImportOptions defaultGridImportMode = mapReadOption(prefs->gridImportMode());
caf::ProgressInfo progress(initialFiles.size(), QString("Importing files")); caf::ProgressInfo progress(initialFiles.size(), QString("Importing files"));
for (const RifSummaryCaseFileImportInfo& initialFile : initialFiles) for (const RifSummaryCaseFileImportInfo& initialFile : initialFiles)
{ {
@ -185,8 +196,8 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(const std
initialFile.failOnSummaryFileError(), initialFile.failOnSummaryFileError(),
enableApplyToAllField, enableApplyToAllField,
m_ensembleOrGroupMode, m_ensembleOrGroupMode,
m_defaultSummaryImportMode, defaultSummaryImportMode,
m_defaultGridImportMode, defaultGridImportMode,
&lastResult); &lastResult);
if (result.status == RicSummaryCaseRestartDialogResult::SUMMARY_CANCELLED) if (result.status == RicSummaryCaseRestartDialogResult::SUMMARY_CANCELLED)
@ -241,6 +252,18 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs(const std::
m_gridFiles.clear(); m_gridFiles.clear();
m_summaryFileErrors.clear(); m_summaryFileErrors.clear();
RiaPreferences* prefs = RiaApplication::instance()->preferences();
RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode;
if (m_ensembleOrGroupMode)
{
defaultSummaryImportMode = mapReadOption(prefs->summaryEnsembleImportMode());
}
else
{
defaultSummaryImportMode = mapReadOption(prefs->summaryImportMode());
}
caf::ProgressInfo progress(initialFiles.size(), QString("Importing files")); caf::ProgressInfo progress(initialFiles.size(), QString("Importing files"));
for (const RifSummaryCaseFileImportInfo& initialFile : initialFiles) for (const RifSummaryCaseFileImportInfo& initialFile : initialFiles)
{ {
@ -251,15 +274,15 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs(const std::
if (handleSummaryFile) if (handleSummaryFile)
{ {
if (m_defaultSummaryImportMode == RicSummaryCaseRestartDialog::IMPORT_ALL) if (defaultSummaryImportMode == RicSummaryCaseRestartDialog::IMPORT_ALL)
{ {
m_summaryFileInfos.push_back(RifSummaryCaseFileResultInfo(initialSummaryFile, true)); m_summaryFileInfos.push_back(RifSummaryCaseFileResultInfo(initialSummaryFile, true));
} }
else if (m_defaultSummaryImportMode == RicSummaryCaseRestartDialog::NOT_IMPORT) else if (defaultSummaryImportMode == RicSummaryCaseRestartDialog::NOT_IMPORT)
{ {
m_summaryFileInfos.push_back(RifSummaryCaseFileResultInfo(initialSummaryFile, false)); m_summaryFileInfos.push_back(RifSummaryCaseFileResultInfo(initialSummaryFile, false));
} }
else if (m_defaultSummaryImportMode == RicSummaryCaseRestartDialog::SEPARATE_CASES) else if (defaultSummaryImportMode == RicSummaryCaseRestartDialog::SEPARATE_CASES)
{ {
m_summaryFileInfos.push_back(RifSummaryCaseFileResultInfo(initialSummaryFile, false)); m_summaryFileInfos.push_back(RifSummaryCaseFileResultInfo(initialSummaryFile, false));
bool hasWarnings = false; bool hasWarnings = false;
@ -280,7 +303,8 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs(const std::
{ {
m_gridFiles.push_back(initialGridFile); m_gridFiles.push_back(initialGridFile);
if (m_defaultGridImportMode == RicSummaryCaseRestartDialog::SEPARATE_CASES) RicSummaryCaseRestartDialog::ImportOptions defaultGridImportMode = mapReadOption(prefs->gridImportMode());
if (defaultGridImportMode == RicSummaryCaseRestartDialog::SEPARATE_CASES)
{ {
RifReaderEclipseSummary reader; RifReaderEclipseSummary reader;
bool hasWarnings = false; bool hasWarnings = false;

2
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.h
View File

@ -59,8 +59,6 @@ private:
bool m_showDialog; bool m_showDialog;
bool m_ensembleOrGroupMode; bool m_ensembleOrGroupMode;
RicSummaryCaseRestartDialog::ImportOptions m_defaultSummaryImportMode;
RicSummaryCaseRestartDialog::ImportOptions m_defaultGridImportMode;
std::vector<RifSummaryCaseFileResultInfo> m_summaryFileInfos; std::vector<RifSummaryCaseFileResultInfo> m_summaryFileInfos;
QStringList m_gridFiles; QStringList m_gridFiles;