From 565e5b04183bbb2c1548404d2332dd5361c18cb5 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Fri, 6 Sep 2019 11:08:45 +0200 Subject: [PATCH] RFT/PLT/WAP: Calculate value options for fields inherited from WellLogPlot --- .../ProjectDataModel/Flow/RimWellAllocationPlot.cpp | 2 +- ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp | 3 ++- ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp index 80ac94e0f0..641fe501e8 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellAllocationPlot.cpp @@ -536,7 +536,7 @@ int RimWellAllocationPlot::timeStep() //-------------------------------------------------------------------------------------------------- QList RimWellAllocationPlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { - QList options; + QList options = RimWellLogPlot::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); if (fieldNeedingOptions == &m_wellName) { diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp index 22d322c342..661d4ff217 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellPltPlot.cpp @@ -768,7 +768,8 @@ const char* RimWellPltPlot::plotNameFormatString() QList RimWellPltPlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { - QList options; + QList options = RimWellLogPlot::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); + const QString simWellName = RimWellPlotTools::simWellName(m_wellPathName); if (fieldNeedingOptions == &m_wellPathName) diff --git a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp index 33415a85c6..22af489755 100644 --- a/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp @@ -615,7 +615,7 @@ void RimWellRftPlot::deleteCurvesAssosicatedWithObservedData(const RimObservedFm QList RimWellRftPlot::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) { - QList options; + QList options = RimWellLogPlot::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); const QString simWellName = associatedSimWellName();