OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-31 17:17:50 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adjustments for release

Browse Source 
* Make sure RFT curve settings are restored correctly, use three numbers to identify project version string to compare with.
* Increases dialog window sizes for summary template operations
* Move improved summary import setting to Summary tab
* #12838 Use discrete linear as default legend for CNV_* result names
* Bump version to 2025.04.4-dev.10
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-08-25 20:11:04 +02:00
1 parent 83ae9fb7ac
commit b8fc3df6f5
10 files changed
+33 -43
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/Application/RiaPreferencesSummary.cpp
+18
View File
@@ -159,6 +159,15 @@ RiaPreferencesSummary::RiaPreferencesSummary()
CAF_PDM_InitFieldNoDefault( &m_summaryReader, "summaryReaderType_v01", "File Format" );
CAF_PDM_InitField( &m_useImprovedSummaryImport,
"useImprovedSummaryImport",
true,
"Use Improved Summary Import",
"",
"For ensemble import, skip metadata import for individual realizations. This reduces file operations and can "
"significantly speed up the import process." );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useImprovedSummaryImport );
CAF_PDM_InitField( &m_showSummaryTimeAsLongString,
"showSummaryTimeAsLongString",
false,
@@ -331,6 +340,14 @@ bool RiaPreferencesSummary::summaryRestartFilesShowImportDialog() const
return m_summaryRestartFilesShowImportDialog;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferencesSummary::useImprovedSummaryImport() const
{
return m_useImprovedSummaryImport;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -403,6 +420,7 @@ RiaPreferencesSummary::SummaryHistoryCurveStyleMode RiaPreferencesSummary::defau
void RiaPreferencesSummary::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_useMultipleThreadsWhenLoadingSummaryCases );
uiOrdering.add( &m_useImprovedSummaryImport );
uiOrdering.add( &m_summaryReader );
if ( m_summaryReader == SummaryReaderMode::OPM_COMMON )
ApplicationLibCode/Application/RiaPreferencesSummary.h
+2
View File
@@ -99,6 +99,7 @@ public:
bool showSummaryTimeAsLongString() const;
bool useMultipleThreadsWhenLoadingSummaryData() const;
bool summaryRestartFilesShowImportDialog() const;
bool useImprovedSummaryImport() const;
SummaryRestartFilesImportMode summaryImportMode() const;
SummaryRestartFilesImportMode gridImportMode() const;
@@ -149,6 +150,7 @@ private:
caf::PdmField<int> m_createH5SummaryFileThreadCount;
caf::PdmField<SummaryReaderModeType> m_summaryReader;
caf::PdmField<bool> m_useImprovedSummaryImport;
caf::PdmField<ColumnCountEnum> m_defaultColumnCount;
caf::PdmField<RowCountEnum> m_defaultRowsPerPage;
ApplicationLibCode/Application/RiaPreferencesSystem.cpp
-31
View File
@@ -80,15 +80,6 @@ RiaPreferencesSystem::RiaPreferencesSystem()
CAF_PDM_InitField( &m_showPdfExportDialog, "showPdfExportDialog", true, "Show PDF Export Dialog" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_showPdfExportDialog );
CAF_PDM_InitField( &m_useImprovedSummaryImport, "useImprovedSummaryImport", false, "Use Improved Summary Import" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useImprovedSummaryImport );
CAF_PDM_InitField( &m_useMultiThreadingForSummary_TEMPORARY,
"useMultiThreadingForSummary",
true,
"Use Multithreading for Summary Import (TEMPORARY)" );
caf::PdmUiNativeCheckBoxEditor::configureFieldForEditor( &m_useMultiThreadingForSummary_TEMPORARY );
CAF_PDM_InitField( &m_gtestFilter, "gtestFilter", QString(), "Unit Test Filter (gtest)" );
CAF_PDM_InitField( &m_exportScalingFactor, "exportScalingFactor", -1.0, "Export Scaling Factor (<0 disable)" );
@@ -236,22 +227,6 @@ double RiaPreferencesSystem::exportPdfScalingFactor() const
return m_exportScalingFactor();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferencesSystem::useImprovedSummaryImport() const
{
return m_useImprovedSummaryImport();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaPreferencesSystem::useMultiThreadingForSummaryImport() const
{
return m_useMultiThreadingForSummary_TEMPORARY();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -332,12 +307,6 @@ void RiaPreferencesSystem::defineUiOrdering( QString uiConfigName, caf::PdmUiOrd
group->add( &m_gtestFilter );
}
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Summary Settings - July 2025" );
group->add( &m_useImprovedSummaryImport );
group->add( &m_useMultiThreadingForSummary_TEMPORARY );
}
uiOrdering.add( &m_maximumNumberOfThreads );
}
ApplicationLibCode/Application/RiaPreferencesSystem.h
-6
View File
@@ -57,9 +57,6 @@ public:
bool showPdfExportDialog() const;
double exportPdfScalingFactor() const;
bool useImprovedSummaryImport() const;
bool useMultiThreadingForSummaryImport() const;
std::optional<int> threadCount() const;
bool logToFile() const;
@@ -90,9 +87,6 @@ private:
caf::PdmField<bool> m_showPdfExportDialog;
caf::PdmField<double> m_exportScalingFactor;
caf::PdmField<bool> m_useImprovedSummaryImport;
caf::PdmField<bool> m_useMultiThreadingForSummary_TEMPORARY;
caf::PdmField<bool> m_showProgressBar;
caf::PdmField<QString> m_gtestFilter;
ApplicationLibCode/Application/Tools/Summary/RiaSummaryPlotTemplateTools.cpp
+1 -1
View File
@@ -446,7 +446,7 @@ QString RicSummaryPlotTemplateTools::selectPlotTemplatePath()
RicSelectPlotTemplateUi ui;
caf::PdmUiPropertyViewDialog propertyDialog( plotwindow, &ui, "Select Plot Template", "" );
propertyDialog.resize( QSize( 400, 600 ) );
propertyDialog.resize( QSize( 600, 800 ) );
if ( propertyDialog.exec() == QDialog::Accepted && !ui.selectedPlotTemplates().empty() )
{