diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp index 89b22891d1..2949ccd5d1 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp @@ -33,10 +33,10 @@ #include "RimEclipseResultCase.h" #include "RimEclipseView.h" #include "RimFlowDiagSolution.h" +#include "RimPlotCurve.h" #include "RimReservoirCellResultsStorage.h" #include "RimView.h" #include "RimViewLinker.h" -#include "RimWellLogCurve.h" #include "cafPdmUiListEditor.h" @@ -242,7 +242,7 @@ void RimEclipseResultDefinition::updateAnyFieldHasChanged() cellColors->updateConnectedEditors(); } - RimWellLogCurve* curve = nullptr; + RimPlotCurve* curve = nullptr; this->firstAncestorOrThisOfType(curve); if (curve) { @@ -339,7 +339,7 @@ void RimEclipseResultDefinition::loadDataAndUpdate() } } - RimWellLogCurve* curve = nullptr; + RimPlotCurve* curve = nullptr; this->firstAncestorOrThisOfType(curve); if (curve) { @@ -521,7 +521,7 @@ QList RimEclipseResultDefinition::calcOptionsForVariable // Remove Per Cell Face options { - RimWellLogCurve* curve = nullptr; + RimPlotCurve* curve = nullptr; this->firstAncestorOrThisOfType(curve); RimEclipsePropertyFilter* propFilter = nullptr; diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index e3b5267810..85d18b26d1 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -93,13 +93,15 @@ public: void setTofAndSelectTracer(const QString& tracerName); + // Public function to allow use from objects having a result definition as child field + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; + protected: virtual void updateLegendCategorySettings() {}; virtual QList calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly); virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); virtual void initAfterRead(); - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; protected: caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultType;