diff --git a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h index 85d18b26d1..0f9df36fac 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h @@ -93,8 +93,6 @@ 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() {}; @@ -102,6 +100,7 @@ protected: 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; diff --git a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h index 83c2e19df3..428406fe06 100644 --- a/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h +++ b/ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h @@ -61,12 +61,9 @@ public: bool hasCategoryResult() { return m_resultPositionType() == RIG_FORMATION_NAMES; } - virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; - protected: virtual void updateLegendCategorySettings() {}; - - + virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; private: diff --git a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp index b951894592..101e623b88 100644 --- a/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp @@ -423,13 +423,13 @@ void RimGridTimeHistoryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiO if (eclipseTopologyItem()) { CVF_ASSERT(m_eclipseResultDefinition()); - m_eclipseResultDefinition->defineUiOrdering(uiConfigName, *group1); + m_eclipseResultDefinition->uiOrdering(uiConfigName, *group1); } if (geoMechTopologyItem()) { CVF_ASSERT(m_geoMechResultDefinition()); - m_geoMechResultDefinition->defineUiOrdering(uiConfigName, *group1); + m_geoMechResultDefinition->uiOrdering(uiConfigName, *group1); } uiOrdering.add(&m_plotAxis);