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

Rft segment plot adjustments

Browse Source 
* #9371 RFT Curves: Add scaling factor
* Make sure isUsingAutoName is guarded by project file date
* Rearrange font and legend group in property editor
This commit is contained in:
Magne Sjaastad
2022-10-19 15:13:15 +02:00
committed by GitHub
parent 0b7700024f
commit 493531626f
15 changed files with 125 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -70,7 +70,7 @@ RimPlotCurve::RimPlotCurve()
CAF_PDM_InitFieldNoDefault( &m_legendEntryText, "LegendDescription", "Legend Name" );
m_legendEntryText.uiCapability()->setUiHidden( true );
CAF_PDM_InitField( &m_isUsingAutoName_OBSOLETE, "AutoName", true, "Auto Name" );
CAF_PDM_InitField( &m_isUsingAutoName_OBSOLETE, "AutoName", false, "Auto Name" );
m_isUsingAutoName_OBSOLETE.xmlCapability()->setIOWritable( false );
m_isUsingAutoName_OBSOLETE.uiCapability()->setUiHidden( true );
@@ -253,13 +253,16 @@ void RimPlotCurve::initAfterRead()
updateCurveAppearanceForFilesOlderThan_2021_06();
}
if ( m_isUsingAutoName_OBSOLETE() )
if ( RimProject::current()->isProjectFileVersionEqualOrOlderThan( "2022.06.1" ) )
{
m_namingMethod = RiaDefines::ObjectNamingMethod::AUTO;
}
else
{
m_namingMethod = RiaDefines::ObjectNamingMethod::CUSTOM;
if ( m_isUsingAutoName_OBSOLETE() )
{
m_namingMethod = RiaDefines::ObjectNamingMethod::AUTO;
}
else
{
m_namingMethod = RiaDefines::ObjectNamingMethod::CUSTOM;
}
}
}