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

#5279 Formations GeoMech : Add const and simplify access

Browse Source
This commit is contained in:
Magne Sjaastad
2020-01-03 11:59:17 +01:00
parent afc9ace33e
commit 1c4feade71
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimGeoMechPropertyFilter.cpp
View File

@@ -269,11 +269,7 @@ void RimGeoMechPropertyFilter::computeResultValueRange()
{
if ( resultDefinition->hasCategoryResult() )
{
std::vector<QString> fnVector;
if ( resultDefinition->ownerCaseData()->femPartResults()->activeFormationNames() )
{
fnVector = resultDefinition->ownerCaseData()->femPartResults()->activeFormationNames()->formationNames();
}
std::vector<QString> fnVector = resultDefinition->ownerCaseData()->femPartResults()->formationNames();
setCategoryNames( fnVector );
}
else

6
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -697,11 +697,7 @@ void RimGeoMechResultDefinition::updateLegendTextAndRanges( RimRegularLegendConf
if ( this->hasCategoryResult() )
{
std::vector<QString> fnVector;
if ( gmCase->femPartResults()->activeFormationNames() )
{
fnVector = gmCase->femPartResults()->activeFormationNames()->formationNames();
}
std::vector<QString> fnVector = gmCase->femPartResults()->formationNames();
legendConfigToUpdate->setNamedCategoriesInverse( fnVector );
}

5
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -2031,10 +2031,7 @@ std::vector<QString> RimWellLogTrack::formationNamesVector( RimCase* rimCase )
}
else if ( geoMechCase )
{
if ( geoMechCase->geoMechData()->femPartResults()->activeFormationNames() )
{
return geoMechCase->geoMechData()->femPartResults()->activeFormationNames()->formationNames();
}
return geoMechCase->geoMechData()->femPartResults()->formationNames();
}
return std::vector<QString>();