diff --git a/ApplicationLibCode/Application/RiaResultNames.cpp b/ApplicationLibCode/Application/RiaResultNames.cpp index 19f326073f..0d44f2c3ed 100644 --- a/ApplicationLibCode/Application/RiaResultNames.cpp +++ b/ApplicationLibCode/Application/RiaResultNames.cpp @@ -71,6 +71,19 @@ bool RiaResultNames::isPerCellFaceResult( const QString& resultName ) return false; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +bool RiaResultNames::isLogarithmicResult( const QString& resultName ) +{ + QStringList subStringsToMatch{ "TRAN", "MULT", "PERM" }; + + for ( const auto& s : subStringsToMatch ) + if ( resultName.contains( s, Qt::CaseInsensitive ) ) return true; + + return false; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationLibCode/Application/RiaResultNames.h b/ApplicationLibCode/Application/RiaResultNames.h index eb3e3edbee..f0b32033df 100644 --- a/ApplicationLibCode/Application/RiaResultNames.h +++ b/ApplicationLibCode/Application/RiaResultNames.h @@ -27,6 +27,7 @@ namespace RiaResultNames { bool isPerCellFaceResult( const QString& resultName ); +bool isLogarithmicResult( const QString& resultName ); QString undefinedResultName(); QString undefinedGridFaultName(); diff --git a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp index fecad87c71..d35c76ad49 100644 --- a/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -20,6 +20,8 @@ #include "RimEclipseCellColors.h" +#include "RiaResultNames.h" + #include "RicfCommandObject.h" #include "RigCaseCellResultsData.h" #include "RigEclipseCaseData.h" @@ -184,19 +186,7 @@ RimRegularLegendConfig* RimEclipseCellColors::createLegendForResult( const QStri bool useDiscreteLogLevels, bool isCategoryResult ) { - bool useLog = false; - { - QStringList subStringsToMatch{ "TRAN", "MULT", "PERM" }; - - for ( const auto& s : subStringsToMatch ) - { - if ( resultName.contains( s, Qt::CaseInsensitive ) ) - { - useLog = true; - break; - } - } - } + bool useLog = RiaResultNames::isLogarithmicResult( resultName ); RimRegularLegendConfig::ColorRangesType colorRangeType = RimRegularLegendConfig::ColorRangesType::UNDEFINED; if ( isCategoryResult ) diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp index da080f5d5b..01c3cc70a1 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimEnsembleWellLogCurveSet.cpp @@ -21,6 +21,7 @@ #include "RiaColorTools.h" #include "RiaLogging.h" #include "RiaOptionItemFactory.h" +#include "RiaResultNames.h" #include "RimEnsembleCurveFilter.h" #include "RimEnsembleCurveFilterCollection.h" @@ -831,7 +832,7 @@ void RimEnsembleWellLogCurveSet::updateEnsembleCurves( const std::vectorfirstAncestorOrThisOfType( track ); diff --git a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp index 9e043dd2c5..d8884a501d 100644 --- a/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/WellLog/RimWellLogExtractionCurve.cpp @@ -21,6 +21,7 @@ #include "RiaColorTables.h" #include "RiaLogging.h" +#include "RiaResultNames.h" #include "RiaSimWellBranchTools.h" #include "RiaWellLogUnitTools.h" @@ -829,18 +830,11 @@ void RimWellLogExtractionCurve::defineUiTreeOrdering( caf::PdmUiTreeOrdering& ui void RimWellLogExtractionCurve::setLogScaleFromSelectedResult() { QString resVar = m_eclipseResultDefinition->resultVariable(); - - if ( resVar.toUpper().contains( "PERM" ) ) + if ( RiaResultNames::isLogarithmicResult( resVar ) ) { RimWellLogTrack* track = nullptr; this->firstAncestorOrThisOfType( track ); - if ( track ) - { - if ( track->curveCount() == 1 ) - { - track->setLogarithmicScale( true ); - } - } + if ( track && track->curveCount() == 1 ) track->setLogarithmicScale( true ); } }