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

#2780 Ensemble Curve Set : Use ensamble name as case name

Browse Source
This commit is contained in:
Magne Sjaastad 2018-04-27 13:36:23 +02:00
parent 67eedc0f46
commit c0777e4950
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -293,6 +293,14 @@ void RimEnsembleCurveSet::onLegendDefinitionChanged()
updateCurveColors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCaseCollection* RimEnsembleCurveSet::summaryCaseCollection() const
{
return m_yValuesSummaryGroup();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

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

@ -79,6 +79,8 @@ public:
RimRegularLegendConfig* legendConfig();
void onLegendDefinitionChanged();
RimSummaryCaseCollection* summaryCaseCollection() const;
private:
caf::PdmFieldHandle* userDescriptionField() override;
caf::PdmFieldHandle* objectToggleField();

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

@ -20,14 +20,15 @@
#include "RifEclipseSummaryAddress.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryPlotNameHelper.h"
#include "SummaryPlotCommands/RicSummaryCurveCreator.h"
#include "cafPdmUiPushButtonEditor.h"
#include "RimEnsembleCurveSet.h"
CAF_PDM_SOURCE_INIT(RimSummaryCurveAutoName, "SummaryCurveAutoName");
@ -49,7 +50,7 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
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", "", "", "");
CAF_PDM_InitField(&m_caseName, "CaseName", true, "Case/Ensemble Name", "", "", "");
// clang-format on
}
@ -81,7 +82,23 @@ QString RimSummaryCurveAutoName::curveNameY(const RifEclipseSummaryAddress& summ
appendAddressDetails(text, summaryAddress, nameHelper);
if (summaryCurve)
RimEnsembleCurveSet* ensambleCurveSet = nullptr;
this->firstAncestorOrThisOfType(ensambleCurveSet);
if (ensambleCurveSet)
{
bool skipSubString = nameHelper && nameHelper->isCaseInTitle();
if (m_caseName && !skipSubString)
{
if (ensambleCurveSet && ensambleCurveSet->summaryCaseCollection())
{
if (text.size() > 0) text += ", ";
text += ensambleCurveSet->summaryCaseCollection()->name().toStdString();
}
}
}
else if (summaryCurve)
{
bool skipSubString = nameHelper && nameHelper->isCaseInTitle();