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

#4567 Summary Plot: Set quantity plot title only WOPT and WOPTH

Browse Source
This commit is contained in:
Magne Sjaastad
2019-08-16 12:54:21 +02:00
parent 0dde46e4fe
commit 7295ba8533
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,7 +70,7 @@ QString RimSummaryCurveAutoName::curveNameY(const RifEclipseSummaryAddress& summ
if (m_vectorName) if (m_vectorName)
{ {
bool skipSubString = nameHelper && nameHelper->isQuantityInTitle(); bool skipSubString = nameHelper && nameHelper->isPlotDisplayingSingleQuantity();
if (!skipSubString) if (!skipSubString)
{ {
text += summaryAddress.quantityName(); text += summaryAddress.quantityName();
@@ -132,7 +132,7 @@ QString RimSummaryCurveAutoName::curveNameX(const RifEclipseSummaryAddress& summ
if (m_vectorName) if (m_vectorName)
{ {
bool skipSubString = nameHelper && nameHelper->isQuantityInTitle(); bool skipSubString = nameHelper && nameHelper->isPlotDisplayingSingleQuantity();
if (!skipSubString) if (!skipSubString)
{ {
text += summaryAddress.quantityName(); text += summaryAddress.quantityName();

10
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.cpp
View File

@@ -152,9 +152,9 @@ QString RimSummaryPlotNameHelper::plotTitle() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimSummaryPlotNameHelper::isQuantityInTitle() const bool RimSummaryPlotNameHelper::isPlotDisplayingSingleQuantity() const
{ {
return !m_titleQuantity.empty(); return m_analyzer.quantities().size() == 1;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -236,7 +236,6 @@ void RimSummaryPlotNameHelper::extractPlotTitleSubStrings()
{ {
clearTitleSubStrings(); clearTitleSubStrings();
auto quantities = m_analyzer.quantities();
auto wellNames = m_analyzer.wellNames(); auto wellNames = m_analyzer.wellNames();
auto wellGroupNames = m_analyzer.wellGroupNames(); auto wellGroupNames = m_analyzer.wellGroupNames();
auto regions = m_analyzer.regionNumbers(); auto regions = m_analyzer.regionNumbers();
@@ -245,10 +244,7 @@ void RimSummaryPlotNameHelper::extractPlotTitleSubStrings()
if (categories.size() == 1) if (categories.size() == 1)
{ {
if (quantities.size() == 1) m_titleQuantity = m_analyzer.quantityNameForTitle();
{
m_titleQuantity = *(quantities.begin());
}
if (wellNames.size() == 1) if (wellNames.size() == 1)
{ {

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotNameHelper.h
View File

@@ -49,7 +49,7 @@ public:
QString plotTitle() const; QString plotTitle() const;
bool isQuantityInTitle() const; bool isPlotDisplayingSingleQuantity() const;
bool isWellNameInTitle() const; bool isWellNameInTitle() const;
bool isWellGroupNameInTitle() const; bool isWellGroupNameInTitle() const;
bool isRegionInTitle() const; bool isRegionInTitle() const;