#2250 Summary Curve : Support aquifer auto name

This commit is contained in:
Magne Sjaastad 2017-12-14 11:34:43 +01:00
parent d777a4a873
commit 71b7523e3c
2 changed files with 14 additions and 1 deletions

View File

@ -47,6 +47,7 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
CAF_PDM_InitField(&m_wellSegmentNumber, "WellSegmentNumber", true, "Well Segment Number", "", "", "");
CAF_PDM_InitField(&m_lgrName, "LgrName", true, "Lgr Name", "", "", "");
CAF_PDM_InitField(&m_completion, "Completion", true, "I, J, K", "", "", "");
CAF_PDM_InitField(&m_aquiferNumber, "Aquifer", true, "Aquifer Number", "", "", "");
CAF_PDM_InitField(&m_caseName, "CaseName", true, "Case Name", "", "", "");
}
@ -77,6 +78,15 @@ QString RimSummaryCurveAutoName::curveName(const RifEclipseSummaryAddress& summa
switch (summaryAddress.category())
{
case RifEclipseSummaryAddress::SUMMARY_AQUIFER:
{
if (m_aquiferNumber)
{
if (text.size() > 0) text +=":";
text += std::to_string(summaryAddress.aquiferNumber());
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_REGION:
{
if (m_regionNumber)
@ -219,6 +229,7 @@ void RimSummaryCurveAutoName::applySettings(const RimSummaryCurveAutoName& other
m_wellSegmentNumber = other.m_wellSegmentNumber;
m_lgrName = other.m_lgrName;
m_completion = other.m_completion;
m_aquiferNumber = other.m_aquiferNumber;
}
//--------------------------------------------------------------------------------------------------
@ -287,6 +298,7 @@ void RimSummaryCurveAutoName::defineUiOrdering(QString uiConfigName, caf::PdmUiO
advanced.add(&m_lgrName);
advanced.add(&m_completion);
advanced.add(&m_wellSegmentNumber);
advanced.add(&m_aquiferNumber);
advanced.add(&m_unit);
uiOrdering.skipRemainingFields();

View File

@ -56,7 +56,8 @@ private:
caf::PdmField<bool> m_wellSegmentNumber;
caf::PdmField<bool> m_lgrName;
caf::PdmField<bool> m_completion;
caf::PdmField<bool> m_aquiferNumber;
caf::PdmField<bool> m_caseName;
caf::PdmField<bool> m_showAdvancedProperties;