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

#4029 3D calculations : Hide ternary and completion type from diff variables

Browse Source
This commit is contained in:
Magne Sjaastad 2019-02-08 14:03:54 +01:00
parent 3cd14df5b6
commit 06feb039fc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -52,7 +52,6 @@
#include "cafPdmUiTreeSelectionEditor.h"
#include "cafUtils.h"
namespace caf
{
template<>
@ -1346,7 +1345,11 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calcOptionsForVariable
foreach (QString s, getResultNamesForCurrentUiResultType())
{
if (s == RiaDefines::completionTypeResultName() && results->timeStepDates().empty()) continue;
if (s == RiaDefines::completionTypeResultName())
{
if (m_isTimeLapseResultUiField()) continue;
if (results->timeStepDates().empty()) continue;
}
if (RiaDefines::isPerCellFaceResult(s))
{
@ -1376,7 +1379,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calcOptionsForVariable
else if (cellCenterResultNames.contains("SWAT"))
hasAtLeastOneTernaryComponent = true;
if (m_resultTypeUiField == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent)
if (!m_isTimeLapseResultUiField() && m_resultTypeUiField == RiaDefines::DYNAMIC_NATIVE && hasAtLeastOneTernaryComponent)
{
optionList.push_front(
caf::PdmOptionItemInfo(RiaDefines::ternarySaturationResultName(), RiaDefines::ternarySaturationResultName()));