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

Convert to enum class

Browse Source
This commit is contained in:
Magne Sjaastad
2020-04-23 23:25:22 +02:00
parent 8aa36ee31e
commit 3f88fe197a
56 changed files with 696 additions and 542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -1346,7 +1346,8 @@ void RimEclipseView::onUpdateLegends()
if ( this->cellEdgeResult()->hasCategoryResult() )
{
if ( cellEdgeResult()->singleVarEdgeResultColors()->resultType() != RiaDefines::FORMATION_NAMES )
if ( cellEdgeResult()->singleVarEdgeResultColors()->resultType() !=
RiaDefines::ResultCatType::FORMATION_NAMES )
{
cellEdgeResult()->legendConfig()->setIntegerCategories( results->uniqueCellScalarValues(
cellEdgeResult()->singleVarEdgeResultColors()->eclipseResultAddress() ) );
@@ -2249,9 +2250,10 @@ void RimEclipseView::defineAxisLabels( cvf::String* xLabel, cvf::String* yLabel,
//--------------------------------------------------------------------------------------------------
bool RimEclipseView::isUsingFormationNames() const
{
if ( cellResult()->resultType() == RiaDefines::FORMATION_NAMES ) return true;
if ( cellResult()->resultType() == RiaDefines::ResultCatType::FORMATION_NAMES ) return true;
if ( faultResultSettings()->customFaultResult()->resultType() == RiaDefines::ALLEN_DIAGRAMS ) return true;
if ( faultResultSettings()->customFaultResult()->resultType() == RiaDefines::ResultCatType::ALLEN_DIAGRAMS )
return true;
return eclipsePropertyFilterCollection()->isUsingFormationNames();
}