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

#1087 - pre-proto - Moving enum for unit system to RimDefines, and establishing default unit system for fracture template collection (used when creating new templates).

Browse Source
This commit is contained in:
astridkbjorke
2017-02-16 15:22:03 +01:00
parent 86bd033fa8
commit fa638243ab
10 changed files with 42 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimFractureTemplate.cpp
View File

@@ -32,7 +32,6 @@
namespace caf
{
template<>
void caf::AppEnum< RimFractureTemplate::FracOrientationEnum>::setUp()
{
addItem(RimFractureTemplate::AZIMUTH, "Az", "Azimuth");
@@ -43,7 +42,6 @@ namespace caf
}
template<>
void caf::AppEnum< RimFractureTemplate::FracConductivityEnum>::setUp()
{
addItem(RimFractureTemplate::INFINITE_CONDUCTIVITY, "InfiniteConductivity", "Infinite conductivity in fracture");
@@ -53,15 +51,6 @@ namespace caf
}
template<>
void caf::AppEnum< RimFractureTemplate::FracUnitEnum>::setUp()
{
addItem(RimFractureTemplate::UNITS_METRIC, "MetricUnits", "Metric");
addItem(RimFractureTemplate::UNITS_FIELD, "FieldsUnits", "Field units");
setDefault(RimFractureTemplate::UNITS_METRIC);
}
}
@@ -75,7 +64,7 @@ RimFractureTemplate::RimFractureTemplate(void)
CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
CAF_PDM_InitField(&name, "UserDescription", QString("Fracture Template"), "Name", "", "", "");
CAF_PDM_InitField(&fractureTemplateUnit, "fractureTemplateUnit", caf::AppEnum<FracUnitEnum>(UNITS_METRIC), "Units used in frac template", "", "", "");
CAF_PDM_InitField(&fractureTemplateUnit, "fractureTemplateUnit", caf::AppEnum<RimDefines::UnitSystem>(RimDefines::UNITS_METRIC), "Units used in frac template", "", "", "");
fractureTemplateUnit.uiCapability()->setUiReadOnly(true);