Merged from maintenance branch

This commit is contained in:
Magne Sjaastad
2016-08-05 12:13:13 +02:00
27 changed files with 524 additions and 54 deletions

View File

@@ -424,6 +424,16 @@ bool RimEclipseResultDefinition::isTernarySaturationSelected() const
return isTernary;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimEclipseResultDefinition::hasCategoryResult() const
{
if (!this->hasStaticResult()) return false;
return this->resultVariable().contains("NUM", Qt::CaseInsensitive);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------