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

#272 Rename

Browse Source
This commit is contained in:
Magne Sjaastad
2016-09-12 11:24:15 +02:00
parent 7306950d9d
commit e360c55e16
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/RimCellEdgeColors.h
View File

@@ -60,10 +60,10 @@ public:
Z, NEG_Z
};
enum ResultType
enum PropertyType
{
PREDEFINED_RESULT,
CUSTOM_RESULT
MULTI_AXIS_STATIC_PROPERTY,
ANY_SINGLE_PROPERTY
};
typedef caf::AppEnum<RimCellEdgeColors::EdgeFaceType> EdgeFaceEnum;
@@ -118,9 +118,8 @@ private:
double m_ignoredResultScalar;
bool isUsingSingleVariable() const;
static QString singleVarEdgeResultUiText() { return "Custom Edge Result"; }
caf::PdmField<caf::AppEnum< ResultType > > m_resultType;
caf::PdmField<caf::AppEnum< PropertyType > > m_propertyType;
caf::PdmChildField<RimLegendConfig*> m_legendConfig;
caf::PdmChildField<RimEclipseCellColors*> m_singleVarEdgeResultColors;