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

Improve curve naming

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ProjectDataModel/WellLog/RimRftTopologyCurve.cpp
View File

@@ -125,7 +125,7 @@ QString RimRftTopologyCurve::createCurveAutoName()
//--------------------------------------------------------------------------------------------------
void RimRftTopologyCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimPlotCurve::updateOptionSensitivity();
RimPlotCurve::updateFieldUiState();
caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup( "Data Source" );
curveDataGroup->add( &m_summaryCase );

4
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp
View File

@@ -749,7 +749,7 @@ QList<caf::PdmOptionItemInfo>
//--------------------------------------------------------------------------------------------------
void RimWellLogExtractionCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimPlotCurve::updateOptionSensitivity();
RimPlotCurve::updateFieldUiState();
caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroupWithKeyword( "Data Source", dataSourceGroupKeyword() );
@@ -798,7 +798,7 @@ void RimWellLogExtractionCurve::defineUiOrdering( QString uiConfigName, caf::Pdm
nameGroup->add( &m_showLegend );
RimPlotCurve::curveNameUiOrdering( *nameGroup );
if ( m_isUsingAutoName )
if ( m_namingMethod == RiaDefines::ObjectNamingMethod::AUTO )
{
nameGroup->add( &m_addWellNameToCurveName );
nameGroup->add( &m_addCaseNameToCurveName );

4
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogFileCurve.cpp
View File

@@ -178,7 +178,7 @@ void RimWellLogFileCurve::onLoadDataAndUpdate( bool updateParentPlot )
}
}
if ( m_isUsingAutoName )
if ( m_namingMethod == RiaDefines::ObjectNamingMethod::AUTO )
{
m_plotCurve->setTitle( createCurveAutoName() );
}
@@ -330,7 +330,7 @@ void RimWellLogFileCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedFi
//--------------------------------------------------------------------------------------------------
void RimWellLogFileCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimPlotCurve::updateOptionSensitivity();
RimPlotCurve::updateFieldUiState();
caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup( "Curve Data" );
curveDataGroup->add( &m_wellPath );

81
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.cpp
View File

@@ -482,32 +482,38 @@ void RimWellLogRftCurve::assignColorFromResultName( const QString& resultName )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogRftCurve::createCurveAutoName()
std::map<QString, QString> RimWellLogRftCurve::createCurveNameKeyValueMap() const
{
QStringList name;
std::map<QString, QString> variableValueMap;
if ( !wellName().isEmpty() )
{
name.push_back( wellName() );
variableValueMap[RiaDefines::namingVariableWell()] = wellName();
}
name.push_back( "RFT" );
variableValueMap[RiaDefines::namingVariableResultType()] = "RFT";
QString caseText;
if ( m_eclipseResultCase )
{
name.push_back( m_eclipseResultCase->caseUserDescription() );
caseText = m_eclipseResultCase->caseUserDescription();
}
else if ( m_ensemble ) // Summary RFT curves have both ensemble and summary set. Prioritize ensemble for name.
{
name.push_back( m_ensemble->name() );
caseText = m_ensemble->name();
}
else if ( m_summaryCase )
{
name.push_back( m_summaryCase->displayCaseName() );
caseText = m_summaryCase->displayCaseName();
}
else if ( m_observedFmuRftData )
{
name.push_back( m_observedFmuRftData->name() );
caseText = m_observedFmuRftData->name();
}
if ( !caseText.isEmpty() )
{
variableValueMap[RiaDefines::namingVariableCase()] = caseText;
}
if ( m_rftDataType() == RftDataType::RFT_DATA )
@@ -518,25 +524,70 @@ QString RimWellLogRftCurve::createCurveAutoName()
RifEclipseRftAddress::RftWellLogChannelType channelNameEnum =
caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelType>::fromText( wellLogChannelUiName() );
QString channelName = caf::AppEnum<RifEclipseRftAddress::RftWellLogChannelType>::uiText( channelNameEnum );
name.push_back( channelName );
variableValueMap[RiaDefines::namingVariableResultName()] = channelName;
}
}
else if ( m_rftDataType() == RftDataType::RFT_SEGMENT_DATA )
{
name.push_back( m_segmentResultName );
variableValueMap[RiaDefines::namingVariableResultName()] = m_segmentResultName;
QString branchText = QString( "Branch %1" ).arg( m_segmentBranchIndex() );
name.push_back( branchText );
name.push_back( m_segmentBranchType().uiText() );
variableValueMap[RiaDefines::namingVariableWellBranch()] = branchText;
variableValueMap[RiaDefines::namingVariableResultType()] = m_segmentBranchType().uiText();
}
if ( !m_timeStep().isNull() )
{
name.push_back( m_timeStep().toString( RiaQDateTimeTools::dateFormatString() ) );
variableValueMap[RiaDefines::namingVariableTime()] = m_timeStep().toString( RiaQDateTimeTools::dateFormatString() );
}
return name.join( ", " );
return variableValueMap;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogRftCurve::createCurveAutoName()
{
QStringList curveNameSubStrings;
for ( const auto& [key, value] : createCurveNameKeyValueMap() )
{
curveNameSubStrings.push_back( value );
}
return curveNameSubStrings.join( ", " );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogRftCurve::createCurveNameFromTemplate( const QString& templateText )
{
QString curveName = templateText;
for ( const auto& [key, value] : createCurveNameKeyValueMap() )
{
curveName.replace( key, value );
}
return curveName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QStringList RimWellLogRftCurve::supportedCurveNameVariables() const
{
return { RiaDefines::namingVariableWell(),
RiaDefines::namingVariableResultName(),
RiaDefines::namingVariableResultType(),
RiaDefines::namingVariableCase(),
RiaDefines::namingVariableWellBranch(),
RiaDefines::namingVariableTime() };
}
//--------------------------------------------------------------------------------------------------
@@ -735,7 +786,7 @@ void RimWellLogRftCurve::onLoadDataAndUpdate( bool updateParentPlot )
//--------------------------------------------------------------------------------------------------
void RimWellLogRftCurve::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
RimPlotCurve::updateOptionSensitivity();
RimPlotCurve::updateFieldUiState();
caf::PdmUiGroup* curveDataGroup = uiOrdering.addNewGroup( "Curve Data" );
curveDataGroup->add( &m_eclipseResultCase );

8
ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogRftCurve.h
View File

@@ -102,8 +102,10 @@ public:
void assignColorFromResultName( const QString& resultName );
protected:
// Overrides from RimWellLogPlotCurve
QString createCurveAutoName() override;
QString createCurveAutoName() override;
QString createCurveNameFromTemplate( const QString& templateText ) override;
QStringList supportedCurveNameVariables() const override;
void onLoadDataAndUpdate( bool updateParentPlot ) override;
RiaDefines::PhaseType phaseType() const override;
@@ -124,6 +126,8 @@ private:
std::vector<size_t> sortedIndicesInRftFile();
void updateWellChannelNameAndTimeStep();
std::map<QString, QString> createCurveNameKeyValueMap() const;
std::vector<double> xValues();
std::vector<double> errorValues();
std::vector<double> tvDepthValues();