diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp index 826cc094ac..77ac136618 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp @@ -394,7 +394,7 @@ QList RimFracture::calculateValueOptions(const caf::PdmF for (RimFractureTemplate* fracDef : fracDefColl->fractureDefinitions()) { - options.push_back(caf::PdmOptionItemInfo(fracDef->name(), fracDef)); + options.push_back(caf::PdmOptionItemInfo(fracDef->nameAndUnit(), fracDef)); } } else if (fieldNeedingOptions == &m_stimPlanTimeIndexToPlot) diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp index 907b8f8ee1..1edfe8c27f 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp @@ -98,6 +98,12 @@ RimFractureTemplate::RimFractureTemplate() CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", ""); CAF_PDM_InitField(&m_name, "UserDescription", QString("Fracture Template"), "Name", "", "", ""); + + CAF_PDM_InitFieldNoDefault(&m_nameAndUnit, "NameAndUnit", "NameAndUnit", "", "", ""); + m_nameAndUnit.registerGetMethod(this, &RimFractureTemplate::nameAndUnit); + m_nameAndUnit.uiCapability()->setUiHidden(true); + m_nameAndUnit.xmlCapability()->disableIO(); + CAF_PDM_InitField(&m_fractureTemplateUnit,"UnitSystem", caf::AppEnum(RiaEclipseUnitTools::UNITS_METRIC), "Units System", "", "", ""); m_fractureTemplateUnit.uiCapability()->setUiReadOnly(true); @@ -138,12 +144,14 @@ RimFractureTemplate::RimFractureTemplate() m_dFactorDisplayField.registerGetMethod(this, &RimFractureTemplate::dFactor); m_dFactorDisplayField.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleValueEditor::uiEditorTypeName()); m_dFactorDisplayField.uiCapability()->setUiReadOnly(true); + m_dFactorDisplayField.xmlCapability()->disableIO(); CAF_PDM_InitFieldNoDefault(&m_dFactorSummaryText, "dFactorSummaryText", "D Factor Summary", "", "", ""); m_dFactorSummaryText.registerGetMethod(this, &RimFractureTemplate::dFactorSummary); m_dFactorSummaryText.uiCapability()->setUiReadOnly(true); m_dFactorSummaryText.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName()); m_dFactorSummaryText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LabelPosType::TOP); + m_dFactorSummaryText.xmlCapability()->disableIO(); } //-------------------------------------------------------------------------------------------------- @@ -198,7 +206,7 @@ RiaEclipseUnitTools::UnitSystemType RimFractureTemplate::fractureTemplateUnit() //-------------------------------------------------------------------------------------------------- caf::PdmFieldHandle* RimFractureTemplate::userDescriptionField() { - return &m_name; + return &m_nameAndUnit; } //-------------------------------------------------------------------------------------------------- @@ -570,6 +578,27 @@ double RimFractureTemplate::fractureWidth() const return m_fractureWidth; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +QString RimFractureTemplate::nameAndUnit() const +{ + QString decoratedName; + + if (m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_METRIC) + { + decoratedName += "[M] - "; + } + else if (m_fractureTemplateUnit == RiaEclipseUnitTools::UNITS_FIELD) + { + decoratedName += "[F] - "; + } + + decoratedName += m_name; + + return decoratedName; +} + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h index 92aa6cd545..6c8ed18da2 100644 --- a/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h +++ b/ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h @@ -108,6 +108,8 @@ public: virtual ~RimFractureTemplate(); QString name() const; + QString nameAndUnit() const; + RiaEclipseUnitTools::UnitSystemType fractureTemplateUnit() const; FracOrientationEnum orientationType() const; float azimuthAngle() const; @@ -157,6 +159,8 @@ private: protected: caf::PdmField m_name; + caf::PdmProxyValueField m_nameAndUnit; + caf::PdmField m_fractureTemplateUnit; caf::PdmField> m_orientationType; caf::PdmField m_azimuthAngle;