diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 5ae56321f5..c68ab84ec4 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -782,12 +782,10 @@ QString RimEclipseResultDefinition::resultVariableUiName() const if (m_isTimeLapseResult() && resultType() == RiaDefines::DYNAMIC_NATIVE) { - return m_resultVariable() + "_D" + QString::number(m_timeLapseBaseTimestep()); - } - else - { - return m_resultVariable(); + return timeDiffResultName(m_resultVariable(), m_timeLapseBaseTimestep()); } + + return m_resultVariable(); } //-------------------------------------------------------------------------------------------------- @@ -802,12 +800,10 @@ QString RimEclipseResultDefinition::resultVariableUiShortName() const if (m_isTimeLapseResult() && resultType() == RiaDefines::DYNAMIC_NATIVE) { - return m_resultVariable() + "_D" + QString::number(m_timeLapseBaseTimestep()); - } - else - { - return m_resultVariable(); + return timeDiffResultName(m_resultVariable(), m_timeLapseBaseTimestep()); } + + return m_resultVariable(); } //-------------------------------------------------------------------------------------------------- @@ -1314,19 +1310,26 @@ QString RimEclipseResultDefinition::flowDiagResUiText(bool shortLabel, int maxTr return uiText; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimEclipseResultDefinition::timeDiffResultName(const QString& resultName, int timeStepIndex) +{ + return resultName + "_dt_" + QString::number(timeStepIndex); +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- QString RimEclipseResultDefinition::convertToTimeDiffUiVarName(const QString& resultName) { - if (m_isTimeLapseResultUiField() && m_resultTypeUiField() == RiaDefines::DYNAMIC_NATIVE) + if (m_isTimeLapseResultUiField() && + (m_resultTypeUiField() == RiaDefines::DYNAMIC_NATIVE || m_resultTypeUiField() == RiaDefines::GENERATED)) { - return resultName + "_D" + QString::number(m_timeLapseBaseTimestepUiField()); - } - else - { - return resultName; + return timeDiffResultName(resultName, m_timeLapseBaseTimestepUiField()); } + + return resultName; } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index 7db51b95f4..f3ce9c9152 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -178,6 +178,7 @@ private: bool hasDualPorFractureResult(); QString flowDiagResUiText(bool shortLabel, int maxTracerStringLength = std::numeric_limits::max()) const; + static QString timeDiffResultName(const QString& resultName, int timeStepIndex); QString convertToTimeDiffUiVarName(const QString& resultName); QList calcOptionsForVariableUiFieldStandard();