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 - Adding units to fracture template and adding command feature for converting length values in ellipseFractureDefinition.

Browse Source
This commit is contained in:
astridkbjorke
2017-02-14 09:49:14 +01:00
parent 3dc836e491
commit 3023ddcd78
8 changed files with 262 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ApplicationCode/ProjectDataModel/RimFractureTemplate.cpp
View File

@@ -51,6 +51,17 @@ namespace caf
setDefault(RimFractureTemplate::INFINITE_CONDUCTIVITY);
}
template<>
void caf::AppEnum< RimFractureTemplate::FracUnitEnum>::setUp()
{
addItem(RimFractureTemplate::UNITS_METRIC, "MetricUnits", "Metric");
addItem(RimFractureTemplate::UNITS_FIELD, "FieldsUnits", "Field units");
setDefault(RimFractureTemplate::UNITS_METRIC);
}
}
@@ -64,6 +75,9 @@ 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", "", "", "");
fractureTemplateUnit.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField(&orientation, "Orientation", caf::AppEnum<FracOrientationEnum>(TRANSVERSE_WELL_PATH), "Fracture orientation", "", "", "");
CAF_PDM_InitField(&azimuthAngle, "AzimuthAngle", 0.0f, "Azimuth Angle", "", "", ""); //Is this correct description?
@@ -103,6 +117,7 @@ void RimFractureTemplate::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
//--------------------------------------------------------------------------------------------------
void RimFractureTemplate::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
if (orientation == RimFractureTemplate::ALONG_WELL_PATH
|| orientation == RimFractureTemplate::TRANSVERSE_WELL_PATH)
{