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

Prepare 2025.09.0-RC_1

Browse Source 
* Migrates obsolete color field to main color
* Sets filter mode for older project files
* Adds surfio license information
* Removes log to file preference
* Refines short name generation.
This commit is contained in:
Magne Sjaastad authored and GitHub committed 2025-08-28 20:14:53 +02:00
1 parent 4135a743fe
commit 35d1279b1d
11 files changed
+7007 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveFilter.cpp
+5
View File
@@ -500,6 +500,11 @@ void RimEnsembleCurveFilter::initAfterRead()
{
m_valueRange = std::pair<double, double>( m_minValue_OBSOLETE, m_maxValue_OBSOLETE );
};
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2020.04.0" ) )
{
m_filterMode = FilterMode::ENSEMBLE_PARAMETER;
};
}
//--------------------------------------------------------------------------------------------------
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
+11
View File
@@ -154,6 +154,9 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
CAF_PDM_InitField( &m_colorMode, "ColorMode", caf::AppEnum<ColorMode>( ColorMode::SINGLE_COLOR ), "Coloring Mode" );
CAF_PDM_InitFieldNoDefault( &m_colorForRealizations_OBSOLETE, "Color", "Color" );
m_colorForRealizations_OBSOLETE.xmlCapability()->setIOWritable( false );
CAF_PDM_InitField( &m_mainEnsembleColor, "MainEnsembleColor", RiaColorTools::textColor3f(), "Color" );
CAF_PDM_InitField( &m_colorOpacity, "ColorTransparency", 0.8, "Opacity [0..1]" );
m_colorOpacity.uiCapability()->setUiEditorTypeName( caf::PdmUiDoubleSliderEditor::uiEditorTypeName() );
@@ -2710,6 +2713,14 @@ void RimEnsembleCurveSet::setBottomOrTopAxisX( RiuPlotAxis plotAxis )
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::initAfterRead()
{
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2024.09" ) )
{
if ( m_colorMode == ColorMode::SINGLE_COLOR )
{
m_mainEnsembleColor = m_colorForRealizations_OBSOLETE;
}
}
if ( m_yPlotAxisProperties.value() == nullptr )
{
auto plot = firstAncestorOrThisOfType<RimSummaryPlot>();
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
+2
View File
@@ -320,4 +320,6 @@ private:
QList<caf::PdmOptionItemInfo> m_cachedAddressOptions;
size_t m_hash;
size_t m_realizationHash;
caf::PdmField<cvf::Color3f> m_colorForRealizations_OBSOLETE;
};