#1986 Flooded PV: Add function isFlowDiagOrInjectionFlooding and replace

This commit is contained in:
Unknown
2017-10-18 12:54:46 +02:00
committed by Rebecca Cox
parent d9170e064b
commit 314bb71ea4
5 changed files with 23 additions and 10 deletions
@@ -252,7 +252,7 @@ void RimEclipsePropertyFilter::updateReadOnlyStateOfAllFields()
//--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilter::updateRangeLabel()
{
if (resultDefinition->resultType() == RiaDefines::FLOW_DIAGNOSTICS || resultDefinition->resultType() == RiaDefines::INJECTION_FLOODING)
if (resultDefinition->isFlowDiagOrInjectionFlooding())
{
m_rangeLabelText = "Current Timestep";
}
@@ -348,7 +348,7 @@ void RimEclipsePropertyFilter::computeResultValueRange()
clearCategories();
if (resultDefinition->resultType() == RiaDefines::FLOW_DIAGNOSTICS || resultDefinition->resultType() == RiaDefines::INJECTION_FLOODING)
if (resultDefinition->isFlowDiagOrInjectionFlooding())
{
RimView* view;
this->firstAncestorOrThisOfType(view);
@@ -423,7 +423,7 @@ void RimEclipsePropertyFilter::updateFromCurrentTimeStep()
//
// If the user manually has set a filter value, this value is left untouched
if (resultDefinition->resultType() != RiaDefines::FLOW_DIAGNOSTICS && resultDefinition->resultType() != RiaDefines::INJECTION_FLOODING)
if (!resultDefinition->isFlowDiagOrInjectionFlooding())
{
return;
}