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 : Add const and simplify access

Browse Source
This commit is contained in:
Magne Sjaastad
2020-01-03 09:59:38 +01:00
parent 5bcaed594b
commit afc9ace33e
12 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@@ -1001,15 +1001,11 @@ void RimGridCrossPlotDataSet::updateLegendRange()
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( m_case() );
if ( eclipseCase )
{
RigFormationNames* formationNames = eclipseCase->eclipseCaseData()->activeFormationNames();
if ( formationNames )
const std::vector<QString> categoryNames = eclipseCase->eclipseCaseData()->formationNames();
if ( !categoryNames.empty() )
{
const std::vector<QString>& categoryNames = formationNames->formationNames();
if ( !categoryNames.empty() )
{
legendConfig()->setNamedCategoriesInverse( categoryNames );
legendConfig()->setAutomaticRanges( 0, categoryNames.size() - 1, 0, categoryNames.size() - 1 );
}
legendConfig()->setNamedCategoriesInverse( categoryNames );
legendConfig()->setAutomaticRanges( 0, categoryNames.size() - 1, 0, categoryNames.size() - 1 );
}
}
}

11
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@@ -403,15 +403,10 @@ void RimEclipsePropertyFilter::computeResultValueRange()
if ( m_resultDefinition->resultType() == RiaDefines::FORMATION_NAMES )
{
CVF_ASSERT( parentContainer()->reservoirView()->eclipseCase()->eclipseCaseData() );
CVF_ASSERT(
parentContainer()->reservoirView()->eclipseCase()->eclipseCaseData()->activeFormationNames() );
const std::vector<QString>& fnVector = parentContainer()
->reservoirView()
->eclipseCase()
->eclipseCaseData()
->activeFormationNames()
->formationNames();
const std::vector<QString> fnVector =
parentContainer()->reservoirView()->eclipseCase()->eclipseCaseData()->formationNames();
setCategoryNames( fnVector );
}
else if ( m_resultDefinition->resultVariable() == RiaDefines::completionTypeResultName() )

6
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -1882,15 +1882,15 @@ void RimEclipseResultDefinition::updateRangesForExplicitLegends( RimRegularLegen
{
if ( this->resultType() == RiaDefines::FORMATION_NAMES )
{
const std::vector<QString>& fnVector = eclipseCaseData->activeFormationNames()->formationNames();
std::vector<QString> fnVector = eclipseCaseData->formationNames();
legendConfigToUpdate->setNamedCategoriesInverse( fnVector );
}
else if ( this->resultType() == RiaDefines::ALLEN_DIAGRAMS )
{
if ( this->resultVariable() == RiaDefines::formationAllenResultName() )
{
const std::vector<QString>& fnVector = eclipseCaseData->activeFormationNames()->formationNames();
std::vector<int> fnameIdxes;
const std::vector<QString> fnVector = eclipseCaseData->formationNames();
std::vector<int> fnameIdxes;
for ( int i = static_cast<int>( fnVector.size() ); i > 0; --i )
fnameIdxes.push_back( i - 1 );

2
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -1252,7 +1252,7 @@ void RimEclipseView::onUpdateLegends()
}
else
{
const std::vector<QString>& fnVector = eclipseCase->activeFormationNames()->formationNames();
const std::vector<QString> fnVector = eclipseCase->formationNames();
cellEdgeResult()->legendConfig()->setNamedCategoriesInverse( fnVector );
}
}

5
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

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