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

#4483 Summary Plot: Fix curve names for segment/block/conmpletions

Browse Source
This commit is contained in:
Magne Sjaastad
2019-08-08 09:39:03 +02:00
parent 44ccbff9ee
commit e26cd1a896
1 changed files with 45 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@@ -217,8 +217,7 @@ void RimSummaryCurveAutoName::appendAddressDetails(std::string&
{
switch (summaryAddress.category())
{
case RifEclipseSummaryAddress::SUMMARY_AQUIFER:
{
case RifEclipseSummaryAddress::SUMMARY_AQUIFER: {
if (m_aquiferNumber)
{
if (!text.empty()) text += ":";
@@ -226,8 +225,7 @@ void RimSummaryCurveAutoName::appendAddressDetails(std::string&
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_REGION:
{
case RifEclipseSummaryAddress::SUMMARY_REGION: {
if (m_regionNumber)
{
bool skipSubString = nameHelper && nameHelper->isRegionInTitle();
@@ -239,8 +237,7 @@ void RimSummaryCurveAutoName::appendAddressDetails(std::string&
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION:
{
case RifEclipseSummaryAddress::SUMMARY_REGION_2_REGION: {
if (m_regionNumber)
{
if (!text.empty()) text += ":";
@@ -249,8 +246,7 @@ void RimSummaryCurveAutoName::appendAddressDetails(std::string&
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP:
{
case RifEclipseSummaryAddress::SUMMARY_WELL_GROUP: {
if (m_wellGroupName)
{
bool skipSubString = nameHelper && nameHelper->isWellGroupNameInTitle();
@@ -262,72 +258,85 @@ void RimSummaryCurveAutoName::appendAddressDetails(std::string&
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL:
{
case RifEclipseSummaryAddress::SUMMARY_WELL: {
appendWellName(text, summaryAddress, nameHelper);
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION:
{
case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION: {
appendWellName(text, summaryAddress, nameHelper);
if (m_completion)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
bool skipSubString = nameHelper && nameHelper->isCompletionInTitle();
if (!skipSubString)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
}
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_LGR:
{
case RifEclipseSummaryAddress::SUMMARY_WELL_LGR: {
appendLgrName(text, summaryAddress);
appendWellName(text, summaryAddress, nameHelper);
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR:
{
case RifEclipseSummaryAddress::SUMMARY_WELL_COMPLETION_LGR: {
appendLgrName(text, summaryAddress);
appendWellName(text, summaryAddress, nameHelper);
if (m_completion)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
bool skipSubString = nameHelper && nameHelper->isCompletionInTitle();
if (!skipSubString)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
}
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT:
{
case RifEclipseSummaryAddress::SUMMARY_WELL_SEGMENT: {
appendWellName(text, summaryAddress, nameHelper);
if (m_wellSegmentNumber)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.wellSegmentNumber());
bool skipSubString = nameHelper && nameHelper->isSegmentInTitle();
if (!skipSubString)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.wellSegmentNumber());
}
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_BLOCK:
{
case RifEclipseSummaryAddress::SUMMARY_BLOCK: {
if (m_completion)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
bool skipSubString = nameHelper && nameHelper->isBlockInTitle();
if (!skipSubString)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
}
}
}
break;
case RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR:
{
case RifEclipseSummaryAddress::SUMMARY_BLOCK_LGR: {
appendLgrName(text, summaryAddress);
if (m_completion)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
bool skipSubString = nameHelper && nameHelper->isBlockInTitle();
if (!skipSubString)
{
if (!text.empty()) text += ":";
text += std::to_string(summaryAddress.cellI()) + ", " + std::to_string(summaryAddress.cellJ()) + ", " +
std::to_string(summaryAddress.cellK());
}
}
}
break;