From 40183ce640db9fb75df673bb77cabb17b812ef68 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Wed, 12 Aug 2020 19:39:57 +0200 Subject: [PATCH] Move function to private section --- .../ProjectDataModel/RimEclipseResultDefinition.cpp | 2 +- ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 3bd7771d2f..051aff289d 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -1454,7 +1454,7 @@ bool RimEclipseResultDefinition::isCompletionTypeSelected() const bool RimEclipseResultDefinition::hasCategoryResult() const { if ( this->m_resultType() == RiaDefines::ResultCatType::FORMATION_NAMES && m_eclipseCase && - m_eclipseCase->eclipseCaseData() && m_eclipseCase->eclipseCaseData()->activeFormationNames() ) + m_eclipseCase->eclipseCaseData() && !m_eclipseCase->eclipseCaseData()->formationNames().empty() ) return true; if ( this->m_resultType() == RiaDefines::ResultCatType::DYNAMIC_NATIVE && diff --git a/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h index ebd928a82b..0f7aa45a6e 100644 --- a/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h +++ b/ApplicationCode/ReservoirDataModel/RigEclipseCaseData.h @@ -87,7 +87,6 @@ public: bool hasFractureResults() const; void setActiveFormationNames( RigFormationNames* activeFormationNames ); - const RigFormationNames* activeFormationNames() const; const std::vector formationNames() const; RigAllanDiagramData* allanDiagramData(); @@ -130,6 +129,8 @@ private: void computeWellCellsPrGrid(); void computeActiveCellsGeometryBoundingBox(); + const RigFormationNames* activeFormationNames() const; + private: cvf::ref m_mainGrid; RimEclipseCase* m_ownerCase;