From e68c982cf997b3e0d4e1bc63b7802229da3ef4c5 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 14 Apr 2021 10:13:50 +0200 Subject: [PATCH] #7572 Preferences : Move more into summary settings file --- .../Application/RiaPreferences.cpp | 264 +++++++++--------- .../Application/RiaPreferences.h | 39 +-- .../Application/RiaPreferencesSummary.cpp | 191 ++++++++++--- .../Application/RiaPreferencesSummary.h | 52 +++- .../RicShowPlotDataFeature.cpp | 4 +- .../RicAsciiExportSummaryPlotFeature.cpp | 4 +- .../RicNewSummaryEnsembleCurveSetFeature.cpp | 14 +- .../RicSummaryPlotFeatureImpl.cpp | 15 +- .../RifSummaryCaseRestartSelector.cpp | 15 +- .../Summary/RimSummaryCaseMainCollection.cpp | 19 +- .../Summary/RimSummaryCurve.cpp | 11 +- 11 files changed, 380 insertions(+), 248 deletions(-) diff --git a/ApplicationLibCode/Application/RiaPreferences.cpp b/ApplicationLibCode/Application/RiaPreferences.cpp index 938a735bfa..ce4ed7b302 100644 --- a/ApplicationLibCode/Application/RiaPreferences.cpp +++ b/ApplicationLibCode/Application/RiaPreferences.cpp @@ -43,24 +43,6 @@ namespace caf { -template <> -void RiaPreferences::SummaryRestartFilesImportModeType::setUp() -{ - addItem( RiaPreferences::SummaryRestartFilesImportMode::IMPORT, "IMPORT", "Unified" ); - addItem( RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES, "SEPARATE_CASES", "Separate Cases" ); - addItem( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT, "NOT_IMPORT", "Skip" ); - setDefault( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ); -} - -template <> -void RiaPreferences::SummaryHistoryCurveStyleModeType::setUp() -{ - addItem( RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS, "SYMBOLS", "Symbols" ); - addItem( RiaPreferences::SummaryHistoryCurveStyleMode::LINES, "LINES", "Lines" ); - addItem( RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS_AND_LINES, "SYMBOLS_AND_LINES", "Symbols and Lines" ); - setDefault( RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS ); -} - template <> void RiaPreferences::PageSizeEnum::setUp() { @@ -253,48 +235,50 @@ RiaPreferences::RiaPreferences() CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "" ); loadAndShowSoil.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitFieldNoDefault( &summaryRestartFilesShowImportDialog, - "summaryRestartFilesShowImportDialog", - "Show Import Dialog", - "", - "", - "" ); - CAF_PDM_InitField( &summaryImportMode, - "summaryImportMode", - SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ), - "Default Summary Import Option", - "", - "", - "" ); - CAF_PDM_InitField( &gridImportMode, - "gridImportMode", - SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ), - "Default Grid Import Option", - "", - "", - "" ); - CAF_PDM_InitField( &summaryEnsembleImportMode, - "summaryEnsembleImportMode", - SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ), - "Default Ensemble Summary Import Option", - "", - "", - "" ); + /* + CAF_PDM_InitFieldNoDefault( &summaryRestartFilesShowImportDialog, + "summaryRestartFilesShowImportDialog", + "Show Import Dialog", + "", + "", + "" ); + CAF_PDM_InitField( &summaryImportMode, + "summaryImportMode", + SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ), + "Default Summary Import Option", + "", + "", + "" ); + CAF_PDM_InitField( &gridImportMode, + "gridImportMode", + SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT + ), "Default Grid Import Option", + "", + "", + "" ); + CAF_PDM_InitField( &summaryEnsembleImportMode, + "summaryEnsembleImportMode", + SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ), + "Default Ensemble Summary Import Option", + "", + "", + "" ); - CAF_PDM_InitField( &defaultSummaryHistoryCurveStyle, - "defaultSummaryHistoryCurveStyle", - SummaryHistoryCurveStyleModeType( RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS ), - "Default Curve Style for History Vectors", - "", - "", - "" ); - CAF_PDM_InitField( &defaultSummaryCurvesTextFilter, - "defaultSummaryCurvesTextFilter", - QString( "FOPT" ), - "Default Summary Curves", - "", - "Semicolon separated list of filters used to create curves in new summary plots", - "" ); + CAF_PDM_InitField( &defaultSummaryHistoryCurveStyle, + "defaultSummaryHistoryCurveStyle", + SummaryHistoryCurveStyleModeType( RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS ), + "Default Curve Style for History Vectors", + "", + "", + "" ); + CAF_PDM_InitField( &defaultSummaryCurvesTextFilter, + "defaultSummaryCurvesTextFilter", + QString( "FOPT" ), + "Default Summary Curves", + "", + "Semicolon separated list of filters used to create curves in new summary plots", + "" ); + */ CAF_PDM_InitFieldNoDefault( &m_holoLensExportFolder, "holoLensExportFolder", "HoloLens Export Folder", "", "", "" ); m_holoLensExportFolder.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP ); @@ -356,23 +340,25 @@ RiaPreferences::RiaPreferences() CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template", "", "", "" ); // m_plotTemplateFolders.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); - CAF_PDM_InitField( &m_showSummaryTimeAsLongString, - "showSummaryTimeAsLongString", - false, - "Show resample time text as long time text (2010-11-21 23:15:00)", - "", - "", - "" ); - m_showSummaryTimeAsLongString.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + /* + CAF_PDM_InitField( &m_showSummaryTimeAsLongString, + "showSummaryTimeAsLongString", + false, + "Show resample time text as long time text (2010-11-21 23:15:00)", + "", + "", + "" ); + m_showSummaryTimeAsLongString.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); - CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryData, - "useMultipleThreadsWhenLoadingSummaryData", - false, - "Use multiple threads when loading summary data", - "", - "", - "" ); - m_useMultipleThreadsWhenLoadingSummaryData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryData, + "useMultipleThreadsWhenLoadingSummaryData", + false, + "Use multiple threads when loading summary data", + "", + "", + "" ); + m_useMultipleThreadsWhenLoadingSummaryData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + */ CAF_PDM_InitFieldNoDefault( &m_pageSize, "pageSize", "Page Size", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_pageOrientation, "pageOrientation", "Page Orientation", "", "", "" ); @@ -434,6 +420,7 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, caf::PdmUiEditorAttribute* attribute ) { m_readerSettings->defineEditorAttribute( field, uiConfigName, attribute ); + m_summaryPreferences->defineEditorAttribute( field, uiConfigName, attribute ); { caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast( attribute ); @@ -453,10 +440,9 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field, field == &m_showTestToolbar || field == &m_includeFractureDebugInfoFile || field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification || field == &m_showProjectChangedDialog || field == &m_searchPlotTemplateFoldersRecursively || - field == &m_showLegendBackground || field == &m_showSummaryTimeAsLongString || - field == &m_showViewIdInProjectTree || field == &m_useMultipleThreadsWhenLoadingSummaryData || - field == &m_enableFaultsByDefault || field == &m_showProgressBar || field == &m_openExportedPdfInViewer || - field == &m_showInfoBox || field == &m_showGridBox || field == &m_useUndoRedo ) + field == &m_showLegendBackground || field == &m_showViewIdInProjectTree || field == &m_enableFaultsByDefault || + field == &m_showProgressBar || field == &m_openExportedPdfInViewer || field == &m_showInfoBox || + field == &m_showGridBox || field == &m_useUndoRedo ) { caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast( attribute ); if ( myAttr ) @@ -531,34 +517,42 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& newCaseBehaviourGroup->add( &autocomputeDepthRelatedProperties ); newCaseBehaviourGroup->add( &loadAndShowSoil ); - m_readerSettings->defineUiOrdering( uiConfigName, *newCaseBehaviourGroup ); + m_readerSettings->uiOrdering( uiConfigName, *newCaseBehaviourGroup ); - caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup( "Origin Files" ); - restartBehaviourGroup->add( &summaryRestartFilesShowImportDialog ); + m_summaryPreferences->appendRestartFileGroup( uiOrdering ); - { - caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Summary Files" ); - group->add( &summaryImportMode ); - } + /* + caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup( "Origin Files" ); + restartBehaviourGroup->add( &summaryRestartFilesShowImportDialog ); - { - caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Grid Files" ); - group->add( &gridImportMode ); - } + { + caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Summary Files" ); + group->add( &summaryImportMode ); + } - { - caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Ensemble Summary Files" ); - group->add( &summaryEnsembleImportMode ); - } + { + 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 == RiaPreferences::tabNamePlotting() ) { - uiOrdering.add( &defaultSummaryCurvesTextFilter ); - uiOrdering.add( &defaultSummaryHistoryCurveStyle ); uiOrdering.add( &m_dateFormat ); uiOrdering.add( &m_timeFormat ); - uiOrdering.add( &m_showSummaryTimeAsLongString ); - uiOrdering.add( &m_useMultipleThreadsWhenLoadingSummaryData ); + + summaryPreferences()->appendItemsToPlottingGroup( uiOrdering ); + /* + uiOrdering.add( &defaultSummaryCurvesTextFilter ); + uiOrdering.add( &defaultSummaryHistoryCurveStyle ); + uiOrdering.add( &m_showSummaryTimeAsLongString ); + uiOrdering.add( &m_useMultipleThreadsWhenLoadingSummaryData ); + */ caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Plot Templates" ); group->add( &m_plotTemplateFolders ); @@ -663,29 +657,31 @@ QList RiaPreferences::calculateValueOptions( const caf:: QList options; *useOptionsOnly = true; - if ( fieldNeedingOptions == &gridImportMode ) - { - // Manual option handling in order to one only a subset of the enum values - SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ); - SummaryRestartFilesImportModeType separate( RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ); + /* + if ( fieldNeedingOptions == &gridImportMode ) + { + // Manual option handling in order to one only a subset of the enum values + SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ); + SummaryRestartFilesImportModeType separate( RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ); - options.push_back( - caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) ); - options.push_back( caf::PdmOptionItemInfo( separate.uiText(), - RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ) ); - } - else if ( fieldNeedingOptions == &summaryEnsembleImportMode ) - { - // Manual option handling in order to one only a subset of the enum values - SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ); - SummaryRestartFilesImportModeType allowImport( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ); + options.push_back( + caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) ); + options.push_back( caf::PdmOptionItemInfo( separate.uiText(), + RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ) ); + } + else if ( fieldNeedingOptions == &summaryEnsembleImportMode ) + { + // Manual option handling in order to one only a subset of the enum values + SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ); + SummaryRestartFilesImportModeType allowImport( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ); - options.push_back( - caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) ); - options.push_back( - caf::PdmOptionItemInfo( allowImport.uiText(), RiaPreferences::SummaryRestartFilesImportMode::IMPORT ) ); - } - else if ( fieldNeedingOptions == &m_dateFormat ) + options.push_back( + caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) ); + options.push_back( + caf::PdmOptionItemInfo( allowImport.uiText(), RiaPreferences::SummaryRestartFilesImportMode::IMPORT ) ); + } + */ + if ( fieldNeedingOptions == &m_dateFormat ) { for ( auto dateFormat : RiaQDateTimeTools::supportedDateFormats() ) { @@ -1026,21 +1022,21 @@ void RiaPreferences::setDefaultPlotTemplatePath( const QString& templatePath ) m_defaultPlotTemplate = templatePath; } -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RiaPreferences::showSummaryTimeAsLongString() const -{ - return m_showSummaryTimeAsLongString; -} - -//-------------------------------------------------------------------------------------------------- -/// -//-------------------------------------------------------------------------------------------------- -bool RiaPreferences::useMultipleThreadsWhenReadingSummaryData() const -{ - return m_useMultipleThreadsWhenLoadingSummaryData; -} +// -------------------------------------------------------------------------------------------------- / +// --------------------------------------------------------------------------------------------------bool +// RiaPreferences::showSummaryTimeAsLongString() +// const +// { +// return m_showSummaryTimeAsLongString; +// } +// +// -------------------------------------------------------------------------------------------------- / +// --------------------------------------------------------------------------------------------------bool +// RiaPreferences::useMultipleThreadsWhenReadingSummaryData() +// const +// { +// return m_useMultipleThreadsWhenLoadingSummaryData; +// } //-------------------------------------------------------------------------------------------------- /// diff --git a/ApplicationLibCode/Application/RiaPreferences.h b/ApplicationLibCode/Application/RiaPreferences.h index 5bd8d380af..d76eb98b4d 100644 --- a/ApplicationLibCode/Application/RiaPreferences.h +++ b/ApplicationLibCode/Application/RiaPreferences.h @@ -54,31 +54,15 @@ public: using DateFormatComponents = RiaQDateTimeTools::DateFormatComponents; using TimeFormatComponents = RiaQDateTimeTools::TimeFormatComponents; - enum class SummaryRestartFilesImportMode - { - IMPORT, - NOT_IMPORT, - SEPARATE_CASES - }; - typedef caf::AppEnum SummaryRestartFilesImportModeType; - typedef RiaFontCache::FontSizeEnum FontSizeEnum; - - enum class SummaryHistoryCurveStyleMode - { - SYMBOLS, - LINES, - SYMBOLS_AND_LINES - }; - typedef caf::AppEnum SummaryHistoryCurveStyleModeType; - - typedef caf::AppEnum PageSizeEnum; - typedef caf::AppEnum PageOrientationEnum; + using FontSizeEnum = RiaFontCache::FontSizeEnum; + using PageSizeEnum = caf::AppEnum; + using PageOrientationEnum = caf::AppEnum; bool enableFaultsByDefault() const; public: - RiaPreferences( void ); - ~RiaPreferences( void ) override; + RiaPreferences(); + ~RiaPreferences() override; static RiaPreferences* current(); @@ -109,8 +93,6 @@ public: void appendPlotTemplateFolders( const QString& folder ); QString defaultPlotTemplateAbsolutePath() const; void setDefaultPlotTemplatePath( const QString& templatePath ); - bool showSummaryTimeAsLongString() const; - bool useMultipleThreadsWhenReadingSummaryData() const; bool showProgressBar() const; bool openExportedPdfInViewer() const; @@ -168,14 +150,6 @@ public: caf::PdmField autocomputeDepthRelatedProperties; caf::PdmField loadAndShowSoil; - caf::PdmField summaryRestartFilesShowImportDialog; - caf::PdmField summaryImportMode; - caf::PdmField gridImportMode; - caf::PdmField summaryEnsembleImportMode; - - caf::PdmField defaultSummaryCurvesTextFilter; - caf::PdmField defaultSummaryHistoryCurveStyle; - caf::PdmField holoLensDisableCertificateVerification; caf::PdmField csvTextExportFieldSeparator; @@ -216,8 +190,7 @@ private: caf::PdmField m_holoLensExportFolder; caf::PdmField m_dateFormat; caf::PdmField m_timeFormat; - caf::PdmField m_showSummaryTimeAsLongString; - caf::PdmField m_useMultipleThreadsWhenLoadingSummaryData; + caf::PdmField m_showProgressBar; caf::PdmField m_gtestFilter; caf::PdmField m_useUndoRedo; diff --git a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp index 4729c6b3e2..cc2625d4ba 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSummary.cpp +++ b/ApplicationLibCode/Application/RiaPreferencesSummary.cpp @@ -17,53 +17,32 @@ ///////////////////////////////////////////////////////////////////////////////// #include "RiaPreferencesSummary.h" + #include "cafPdmUiCheckBoxEditor.h" #include namespace caf { -/* - template <> - void RiaPreferences::SummaryRestartFilesImportModeType::setUp() - { - addItem(RiaPreferences::SummaryRestartFilesImportMode::IMPORT, "IMPORT", "Unified"); - addItem(RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES, "SEPARATE_CASES", "Separate Cases"); - addItem(RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT, "NOT_IMPORT", "Skip"); - setDefault(RiaPreferences::SummaryRestartFilesImportMode::IMPORT); - } +template <> +void RiaPreferencesSummary::SummaryRestartFilesImportModeType::setUp() +{ + addItem( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT, "IMPORT", "Unified" ); + addItem( RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES, "SEPARATE_CASES", "Separate Cases" ); + addItem( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT, "NOT_IMPORT", "Skip" ); + setDefault( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ); +} - template <> - void RiaPreferences::SummaryHistoryCurveStyleModeType::setUp() - { - addItem(RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS, "SYMBOLS", "Symbols"); - addItem(RiaPreferences::SummaryHistoryCurveStyleMode::LINES, "LINES", "Lines"); - addItem(RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS_AND_LINES, "SYMBOLS_AND_LINES", "Symbols and - Lines"); setDefault(RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS); - } - - template <> - void RiaPreferences::PageSizeEnum::setUp() - { - addItem(QPageSize::A3, "A3", "A3"); - addItem(QPageSize::A4, "A4", "A4"); - addItem(QPageSize::A5, "A5", "A5"); - addItem(QPageSize::A6, "A6", "A6"); - addItem(QPageSize::Letter, "LETTER", "US Letter"); - addItem(QPageSize::Legal, "LEGAL", "US Legal"); - addItem(QPageSize::Ledger, "LEDGER", "US Ledger"); - addItem(QPageSize::Tabloid, "TABLOID", "US Tabloid"); - setDefault(QPageSize::A4); - } - - template <> - void RiaPreferences::PageOrientationEnum::setUp() - { - addItem(QPageLayout::Portrait, "PORTRAIT", "Portrait"); - addItem(QPageLayout::Landscape, "LANDSCAPE", "Landscape"); - setDefault(QPageLayout::Portrait); - } -*/ +template <> +void RiaPreferencesSummary::SummaryHistoryCurveStyleModeType::setUp() +{ + addItem( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS, "SYMBOLS", "Symbols" ); + addItem( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::LINES, "LINES", "Lines" ); + addItem( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS_AND_LINES, + "SYMBOLS_AND_LINES", + "Symbols and Lines" ); + setDefault( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS ); +} template <> void RiaPreferencesSummary::SummaryReaderModeType::setUp() @@ -82,6 +61,49 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesSummary, "RiaPreferencesSummary" ); //-------------------------------------------------------------------------------------------------- RiaPreferencesSummary::RiaPreferencesSummary() { + CAF_PDM_InitFieldNoDefault( &m_summaryRestartFilesShowImportDialog, + "summaryRestartFilesShowImportDialog", + "Show Import Dialog", + "", + "", + "" ); + CAF_PDM_InitField( &m_summaryImportMode, + "summaryImportMode", + SummaryRestartFilesImportModeType( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ), + "Default Summary Import Option", + "", + "", + "" ); + CAF_PDM_InitField( &m_gridImportMode, + "gridImportMode", + SummaryRestartFilesImportModeType( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT ), + "Default Grid Import Option", + "", + "", + "" ); + CAF_PDM_InitField( &m_summaryEnsembleImportMode, + "summaryEnsembleImportMode", + SummaryRestartFilesImportModeType( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT ), + "Default Ensemble Summary Import Option", + "", + "", + "" ); + + CAF_PDM_InitField( &m_defaultSummaryHistoryCurveStyle, + "defaultSummaryHistoryCurveStyle", + SummaryHistoryCurveStyleModeType( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS ), + "Default Curve Style for History Vectors", + "", + "", + "" ); + CAF_PDM_InitField( &m_defaultSummaryCurvesTextFilter, + "defaultSummaryCurvesTextFilter", + QString( "FOPT" ), + "Default Summary Curves", + "", + "Semicolon separated list of filters used to create curves in new summary plots", + "" ); + CAF_PDM_InitField( &m_createOptimizedSummaryDataFile, "createOptimizedSummaryDataFile", true, @@ -118,6 +140,32 @@ RiaPreferencesSummary::RiaPreferencesSummary() "" ); CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType", "Summary Data File Reader", "", "", "" ); + + CAF_PDM_InitField( &m_showSummaryTimeAsLongString, + "showSummaryTimeAsLongString", + false, + "Show resample time text as long time text (2010-11-21 23:15:00)", + "", + "", + "" ); + m_showSummaryTimeAsLongString.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); + + CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryData, + "useMultipleThreadsWhenLoadingSummaryData", + false, + "Use multiple threads when loading summary data", + "", + "", + "" ); + m_useMultipleThreadsWhenLoadingSummaryData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +RiaPreferencesSummary* RiaPreferencesSummary::current() +{ + return RiaApplication::instance()->preferences()->summaryPreferences(); } //-------------------------------------------------------------------------------------------------- @@ -162,6 +210,41 @@ int RiaPreferencesSummary::createH5SummaryDataThreadCount() const return std::max( minimumThreadCount, m_createH5SummaryFileThreadCount() ); } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaPreferencesSummary::appendRestartFileGroup( caf::PdmUiOrdering& uiOrdering ) const +{ + caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup( "Origin Files" ); + restartBehaviourGroup->add( &m_summaryRestartFilesShowImportDialog ); + + { + caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Summary Files" ); + group->add( &m_summaryImportMode ); + } + + { + caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Grid Files" ); + group->add( &m_gridImportMode ); + } + + { + caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Ensemble Summary Files" ); + group->add( &m_summaryEnsembleImportMode ); + } +} + +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void RiaPreferencesSummary::appendItemsToPlottingGroup( caf::PdmUiOrdering& uiOrdering ) const +{ + uiOrdering.add( &m_defaultSummaryCurvesTextFilter ); + uiOrdering.add( &m_defaultSummaryHistoryCurveStyle ); + uiOrdering.add( &m_showSummaryTimeAsLongString ); + uiOrdering.add( &m_useMultipleThreadsWhenLoadingSummaryData ); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -169,8 +252,9 @@ void RiaPreferencesSummary::defineEditorAttribute( const caf::PdmFieldHandle* fi QString uiConfigName, caf::PdmUiEditorAttribute* attribute ) { - if ( field == &m_createOptimizedSummaryDataFile || field == &m_useOptimizedSummaryDataFile || - field == &m_createH5SummaryDataFile ) + if ( field == &m_createOptimizedSummaryDataFile || field == &m_showSummaryTimeAsLongString || + field == &m_useMultipleThreadsWhenLoadingSummaryData || field == &m_summaryRestartFilesShowImportDialog || + field == &m_useOptimizedSummaryDataFile || field == &m_createH5SummaryDataFile ) { auto myAttr = dynamic_cast( attribute ); if ( myAttr ) @@ -225,5 +309,28 @@ QList 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/RiaPreferencesSummary.h b/ApplicationLibCode/Application/RiaPreferencesSummary.h index d10bd23cd1..a46a9c9a41 100644 --- a/ApplicationLibCode/Application/RiaPreferencesSummary.h +++ b/ApplicationLibCode/Application/RiaPreferencesSummary.h @@ -36,11 +36,29 @@ public: OPM_COMMON, HDF5_OPM_COMMON }; - typedef caf::AppEnum SummaryReaderModeType; + using SummaryReaderModeType = caf::AppEnum; + + enum class SummaryRestartFilesImportMode + { + IMPORT, + NOT_IMPORT, + SEPARATE_CASES + }; + using SummaryRestartFilesImportModeType = caf::AppEnum; + + enum class SummaryHistoryCurveStyleMode + { + SYMBOLS, + LINES, + SYMBOLS_AND_LINES + }; + using SummaryHistoryCurveStyleModeType = caf::AppEnum; public: RiaPreferencesSummary(); + static RiaPreferencesSummary* current(); + SummaryReaderMode summaryDataReader() const; bool useOptimizedSummaryDataFiles() const; bool createOptimizedSummaryDataFiles() const; @@ -48,15 +66,41 @@ public: bool createH5SummaryDataFiles() const; int createH5SummaryDataThreadCount() const; + void appendRestartFileGroup( caf::PdmUiOrdering& uiOrdering ) const; + void appendItemsToPlottingGroup( caf::PdmUiOrdering& uiOrdering ) const; + + bool showSummaryTimeAsLongString() const { return m_showSummaryTimeAsLongString; } + bool useMultipleThreadsWhenLoadingSummaryData() const { return m_useMultipleThreadsWhenLoadingSummaryData; } + bool summaryRestartFilesShowImportDialog() const { return m_summaryRestartFilesShowImportDialog; } + + SummaryRestartFilesImportMode summaryImportMode() const { return m_summaryImportMode(); } + SummaryRestartFilesImportMode gridImportMode() const { return m_gridImportMode(); } + SummaryRestartFilesImportMode summaryEnsembleImportMode() const { return m_summaryEnsembleImportMode(); } + QString defaultSummaryCurvesTextFilter() const { return m_defaultSummaryCurvesTextFilter; } + + SummaryHistoryCurveStyleMode defaultSummaryHistoryCurveStyle() const { return m_defaultSummaryHistoryCurveStyle(); } + + void defineEditorAttribute( const caf::PdmFieldHandle* field, + QString uiConfigName, + caf::PdmUiEditorAttribute* attribute ) override; + protected: - void defineEditorAttribute( const caf::PdmFieldHandle* field, - QString uiConfigName, - caf::PdmUiEditorAttribute* attribute ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; QList calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly ) override; private: + caf::PdmField m_summaryRestartFilesShowImportDialog; + caf::PdmField m_summaryImportMode; + caf::PdmField m_gridImportMode; + caf::PdmField m_summaryEnsembleImportMode; + + caf::PdmField m_defaultSummaryCurvesTextFilter; + caf::PdmField m_defaultSummaryHistoryCurveStyle; + + caf::PdmField m_showSummaryTimeAsLongString; + caf::PdmField m_useMultipleThreadsWhenLoadingSummaryData; + caf::PdmField m_createOptimizedSummaryDataFile; caf::PdmField m_useOptimizedSummaryDataFile; diff --git a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp index 8c38b022a2..b026ff5352 100644 --- a/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp +++ b/ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp @@ -20,7 +20,7 @@ #include "RiaFeatureCommandContext.h" #include "RiaGuiApplication.h" -#include "RiaPreferences.h" +#include "RiaPreferencesSummary.h" #include "RimGridCrossPlot.h" #include "RimGridCrossPlotCurve.h" @@ -83,7 +83,7 @@ public: if ( m_summaryPlot->containsResamplableCurves() ) { - RiaPreferences* prefs = RiaApplication::instance()->preferences(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); return m_summaryPlot->asciiDataForSummaryPlotExport( timePeriod, prefs->showSummaryTimeAsLongString() ); } diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp index 856fb1bb5a..ca91b371f3 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp @@ -20,7 +20,7 @@ #include "RiaApplication.h" #include "RiaLogging.h" -#include "RiaPreferences.h" +#include "RiaPreferencesSummary.h" #include "RicResampleDialog.h" @@ -61,7 +61,7 @@ void RicAsciiExportSummaryPlotFeature::onActionTriggered( bool isChecked ) caf::SelectionManager::instance()->objectsByType( &selectedSummaryPlots ); QString defaultDir = defaultExportDir(); - RiaPreferences* prefs = RiaApplication::instance()->preferences(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); // Ask user about resampling auto result = RicResampleDialog::openDialog(); diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp index f5e649f35f..bd3053fdf5 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp @@ -20,7 +20,7 @@ #include "RiaColorTables.h" #include "RiaGuiApplication.h" -#include "RiaPreferences.h" +#include "RiaPreferencesSummary.h" #include "RiaSummaryTools.h" #include "RimEnsembleCurveFilter.h" @@ -59,7 +59,9 @@ std::vector RimProject* project = RimProject::current(); CVF_ASSERT( project ); - QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + + QString curvesTextFilter = prefs->defaultSummaryCurvesTextFilter(); QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts ); std::set addrs = ensemble->ensembleSummaryAddresses(); @@ -102,7 +104,9 @@ RimSummaryPlot* RiaGuiApplication* app = RiaGuiApplication::instance(); RimProject* proj = app->project(); - if ( RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter().isEmpty() ) return nullptr; + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + + if ( prefs->defaultSummaryCurvesTextFilter().isEmpty() ) return nullptr; RimSummaryPlotCollection* summaryPlotCollection = proj->mainPlotCollection->summaryPlotCollection(); RimSummaryPlot* plot = summaryPlotCollection->createSummaryPlotWithAutoTitle(); @@ -159,8 +163,10 @@ void RicNewSummaryEnsembleCurveSetFeature::onActionTriggered( bool isChecked ) CVF_ASSERT( !project->summaryGroups().empty() ); auto ensemble = project->summaryGroups().back(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + RimEnsembleCurveSet* firstCurveSet = nullptr; - if ( !RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter().isEmpty() ) + if ( !prefs->defaultSummaryCurvesTextFilter().isEmpty() ) { auto curveSets = RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( plot, ensemble ); if ( !curveSets.empty() ) firstCurveSet = curveSets.front(); diff --git a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp index ffebcd0690..5c776bec6f 100644 --- a/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp +++ b/ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp @@ -24,7 +24,7 @@ #include "RiaEclipseFileNameTools.h" #include "RiaImportEclipseCaseTools.h" #include "RiaLogging.h" -#include "RiaPreferences.h" +#include "RiaPreferencesSummary.h" #include "RicCreateSummaryCaseCollectionFeature.h" #include "RicImportGeneralDataFeature.h" @@ -68,7 +68,9 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot( RimSummaryPlo { RifEclipseSummaryAddress defaultAddressToUse; - QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + + QString curvesTextFilter = prefs->defaultSummaryCurvesTextFilter(); QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts ); if ( curveFilters.size() ) @@ -115,7 +117,9 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot( RimSummaryPlo std::vector RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot( RimSummaryPlot* plot, RimSummaryCase* summaryCase ) { - QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + + QString curvesTextFilter = prefs->defaultSummaryCurvesTextFilter(); QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts ); bool addHistoryCurve = false; @@ -150,10 +154,11 @@ caf::PdmObject* RicSummaryPlotFeatureImpl::createDefaultSummaryPlot( RimSummaryC { RimSummaryPlotCollection* summaryPlotCollection = RimProject::current()->mainPlotCollection->summaryPlotCollection(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + caf::PdmObject* itemToSelect = nullptr; - if ( summaryPlotCollection && summaryCase && - !RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter().isEmpty() ) + if ( summaryPlotCollection && summaryCase && !prefs->defaultSummaryCurvesTextFilter().isEmpty() ) { auto plot = summaryPlotCollection->createSummaryPlotWithAutoTitle(); diff --git a/ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.cpp b/ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.cpp index 0cb3d0b7f4..9fefa7b96b 100644 --- a/ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.cpp +++ b/ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.cpp @@ -21,7 +21,7 @@ #include "RiaApplication.h" #include "RiaFilePathTools.h" #include "RiaLogging.h" -#include "RiaPreferences.h" +#include "RiaPreferencesSummary.h" #include "RicSummaryCaseRestartDialog.h" @@ -54,11 +54,11 @@ bool vectorContains( const std::vector& vector, T item ) //-------------------------------------------------------------------------------------------------- /// INternal function //-------------------------------------------------------------------------------------------------- -RicSummaryCaseRestartDialog::ImportOptions mapReadOption( RiaPreferences::SummaryRestartFilesImportMode mode ) +RicSummaryCaseRestartDialog::ImportOptions mapReadOption( RiaPreferencesSummary::SummaryRestartFilesImportMode mode ) { - return mode == RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT + return mode == RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT ? RicSummaryCaseRestartDialog::ImportOptions::NOT_IMPORT - : mode == RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES + : mode == RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES ? RicSummaryCaseRestartDialog::ImportOptions::SEPARATE_CASES : RicSummaryCaseRestartDialog::ImportOptions::IMPORT_ALL; } @@ -68,7 +68,8 @@ RicSummaryCaseRestartDialog::ImportOptions mapReadOption( RiaPreferences::Summar //-------------------------------------------------------------------------------------------------- RifSummaryCaseRestartSelector::RifSummaryCaseRestartSelector() { - RiaPreferences* prefs = RiaApplication::instance()->preferences(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + m_showDialog = prefs->summaryRestartFilesShowImportDialog(); m_ensembleOrGroupMode = false; @@ -172,7 +173,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser( const st m_gridFiles.clear(); m_summaryFileErrors.clear(); - RiaPreferences* prefs = RiaApplication::instance()->preferences(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode; if ( m_ensembleOrGroupMode ) @@ -253,7 +254,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs( const std: m_gridFiles.clear(); m_summaryFileErrors.clear(); - RiaPreferences* prefs = RiaApplication::instance()->preferences(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode; if ( m_ensembleOrGroupMode ) diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp index 3115d0a2e1..ebc5df30f1 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp @@ -394,7 +394,9 @@ void RimSummaryCaseMainCollection::loadSummaryCaseData( std::vector fileSummaryCases; std::vector otherSummaryCases; - if ( RiaApplication::instance()->preferences()->useMultipleThreadsWhenReadingSummaryData() ) + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); + + if ( prefs->useMultipleThreadsWhenLoadingSummaryData() ) { for ( auto c : summaryCases ) { @@ -416,13 +418,11 @@ void RimSummaryCaseMainCollection::loadSummaryCaseData( std::vectorsummaryPreferences(); - int threadCount = 1; #ifdef USE_OPENMP - if ( prefSummary->summaryDataReader() != RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON ) + if ( prefs->summaryDataReader() != RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON ) { - threadCount = prefSummary->createH5SummaryDataThreadCount(); + threadCount = prefs->createH5SummaryDataThreadCount(); } else { @@ -461,12 +461,12 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( std::vectorsummaryPreferences(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); #ifdef USE_HDF5 { - if ( prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON && - prefSummary->createH5SummaryDataFiles() ) + if ( prefs->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON && + prefs->createH5SummaryDataFiles() ) { std::vector headerFileNames; std::vector h5FileNames; @@ -496,8 +496,7 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( std::vectorsummaryDataReader() != RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON ); + bool canUseMultipleTreads = ( prefs->summaryDataReader() != RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON ); #pragma omp parallel for schedule( dynamic ) if ( canUseMultipleTreads ) for ( int cIdx = 0; cIdx < static_cast( fileSummaryCases.size() ); ++cIdx ) diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 183b5f8e1b..04e925618f 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -22,7 +22,7 @@ #include "RiaCurveMerger.h" #include "RiaGuiApplication.h" #include "RiaLogging.h" -#include "RiaPreferences.h" +#include "RiaPreferencesSummary.h" #include "RiaResultNames.h" #include "RiaStatisticsTools.h" #include "RiaSummaryCurveDefinition.h" @@ -980,23 +980,24 @@ void RimSummaryCurve::setCurveAppearanceFromCaseType() if ( m_yValuesSummaryAddress && m_yValuesSummaryAddress->address().isHistoryQuantity() ) { - RiaPreferences* prefs = RiaApplication::instance()->preferences(); + RiaPreferencesSummary* prefs = RiaPreferencesSummary::current(); - if ( prefs->defaultSummaryHistoryCurveStyle() == RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS ) + if ( prefs->defaultSummaryHistoryCurveStyle() == RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS ) { m_symbolEdgeColor = m_curveColor; setSymbol( RiuQwtSymbol::SYMBOL_XCROSS ); setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_NONE ); } - else if ( prefs->defaultSummaryHistoryCurveStyle() == RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS_AND_LINES ) + else if ( prefs->defaultSummaryHistoryCurveStyle() == + RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS_AND_LINES ) { m_symbolEdgeColor = m_curveColor; setSymbol( RiuQwtSymbol::SYMBOL_XCROSS ); setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID ); } - else if ( prefs->defaultSummaryHistoryCurveStyle() == RiaPreferences::SummaryHistoryCurveStyleMode::LINES ) + else if ( prefs->defaultSummaryHistoryCurveStyle() == RiaPreferencesSummary::SummaryHistoryCurveStyleMode::LINES ) { setSymbol( RiuQwtSymbol::SYMBOL_NONE ); setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID );