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

#5399 Export LAS-curves of WBS-parameters with the LAS-name rather than the Ui name

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-01-28 10:09:23 +01:00
parent a399a843b0
commit b40f3dcd39
18 changed files with 113 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@@ -877,9 +877,9 @@ QString RimWellLogExtractionCurve::createCurveAutoName()
generatedCurveName.push_back( m_case->caseUserDescription() );
}
if ( m_addPropertyToCurveName && !wellLogChannelName().isEmpty() )
if ( m_addPropertyToCurveName && !wellLogChannelUiName().isEmpty() )
{
generatedCurveName.push_back( wellLogChannelName() );
generatedCurveName.push_back( wellLogChannelUiName() );
}
if ( m_addTimestepToCurveName || m_addDateToCurveName )
@@ -921,6 +921,27 @@ QString RimWellLogExtractionCurve::createCurveAutoName()
return generatedCurveName.join( ", " );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimWellLogExtractionCurve::wellLogChannelUiName() const
{
RimGeoMechCase* geoMechCase = dynamic_cast<RimGeoMechCase*>( m_case.value() );
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( m_case.value() );
QString name;
if ( eclipseCase )
{
name = caf::Utils::makeValidFileBasename( m_eclipseResultDefinition->resultVariableUiShortName() );
}
else if ( geoMechCase )
{
name = m_geomResultDefinition->resultVariableUiName();
}
return name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -936,15 +957,7 @@ QString RimWellLogExtractionCurve::wellLogChannelName() const
}
else if ( geoMechCase )
{
QString resCompName = m_geomResultDefinition->resultComponentUiName();
if ( resCompName.isEmpty() )
{
name = m_geomResultDefinition->resultFieldUiName();
}
else
{
name = m_geomResultDefinition->resultFieldUiName() + "." + resCompName;
}
name = caf::Utils::makeValidFileBasename( m_geomResultDefinition->resultVariableName() );
}
return name;