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

#7572 Preferences : Move more into summary settings file

Browse Source
This commit is contained in:
Magne Sjaastad 2021-04-14 10:13:50 +02:00
parent 27e3bc1b56
commit e68c982cf9
11 changed files with 380 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

264
ApplicationLibCode/Application/RiaPreferences.cpp
View File

@ -43,24 +43,6 @@
namespace caf 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 <> template <>
void RiaPreferences::PageSizeEnum::setUp() void RiaPreferences::PageSizeEnum::setUp()
{ {
@ -253,48 +235,50 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "" ); CAF_PDM_InitField( &loadAndShowSoil, "loadAndShowSoil", true, "Load and Show SOIL", "", "", "" );
loadAndShowSoil.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); loadAndShowSoil.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitFieldNoDefault( &summaryRestartFilesShowImportDialog, /*
"summaryRestartFilesShowImportDialog", CAF_PDM_InitFieldNoDefault( &summaryRestartFilesShowImportDialog,
"Show Import Dialog", "summaryRestartFilesShowImportDialog",
"", "Show Import Dialog",
"", "",
"" ); "",
CAF_PDM_InitField( &summaryImportMode, "" );
"summaryImportMode", CAF_PDM_InitField( &summaryImportMode,
SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ), "summaryImportMode",
"Default Summary Import Option", SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ),
"", "Default Summary Import Option",
"", "",
"" ); "",
CAF_PDM_InitField( &gridImportMode, "" );
"gridImportMode", CAF_PDM_InitField( &gridImportMode,
SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ), "gridImportMode",
"Default Grid Import Option", SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT
"", ), "Default Grid Import Option",
"", "",
"" ); "",
CAF_PDM_InitField( &summaryEnsembleImportMode, "" );
"summaryEnsembleImportMode", CAF_PDM_InitField( &summaryEnsembleImportMode,
SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ), "summaryEnsembleImportMode",
"Default Ensemble Summary Import Option", SummaryRestartFilesImportModeType( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ),
"", "Default Ensemble Summary Import Option",
"", "",
"" ); "",
"" );
CAF_PDM_InitField( &defaultSummaryHistoryCurveStyle, CAF_PDM_InitField( &defaultSummaryHistoryCurveStyle,
"defaultSummaryHistoryCurveStyle", "defaultSummaryHistoryCurveStyle",
SummaryHistoryCurveStyleModeType( RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS ), SummaryHistoryCurveStyleModeType( RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS ),
"Default Curve Style for History Vectors", "Default Curve Style for History Vectors",
"", "",
"", "",
"" ); "" );
CAF_PDM_InitField( &defaultSummaryCurvesTextFilter, CAF_PDM_InitField( &defaultSummaryCurvesTextFilter,
"defaultSummaryCurvesTextFilter", "defaultSummaryCurvesTextFilter",
QString( "FOPT" ), QString( "FOPT" ),
"Default Summary Curves", "Default Summary Curves",
"", "",
"Semicolon separated list of filters used to create curves in new summary plots", "Semicolon separated list of filters used to create curves in new summary plots",
"" ); "" );
*/
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 );
@ -356,23 +340,25 @@ RiaPreferences::RiaPreferences()
CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_defaultPlotTemplate, "defaultPlotTemplate", "Default Plot Template", "", "", "" );
// m_plotTemplateFolders.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() ); // m_plotTemplateFolders.uiCapability()->setUiEditorTypeName( caf::PdmUiFilePathEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_showSummaryTimeAsLongString, /*
"showSummaryTimeAsLongString", CAF_PDM_InitField( &m_showSummaryTimeAsLongString,
false, "showSummaryTimeAsLongString",
"Show resample time text as long time text (2010-11-21 23:15:00)", false,
"", "Show resample time text as long time text (2010-11-21 23:15:00)",
"", "",
"" ); "",
m_showSummaryTimeAsLongString.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); "" );
m_showSummaryTimeAsLongString.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryData, CAF_PDM_InitField( &m_useMultipleThreadsWhenLoadingSummaryData,
"useMultipleThreadsWhenLoadingSummaryData", "useMultipleThreadsWhenLoadingSummaryData",
false, false,
"Use multiple threads when loading summary data", "Use multiple threads when loading summary data",
"", "",
"", "",
"" ); "" );
m_useMultipleThreadsWhenLoadingSummaryData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN ); m_useMultipleThreadsWhenLoadingSummaryData.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
*/
CAF_PDM_InitFieldNoDefault( &m_pageSize, "pageSize", "Page Size", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_pageSize, "pageSize", "Page Size", "", "", "" );
CAF_PDM_InitFieldNoDefault( &m_pageOrientation, "pageOrientation", "Page Orientation", "", "", "" ); CAF_PDM_InitFieldNoDefault( &m_pageOrientation, "pageOrientation", "Page Orientation", "", "", "" );
@ -434,6 +420,7 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field,
caf::PdmUiEditorAttribute* attribute ) caf::PdmUiEditorAttribute* attribute )
{ {
m_readerSettings->defineEditorAttribute( field, uiConfigName, attribute ); m_readerSettings->defineEditorAttribute( field, uiConfigName, attribute );
m_summaryPreferences->defineEditorAttribute( field, uiConfigName, attribute );
{ {
caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>( attribute ); caf::PdmUiFilePathEditorAttribute* myAttr = dynamic_cast<caf::PdmUiFilePathEditorAttribute*>( attribute );
@ -453,10 +440,9 @@ void RiaPreferences::defineEditorAttribute( const caf::PdmFieldHandle* field,
field == &m_showTestToolbar || field == &m_includeFractureDebugInfoFile || field == &m_showTestToolbar || field == &m_includeFractureDebugInfoFile ||
field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification || field == &showLasCurveWithoutTvdWarning || field == &holoLensDisableCertificateVerification ||
field == &m_showProjectChangedDialog || field == &m_searchPlotTemplateFoldersRecursively || field == &m_showProjectChangedDialog || field == &m_searchPlotTemplateFoldersRecursively ||
field == &m_showLegendBackground || field == &m_showSummaryTimeAsLongString || field == &m_showLegendBackground || field == &m_showViewIdInProjectTree || field == &m_enableFaultsByDefault ||
field == &m_showViewIdInProjectTree || field == &m_useMultipleThreadsWhenLoadingSummaryData || field == &m_showProgressBar || field == &m_openExportedPdfInViewer || field == &m_showInfoBox ||
field == &m_enableFaultsByDefault || field == &m_showProgressBar || field == &m_openExportedPdfInViewer || field == &m_showGridBox || field == &m_useUndoRedo )
field == &m_showInfoBox || field == &m_showGridBox || field == &m_useUndoRedo )
{ {
caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>( attribute ); caf::PdmUiCheckBoxEditorAttribute* myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>( attribute );
if ( myAttr ) if ( myAttr )
@ -531,34 +517,42 @@ void RiaPreferences::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering&
newCaseBehaviourGroup->add( &autocomputeDepthRelatedProperties ); newCaseBehaviourGroup->add( &autocomputeDepthRelatedProperties );
newCaseBehaviourGroup->add( &loadAndShowSoil ); newCaseBehaviourGroup->add( &loadAndShowSoil );
m_readerSettings->defineUiOrdering( uiConfigName, *newCaseBehaviourGroup ); m_readerSettings->uiOrdering( uiConfigName, *newCaseBehaviourGroup );
caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup( "Origin Files" ); m_summaryPreferences->appendRestartFileGroup( uiOrdering );
restartBehaviourGroup->add( &summaryRestartFilesShowImportDialog );
{ /*
caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Summary Files" ); caf::PdmUiGroup* restartBehaviourGroup = uiOrdering.addNewGroup( "Origin Files" );
group->add( &summaryImportMode ); restartBehaviourGroup->add( &summaryRestartFilesShowImportDialog );
}
{ {
caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Grid Files" ); caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Summary Files" );
group->add( &gridImportMode ); group->add( &summaryImportMode );
} }
{ {
caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Ensemble Summary Files" ); caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Grid Files" );
group->add( &summaryEnsembleImportMode ); group->add( &gridImportMode );
} }
{
caf::PdmUiGroup* group = restartBehaviourGroup->addNewGroup( "Origin Ensemble Summary Files" );
group->add( &summaryEnsembleImportMode );
}
*/
} }
else if ( uiConfigName == RiaPreferences::tabNamePlotting() ) else if ( uiConfigName == RiaPreferences::tabNamePlotting() )
{ {
uiOrdering.add( &defaultSummaryCurvesTextFilter );
uiOrdering.add( &defaultSummaryHistoryCurveStyle );
uiOrdering.add( &m_dateFormat ); uiOrdering.add( &m_dateFormat );
uiOrdering.add( &m_timeFormat ); 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" ); caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Plot Templates" );
group->add( &m_plotTemplateFolders ); group->add( &m_plotTemplateFolders );
@ -663,29 +657,31 @@ QList<caf::PdmOptionItemInfo> RiaPreferences::calculateValueOptions( const caf::
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
*useOptionsOnly = true; *useOptionsOnly = true;
if ( fieldNeedingOptions == &gridImportMode ) /*
{ if ( fieldNeedingOptions == &gridImportMode )
// Manual option handling in order to one only a subset of the enum values {
SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ); // Manual option handling in order to one only a subset of the enum values
SummaryRestartFilesImportModeType separate( RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ); SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT );
SummaryRestartFilesImportModeType separate( RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES );
options.push_back( options.push_back(
caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) ); caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) );
options.push_back( caf::PdmOptionItemInfo( separate.uiText(), options.push_back( caf::PdmOptionItemInfo( separate.uiText(),
RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ) ); RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES ) );
} }
else if ( fieldNeedingOptions == &summaryEnsembleImportMode ) else if ( fieldNeedingOptions == &summaryEnsembleImportMode )
{ {
// Manual option handling in order to one only a subset of the enum values // Manual option handling in order to one only a subset of the enum values
SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ); SummaryRestartFilesImportModeType skip( RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT );
SummaryRestartFilesImportModeType allowImport( RiaPreferences::SummaryRestartFilesImportMode::IMPORT ); SummaryRestartFilesImportModeType allowImport( RiaPreferences::SummaryRestartFilesImportMode::IMPORT );
options.push_back( options.push_back(
caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) ); caf::PdmOptionItemInfo( skip.uiText(), RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT ) );
options.push_back( options.push_back(
caf::PdmOptionItemInfo( allowImport.uiText(), RiaPreferences::SummaryRestartFilesImportMode::IMPORT ) ); caf::PdmOptionItemInfo( allowImport.uiText(), RiaPreferences::SummaryRestartFilesImportMode::IMPORT ) );
} }
else if ( fieldNeedingOptions == &m_dateFormat ) */
if ( fieldNeedingOptions == &m_dateFormat )
{ {
for ( auto dateFormat : RiaQDateTimeTools::supportedDateFormats() ) for ( auto dateFormat : RiaQDateTimeTools::supportedDateFormats() )
{ {
@ -1026,21 +1022,21 @@ void RiaPreferences::setDefaultPlotTemplatePath( const QString& templatePath )
m_defaultPlotTemplate = templatePath; m_defaultPlotTemplate = templatePath;
} }
//-------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------- /
/// // --------------------------------------------------------------------------------------------------bool
//-------------------------------------------------------------------------------------------------- // RiaPreferences::showSummaryTimeAsLongString()
bool RiaPreferences::showSummaryTimeAsLongString() const // const
{ // {
return m_showSummaryTimeAsLongString; // return m_showSummaryTimeAsLongString;
} // }
//
//-------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------- /
/// // --------------------------------------------------------------------------------------------------bool
//-------------------------------------------------------------------------------------------------- // RiaPreferences::useMultipleThreadsWhenReadingSummaryData()
bool RiaPreferences::useMultipleThreadsWhenReadingSummaryData() const // const
{ // {
return m_useMultipleThreadsWhenLoadingSummaryData; // return m_useMultipleThreadsWhenLoadingSummaryData;
} // }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

39
ApplicationLibCode/Application/RiaPreferences.h
View File

@ -54,31 +54,15 @@ public:
using DateFormatComponents = RiaQDateTimeTools::DateFormatComponents; using DateFormatComponents = RiaQDateTimeTools::DateFormatComponents;
using TimeFormatComponents = RiaQDateTimeTools::TimeFormatComponents; using TimeFormatComponents = RiaQDateTimeTools::TimeFormatComponents;
enum class SummaryRestartFilesImportMode using FontSizeEnum = RiaFontCache::FontSizeEnum;
{ using PageSizeEnum = caf::AppEnum<QPageSize::PageSizeId>;
IMPORT, using PageOrientationEnum = caf::AppEnum<QPageLayout::Orientation>;
NOT_IMPORT,
SEPARATE_CASES
};
typedef caf::AppEnum<SummaryRestartFilesImportMode> SummaryRestartFilesImportModeType;
typedef RiaFontCache::FontSizeEnum FontSizeEnum;
enum class SummaryHistoryCurveStyleMode
{
SYMBOLS,
LINES,
SYMBOLS_AND_LINES
};
typedef caf::AppEnum<SummaryHistoryCurveStyleMode> SummaryHistoryCurveStyleModeType;
typedef caf::AppEnum<QPageSize::PageSizeId> PageSizeEnum;
typedef caf::AppEnum<QPageLayout::Orientation> PageOrientationEnum;
bool enableFaultsByDefault() const; bool enableFaultsByDefault() const;
public: public:
RiaPreferences( void ); RiaPreferences();
~RiaPreferences( void ) override; ~RiaPreferences() override;
static RiaPreferences* current(); static RiaPreferences* current();
@ -109,8 +93,6 @@ public:
void appendPlotTemplateFolders( const QString& folder ); void appendPlotTemplateFolders( const QString& folder );
QString defaultPlotTemplateAbsolutePath() const; QString defaultPlotTemplateAbsolutePath() const;
void setDefaultPlotTemplatePath( const QString& templatePath ); void setDefaultPlotTemplatePath( const QString& templatePath );
bool showSummaryTimeAsLongString() const;
bool useMultipleThreadsWhenReadingSummaryData() const;
bool showProgressBar() const; bool showProgressBar() const;
bool openExportedPdfInViewer() const; bool openExportedPdfInViewer() const;
@ -168,14 +150,6 @@ public:
caf::PdmField<bool> autocomputeDepthRelatedProperties; caf::PdmField<bool> autocomputeDepthRelatedProperties;
caf::PdmField<bool> loadAndShowSoil; caf::PdmField<bool> loadAndShowSoil;
caf::PdmField<bool> summaryRestartFilesShowImportDialog;
caf::PdmField<SummaryRestartFilesImportModeType> summaryImportMode;
caf::PdmField<SummaryRestartFilesImportModeType> gridImportMode;
caf::PdmField<SummaryRestartFilesImportModeType> summaryEnsembleImportMode;
caf::PdmField<QString> defaultSummaryCurvesTextFilter;
caf::PdmField<SummaryHistoryCurveStyleModeType> defaultSummaryHistoryCurveStyle;
caf::PdmField<bool> holoLensDisableCertificateVerification; caf::PdmField<bool> holoLensDisableCertificateVerification;
caf::PdmField<QString> csvTextExportFieldSeparator; caf::PdmField<QString> csvTextExportFieldSeparator;
@ -216,8 +190,7 @@ private:
caf::PdmField<QString> m_holoLensExportFolder; caf::PdmField<QString> m_holoLensExportFolder;
caf::PdmField<QString> m_dateFormat; caf::PdmField<QString> m_dateFormat;
caf::PdmField<QString> m_timeFormat; caf::PdmField<QString> m_timeFormat;
caf::PdmField<bool> m_showSummaryTimeAsLongString;
caf::PdmField<bool> m_useMultipleThreadsWhenLoadingSummaryData;
caf::PdmField<bool> m_showProgressBar; caf::PdmField<bool> m_showProgressBar;
caf::PdmField<QString> m_gtestFilter; caf::PdmField<QString> m_gtestFilter;
caf::PdmField<bool> m_useUndoRedo; caf::PdmField<bool> m_useUndoRedo;

191
ApplicationLibCode/Application/RiaPreferencesSummary.cpp
View File

@ -17,53 +17,32 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RiaPreferencesSummary.h" #include "RiaPreferencesSummary.h"
#include "cafPdmUiCheckBoxEditor.h" #include "cafPdmUiCheckBoxEditor.h"
#include <algorithm> #include <algorithm>
namespace caf namespace caf
{ {
/* template <>
template <> void RiaPreferencesSummary::SummaryRestartFilesImportModeType::setUp()
void RiaPreferences::SummaryRestartFilesImportModeType::setUp() {
{ addItem( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT, "IMPORT", "Unified" );
addItem(RiaPreferences::SummaryRestartFilesImportMode::IMPORT, "IMPORT", "Unified"); addItem( RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES, "SEPARATE_CASES", "Separate Cases" );
addItem(RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES, "SEPARATE_CASES", "Separate Cases"); addItem( RiaPreferencesSummary::SummaryRestartFilesImportMode::NOT_IMPORT, "NOT_IMPORT", "Skip" );
addItem(RiaPreferences::SummaryRestartFilesImportMode::NOT_IMPORT, "NOT_IMPORT", "Skip"); setDefault( RiaPreferencesSummary::SummaryRestartFilesImportMode::IMPORT );
setDefault(RiaPreferences::SummaryRestartFilesImportMode::IMPORT); }
}
template <> template <>
void RiaPreferences::SummaryHistoryCurveStyleModeType::setUp() void RiaPreferencesSummary::SummaryHistoryCurveStyleModeType::setUp()
{ {
addItem(RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS, "SYMBOLS", "Symbols"); addItem( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS, "SYMBOLS", "Symbols" );
addItem(RiaPreferences::SummaryHistoryCurveStyleMode::LINES, "LINES", "Lines"); addItem( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::LINES, "LINES", "Lines" );
addItem(RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS_AND_LINES, "SYMBOLS_AND_LINES", "Symbols and addItem( RiaPreferencesSummary::SummaryHistoryCurveStyleMode::SYMBOLS_AND_LINES,
Lines"); setDefault(RiaPreferences::SummaryHistoryCurveStyleMode::SYMBOLS); "SYMBOLS_AND_LINES",
} "Symbols and Lines" );
setDefault( RiaPreferencesSummary::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 <> template <>
void RiaPreferencesSummary::SummaryReaderModeType::setUp() void RiaPreferencesSummary::SummaryReaderModeType::setUp()
@ -82,6 +61,49 @@ CAF_PDM_SOURCE_INIT( RiaPreferencesSummary, "RiaPreferencesSummary" );
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
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, CAF_PDM_InitField( &m_createOptimizedSummaryDataFile,
"createOptimizedSummaryDataFile", "createOptimizedSummaryDataFile",
true, true,
@ -118,6 +140,32 @@ RiaPreferencesSummary::RiaPreferencesSummary()
"" ); "" );
CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType", "Summary Data File Reader", "", "", "" ); 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() ); 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, QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) caf::PdmUiEditorAttribute* attribute )
{ {
if ( field == &m_createOptimizedSummaryDataFile || field == &m_useOptimizedSummaryDataFile || if ( field == &m_createOptimizedSummaryDataFile || field == &m_showSummaryTimeAsLongString ||
field == &m_createH5SummaryDataFile ) field == &m_useMultipleThreadsWhenLoadingSummaryData || field == &m_summaryRestartFilesShowImportDialog ||
field == &m_useOptimizedSummaryDataFile || field == &m_createH5SummaryDataFile )
{ {
auto myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>( attribute ); auto myAttr = dynamic_cast<caf::PdmUiCheckBoxEditorAttribute*>( attribute );
if ( myAttr ) if ( myAttr )
@ -225,5 +309,28 @@ QList<caf::PdmOptionItemInfo>
options.push_back( caf::PdmOptionItemInfo( SummaryReaderModeType::uiText( enumValue ), enumValue ) ); 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; return options;
} }

52
ApplicationLibCode/Application/RiaPreferencesSummary.h
View File

@ -36,11 +36,29 @@ public:
OPM_COMMON, OPM_COMMON,
HDF5_OPM_COMMON HDF5_OPM_COMMON
}; };
typedef caf::AppEnum<SummaryReaderMode> SummaryReaderModeType; using SummaryReaderModeType = caf::AppEnum<SummaryReaderMode>;
enum class SummaryRestartFilesImportMode
{
IMPORT,
NOT_IMPORT,
SEPARATE_CASES
};
using SummaryRestartFilesImportModeType = caf::AppEnum<SummaryRestartFilesImportMode>;
enum class SummaryHistoryCurveStyleMode
{
SYMBOLS,
LINES,
SYMBOLS_AND_LINES
};
using SummaryHistoryCurveStyleModeType = caf::AppEnum<SummaryHistoryCurveStyleMode>;
public: public:
RiaPreferencesSummary(); RiaPreferencesSummary();
static RiaPreferencesSummary* current();
SummaryReaderMode summaryDataReader() const; SummaryReaderMode summaryDataReader() const;
bool useOptimizedSummaryDataFiles() const; bool useOptimizedSummaryDataFiles() const;
bool createOptimizedSummaryDataFiles() const; bool createOptimizedSummaryDataFiles() const;
@ -48,15 +66,41 @@ public:
bool createH5SummaryDataFiles() const; bool createH5SummaryDataFiles() const;
int createH5SummaryDataThreadCount() 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: protected:
void defineEditorAttribute( const caf::PdmFieldHandle* field,
QString uiConfigName,
caf::PdmUiEditorAttribute* attribute ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override; void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions, QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override; bool* useOptionsOnly ) override;
private: private:
caf::PdmField<bool> m_summaryRestartFilesShowImportDialog;
caf::PdmField<SummaryRestartFilesImportModeType> m_summaryImportMode;
caf::PdmField<SummaryRestartFilesImportModeType> m_gridImportMode;
caf::PdmField<SummaryRestartFilesImportModeType> m_summaryEnsembleImportMode;
caf::PdmField<QString> m_defaultSummaryCurvesTextFilter;
caf::PdmField<SummaryHistoryCurveStyleModeType> m_defaultSummaryHistoryCurveStyle;
caf::PdmField<bool> m_showSummaryTimeAsLongString;
caf::PdmField<bool> m_useMultipleThreadsWhenLoadingSummaryData;
caf::PdmField<bool> m_createOptimizedSummaryDataFile; caf::PdmField<bool> m_createOptimizedSummaryDataFile;
caf::PdmField<bool> m_useOptimizedSummaryDataFile; caf::PdmField<bool> m_useOptimizedSummaryDataFile;

4
ApplicationLibCode/Commands/ApplicationCommands/RicShowPlotDataFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RiaFeatureCommandContext.h" #include "RiaFeatureCommandContext.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiaPreferences.h" #include "RiaPreferencesSummary.h"
#include "RimGridCrossPlot.h" #include "RimGridCrossPlot.h"
#include "RimGridCrossPlotCurve.h" #include "RimGridCrossPlotCurve.h"
@ -83,7 +83,7 @@ public:
if ( m_summaryPlot->containsResamplableCurves() ) if ( m_summaryPlot->containsResamplableCurves() )
{ {
RiaPreferences* prefs = RiaApplication::instance()->preferences(); RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
return m_summaryPlot->asciiDataForSummaryPlotExport( timePeriod, prefs->showSummaryTimeAsLongString() ); return m_summaryPlot->asciiDataForSummaryPlotExport( timePeriod, prefs->showSummaryTimeAsLongString() );
} }

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicAsciiExportSummaryPlotFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaPreferences.h" #include "RiaPreferencesSummary.h"
#include "RicResampleDialog.h" #include "RicResampleDialog.h"
@ -61,7 +61,7 @@ void RicAsciiExportSummaryPlotFeature::onActionTriggered( bool isChecked )
caf::SelectionManager::instance()->objectsByType( &selectedSummaryPlots ); caf::SelectionManager::instance()->objectsByType( &selectedSummaryPlots );
QString defaultDir = defaultExportDir(); QString defaultDir = defaultExportDir();
RiaPreferences* prefs = RiaApplication::instance()->preferences(); RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
// Ask user about resampling // Ask user about resampling
auto result = RicResampleDialog::openDialog(); auto result = RicResampleDialog::openDialog();

14
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RiaColorTables.h" #include "RiaColorTables.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiaPreferences.h" #include "RiaPreferencesSummary.h"
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RimEnsembleCurveFilter.h" #include "RimEnsembleCurveFilter.h"
@ -59,7 +59,9 @@ std::vector<RimEnsembleCurveSet*>
RimProject* project = RimProject::current(); RimProject* project = RimProject::current();
CVF_ASSERT( project ); CVF_ASSERT( project );
QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
QString curvesTextFilter = prefs->defaultSummaryCurvesTextFilter();
QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts ); QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts );
std::set<RifEclipseSummaryAddress> addrs = ensemble->ensembleSummaryAddresses(); std::set<RifEclipseSummaryAddress> addrs = ensemble->ensembleSummaryAddresses();
@ -102,7 +104,9 @@ RimSummaryPlot*
RiaGuiApplication* app = RiaGuiApplication::instance(); RiaGuiApplication* app = RiaGuiApplication::instance();
RimProject* proj = app->project(); 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(); RimSummaryPlotCollection* summaryPlotCollection = proj->mainPlotCollection->summaryPlotCollection();
RimSummaryPlot* plot = summaryPlotCollection->createSummaryPlotWithAutoTitle(); RimSummaryPlot* plot = summaryPlotCollection->createSummaryPlotWithAutoTitle();
@ -159,8 +163,10 @@ void RicNewSummaryEnsembleCurveSetFeature::onActionTriggered( bool isChecked )
CVF_ASSERT( !project->summaryGroups().empty() ); CVF_ASSERT( !project->summaryGroups().empty() );
auto ensemble = project->summaryGroups().back(); auto ensemble = project->summaryGroups().back();
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
RimEnsembleCurveSet* firstCurveSet = nullptr; RimEnsembleCurveSet* firstCurveSet = nullptr;
if ( !RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter().isEmpty() ) if ( !prefs->defaultSummaryCurvesTextFilter().isEmpty() )
{ {
auto curveSets = RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( plot, ensemble ); auto curveSets = RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSets( plot, ensemble );
if ( !curveSets.empty() ) firstCurveSet = curveSets.front(); if ( !curveSets.empty() ) firstCurveSet = curveSets.front();

15
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@ -24,7 +24,7 @@
#include "RiaEclipseFileNameTools.h" #include "RiaEclipseFileNameTools.h"
#include "RiaImportEclipseCaseTools.h" #include "RiaImportEclipseCaseTools.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaPreferences.h" #include "RiaPreferencesSummary.h"
#include "RicCreateSummaryCaseCollectionFeature.h" #include "RicCreateSummaryCaseCollectionFeature.h"
#include "RicImportGeneralDataFeature.h" #include "RicImportGeneralDataFeature.h"
@ -68,7 +68,9 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot( RimSummaryPlo
{ {
RifEclipseSummaryAddress defaultAddressToUse; RifEclipseSummaryAddress defaultAddressToUse;
QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
QString curvesTextFilter = prefs->defaultSummaryCurvesTextFilter();
QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts ); QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts );
if ( curveFilters.size() ) if ( curveFilters.size() )
@ -115,7 +117,9 @@ RimSummaryCurve* RicSummaryPlotFeatureImpl::addDefaultCurveToPlot( RimSummaryPlo
std::vector<RimSummaryCurve*> RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot( RimSummaryPlot* plot, std::vector<RimSummaryCurve*> RicSummaryPlotFeatureImpl::addDefaultCurvesToPlot( RimSummaryPlot* plot,
RimSummaryCase* summaryCase ) RimSummaryCase* summaryCase )
{ {
QString curvesTextFilter = RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter; RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
QString curvesTextFilter = prefs->defaultSummaryCurvesTextFilter();
QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts ); QStringList curveFilters = curvesTextFilter.split( ";", QString::SkipEmptyParts );
bool addHistoryCurve = false; bool addHistoryCurve = false;
@ -150,10 +154,11 @@ caf::PdmObject* RicSummaryPlotFeatureImpl::createDefaultSummaryPlot( RimSummaryC
{ {
RimSummaryPlotCollection* summaryPlotCollection = RimProject::current()->mainPlotCollection->summaryPlotCollection(); RimSummaryPlotCollection* summaryPlotCollection = RimProject::current()->mainPlotCollection->summaryPlotCollection();
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
caf::PdmObject* itemToSelect = nullptr; caf::PdmObject* itemToSelect = nullptr;
if ( summaryPlotCollection && summaryCase && if ( summaryPlotCollection && summaryCase && !prefs->defaultSummaryCurvesTextFilter().isEmpty() )
!RiaApplication::instance()->preferences()->defaultSummaryCurvesTextFilter().isEmpty() )
{ {
auto plot = summaryPlotCollection->createSummaryPlotWithAutoTitle(); auto plot = summaryPlotCollection->createSummaryPlotWithAutoTitle();

15
ApplicationLibCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@ -21,7 +21,7 @@
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaFilePathTools.h" #include "RiaFilePathTools.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaPreferences.h" #include "RiaPreferencesSummary.h"
#include "RicSummaryCaseRestartDialog.h" #include "RicSummaryCaseRestartDialog.h"
@ -54,11 +54,11 @@ bool vectorContains( const std::vector<T>& vector, T item )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// INternal function /// 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 ? RicSummaryCaseRestartDialog::ImportOptions::NOT_IMPORT
: mode == RiaPreferences::SummaryRestartFilesImportMode::SEPARATE_CASES : mode == RiaPreferencesSummary::SummaryRestartFilesImportMode::SEPARATE_CASES
? RicSummaryCaseRestartDialog::ImportOptions::SEPARATE_CASES ? RicSummaryCaseRestartDialog::ImportOptions::SEPARATE_CASES
: RicSummaryCaseRestartDialog::ImportOptions::IMPORT_ALL; : RicSummaryCaseRestartDialog::ImportOptions::IMPORT_ALL;
} }
@ -68,7 +68,8 @@ RicSummaryCaseRestartDialog::ImportOptions mapReadOption( RiaPreferences::Summar
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RifSummaryCaseRestartSelector::RifSummaryCaseRestartSelector() RifSummaryCaseRestartSelector::RifSummaryCaseRestartSelector()
{ {
RiaPreferences* prefs = RiaApplication::instance()->preferences(); RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
m_showDialog = prefs->summaryRestartFilesShowImportDialog(); m_showDialog = prefs->summaryRestartFilesShowImportDialog();
m_ensembleOrGroupMode = false; m_ensembleOrGroupMode = false;
@ -172,7 +173,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser( const st
m_gridFiles.clear(); m_gridFiles.clear();
m_summaryFileErrors.clear(); m_summaryFileErrors.clear();
RiaPreferences* prefs = RiaApplication::instance()->preferences(); RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode; RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode;
if ( m_ensembleOrGroupMode ) if ( m_ensembleOrGroupMode )
@ -253,7 +254,7 @@ void RifSummaryCaseRestartSelector::determineFilesToImportUsingPrefs( const std:
m_gridFiles.clear(); m_gridFiles.clear();
m_summaryFileErrors.clear(); m_summaryFileErrors.clear();
RiaPreferences* prefs = RiaApplication::instance()->preferences(); RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode; RicSummaryCaseRestartDialog::ImportOptions defaultSummaryImportMode;
if ( m_ensembleOrGroupMode ) if ( m_ensembleOrGroupMode )

19
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@ -394,7 +394,9 @@ void RimSummaryCaseMainCollection::loadSummaryCaseData( std::vector<RimSummaryCa
std::vector<RimFileSummaryCase*> fileSummaryCases; std::vector<RimFileSummaryCase*> fileSummaryCases;
std::vector<RimSummaryCase*> otherSummaryCases; std::vector<RimSummaryCase*> otherSummaryCases;
if ( RiaApplication::instance()->preferences()->useMultipleThreadsWhenReadingSummaryData() ) RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
if ( prefs->useMultipleThreadsWhenLoadingSummaryData() )
{ {
for ( auto c : summaryCases ) for ( auto c : summaryCases )
{ {
@ -416,13 +418,11 @@ void RimSummaryCaseMainCollection::loadSummaryCaseData( std::vector<RimSummaryCa
if ( !fileSummaryCases.empty() ) if ( !fileSummaryCases.empty() )
{ {
auto prefSummary = RiaPreferences::current()->summaryPreferences();
int threadCount = 1; int threadCount = 1;
#ifdef USE_OPENMP #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 else
{ {
@ -461,12 +461,12 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( std::vector<RimFileS
// RimSummaryCase, as it is difficult to make sure all variants of the leaf classes are thread safe. // RimSummaryCase, as it is difficult to make sure all variants of the leaf classes are thread safe.
// Only open the summary file reader in parallel loop to reduce risk of multi threading issues // Only open the summary file reader in parallel loop to reduce risk of multi threading issues
RiaPreferencesSummary* prefSummary = RiaPreferences::current()->summaryPreferences(); RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
#ifdef USE_HDF5 #ifdef USE_HDF5
{ {
if ( prefSummary->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON && if ( prefs->summaryDataReader() == RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON &&
prefSummary->createH5SummaryDataFiles() ) prefs->createH5SummaryDataFiles() )
{ {
std::vector<std::string> headerFileNames; std::vector<std::string> headerFileNames;
std::vector<std::string> h5FileNames; std::vector<std::string> h5FileNames;
@ -496,8 +496,7 @@ void RimSummaryCaseMainCollection::loadFileSummaryCaseData( std::vector<RimFileS
RiaThreadSafeLogger threadSafeLogger; RiaThreadSafeLogger threadSafeLogger;
// The HDF5 reader requires a special configuration to be thread safe. Disable threading for HDF reader creation. // The HDF5 reader requires a special configuration to be thread safe. Disable threading for HDF reader creation.
bool canUseMultipleTreads = bool canUseMultipleTreads = ( prefs->summaryDataReader() != RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON );
( prefSummary->summaryDataReader() != RiaPreferencesSummary::SummaryReaderMode::HDF5_OPM_COMMON );
#pragma omp parallel for schedule( dynamic ) if ( canUseMultipleTreads ) #pragma omp parallel for schedule( dynamic ) if ( canUseMultipleTreads )
for ( int cIdx = 0; cIdx < static_cast<int>( fileSummaryCases.size() ); ++cIdx ) for ( int cIdx = 0; cIdx < static_cast<int>( fileSummaryCases.size() ); ++cIdx )

11
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -22,7 +22,7 @@
#include "RiaCurveMerger.h" #include "RiaCurveMerger.h"
#include "RiaGuiApplication.h" #include "RiaGuiApplication.h"
#include "RiaLogging.h" #include "RiaLogging.h"
#include "RiaPreferences.h" #include "RiaPreferencesSummary.h"
#include "RiaResultNames.h" #include "RiaResultNames.h"
#include "RiaStatisticsTools.h" #include "RiaStatisticsTools.h"
#include "RiaSummaryCurveDefinition.h" #include "RiaSummaryCurveDefinition.h"
@ -980,23 +980,24 @@ void RimSummaryCurve::setCurveAppearanceFromCaseType()
if ( m_yValuesSummaryAddress && m_yValuesSummaryAddress->address().isHistoryQuantity() ) 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; m_symbolEdgeColor = m_curveColor;
setSymbol( RiuQwtSymbol::SYMBOL_XCROSS ); setSymbol( RiuQwtSymbol::SYMBOL_XCROSS );
setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_NONE ); 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; m_symbolEdgeColor = m_curveColor;
setSymbol( RiuQwtSymbol::SYMBOL_XCROSS ); setSymbol( RiuQwtSymbol::SYMBOL_XCROSS );
setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID ); setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID );
} }
else if ( prefs->defaultSummaryHistoryCurveStyle() == RiaPreferences::SummaryHistoryCurveStyleMode::LINES ) else if ( prefs->defaultSummaryHistoryCurveStyle() == RiaPreferencesSummary::SummaryHistoryCurveStyleMode::LINES )
{ {
setSymbol( RiuQwtSymbol::SYMBOL_NONE ); setSymbol( RiuQwtSymbol::SYMBOL_NONE );
setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID ); setLineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID );