Improve curve naming

* Add curve name template and handling of string variables
* Mark autoName as obsolete field
* Use key-value map to populate variable values
* Add curve naming methods Auto, Custom and Template
This commit is contained in:
Magne Sjaastad
2022-10-11 14:02:46 +02:00
committed by GitHub
parent 05d7eac52c
commit 5e184df670
15 changed files with 294 additions and 82 deletions

View File

@@ -177,7 +177,7 @@ void RimAsciiDataCurve::onLoadDataAndUpdate( bool updateParentPlot )
//--------------------------------------------------------------------------------------------------
void RimAsciiDataCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimPlotCurve::updateOptionSensitivity();
RimPlotCurve::updateFieldUiState();
uiOrdering.add( &m_plotAxis );

View File

@@ -846,7 +846,7 @@ void RimSummaryCurve::defineEditorAttribute( const caf::PdmFieldHandle* field,
//--------------------------------------------------------------------------------------------------
void RimSummaryCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimPlotCurve::updateOptionSensitivity();
RimPlotCurve::updateFieldUiState();
{
QString curveDataGroupName = "Summary Vector";
@@ -883,7 +883,7 @@ void RimSummaryCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
nameGroup->add( &m_showLegend );
RimPlotCurve::curveNameUiOrdering( *nameGroup );
if ( m_isUsingAutoName )
if ( m_namingMethod == RiaDefines::ObjectNamingMethod::AUTO )
{
m_curveNameConfig->uiOrdering( uiConfigName, *nameGroup );
}