diff --git a/ApplicationLibCode/Application/RiaPreferencesSystem.cpp b/ApplicationLibCode/Application/RiaPreferencesSystem.cpp index 3bfe5d3acb..6236c1cdd0 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSystem.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesSystem.cpp @@ -24,6 +24,21 @@ #include "cafPdmUiCheckBoxEditor.h" #include "cafPdmUiFilePathEditor.h" +namespace caf +{ +template <> +void RiaPreferencesSystem::EclipseTextFileReaderModeType::setUp() +{ + addItem( RiaPreferencesSystem::EclipseTextFileReaderMode::MEMORY_MAPPED_FILE, + "MEMORY_MAPPED_FILE", + "Memory Mapped File Import" ); + addItem( RiaPreferencesSystem::EclipseTextFileReaderMode::FILE, "FILE", "Default File Import" ); + + setDefault( RiaPreferencesSystem::EclipseTextFileReaderMode::FILE ); +} + +} // namespace caf + CAF_PDM_SOURCE_INIT( RiaPreferencesSystem, "RiaPreferencesSystem" ); //-------------------------------------------------------------------------------------------------- @@ -79,6 +94,14 @@ RiaPreferencesSystem::RiaPreferencesSystem() caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showProgressBar ); CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)", "", "", "" ); + + CAF_PDM_InitField( &m_eclipseReaderMode, + "eclipseReaderMode", + EclipseTextFileReaderModeType( RiaPreferencesSystem::EclipseTextFileReaderMode::FILE ), + "Default Summary Import Option", + "", + "", + "" ); } //-------------------------------------------------------------------------------------------------- @@ -187,6 +210,14 @@ bool RiaPreferencesSystem::showProgressBar() const return m_showProgressBar(); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RiaPreferencesSystem::EclipseTextFileReaderMode RiaPreferencesSystem::eclipseTextFileReaderMode() const +{ + return m_eclipseReaderMode(); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -222,49 +253,6 @@ QList QList options; *useOptionsOnly = true; - /* - if ( fieldNeedingOptions == &m_summaryReader ) - { - std::vector availableModes; - - #ifdef USE_HDF5 - availableModes.push_back( SummaryReaderMode::HDF5_OPM_COMMON ); - #endif // USE_HDF5 - availableModes.push_back( SummaryReaderMode::LIBECL ); - availableModes.push_back( SummaryReaderMode::OPM_COMMON ); - - for ( auto enumValue : availableModes ) - { - options.push_back( caf::PdmOptionItemInfo( SummaryReaderModeType::uiText( enumValue ), enumValue ) ); - } - } - else if ( fieldNeedingOptions == &m_gridImportMode ) - { - // Manual option handling in order to one only a subset of the enum values - SummaryRestartFilesImportModeType skip( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT ); - SummaryRestartFilesImportModeType separate( - RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES ); - - options.push_back( - caf::PdmOptionItemInfo( skip.uiText(), RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT - ) ); options.push_back( caf::PdmOptionItemInfo( separate.uiText(), - RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES - ) ); - } - else if ( fieldNeedingOptions == &m_summaryEnsembleImportMode ) - { - // Manual option handling in order to one only a subset of the enum values - SummaryRestartFilesImportModeType skip( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT ); - SummaryRestartFilesImportModeType allowImport( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT - ); - - options.push_back( - caf::PdmOptionItemInfo( skip.uiText(), RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT - ) ); options.push_back( caf::PdmOptionItemInfo( allowImport.uiText(), - RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ) ); - } - */ - return options; } diff --git a/ApplicationLibCode/Application/RiaPreferencesSystem.h b/ApplicationLibCode/Application/RiaPreferencesSystem.h index 68c0dfb1c9..9e1e421cf6 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSystem.h +++ b/ApplicationLibCode/Application/RiaPreferencesSystem.h @@ -30,6 +30,13 @@ class RiaPreferencesSystem : public caf::PdmObject CAF_PDM_HEADER_INIT; public: + enum class EclipseTextFileReaderMode + { + MEMORY_MAPPED_FILE, + FILE, + }; + using EclipseTextFileReaderModeType = caf::AppEnum; + public: RiaPreferencesSystem(); @@ -47,6 +54,8 @@ public: QString gtestFilter() const; bool showProgressBar() const; + EclipseTextFileReaderMode eclipseTextFileReaderMode() const; + protected: void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, @@ -70,4 +79,6 @@ private: caf::PdmField m_showProgressBar; caf::PdmField m_gtestFilter; + + caf::PdmField m_eclipseReaderMode; };