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

#1340 Use uiOrdering() instead of defineUiOrdering()

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-21 13:48:34 +01:00
parent df3ef7106d
commit 6e948e9ab5
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -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<caf::PdmOptionItemInfo> 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;

5
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
View File

@ -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:

4
ApplicationCode/ProjectDataModel/RimGridTimeHistoryCurve.cpp
View File

@ -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);