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

#2509 Fracture : Add text to indicate unit of fracture template

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-19 13:54:29 +01:00
parent 8d30b6e09f
commit de3aa9f975
3 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Completions/RimFracture.cpp
View File

@ -394,7 +394,7 @@ QList<caf::PdmOptionItemInfo> 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)

31
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.cpp
View File

@ -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::UnitSystem>(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;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Completions/RimFractureTemplate.h
View File

@ -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<QString> m_name;
caf::PdmProxyValueField<QString> m_nameAndUnit;
caf::PdmField<RiaEclipseUnitTools::UnitSystemType> m_fractureTemplateUnit;
caf::PdmField<caf::AppEnum<FracOrientationEnum>> m_orientationType;
caf::PdmField<float> m_azimuthAngle;