From d34e517968c51af3169f04558d9d30d6d5f6cd44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 15 May 2018 14:25:53 +0200 Subject: [PATCH] #2917 Vector Selection Dialog: Fix missing selection text --- ApplicationCode/Application/RiaSummaryCurveDefinition.cpp | 4 +++- .../UserInterface/RiuSummaryCurveDefSelectionDialog.cpp | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp b/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp index 93d26a97a9..4ebc23a301 100644 --- a/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp +++ b/ApplicationCode/Application/RiaSummaryCurveDefinition.cpp @@ -20,6 +20,7 @@ #include "RifSummaryReaderInterface.h" #include "RimSummaryCase.h" +#include "RimSummaryCaseCollection.h" //-------------------------------------------------------------------------------------------------- /// @@ -116,7 +117,8 @@ QString RiaSummaryCurveDefinition::curveDefinitionText() const { QString caseName; if (summaryCase() ) caseName = summaryCase()->caseName(); - + else if (ensemble()) caseName = ensemble()->name(); + return RiaSummaryCurveDefinition::curveDefinitionText(caseName, summaryAddress()); } diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp index 4a89a98beb..d12beebecc 100644 --- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp +++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp @@ -109,7 +109,7 @@ void RiuSummaryCurveDefSelectionDialog::setEnsembleAndAddress(RimSummaryCaseColl //-------------------------------------------------------------------------------------------------- std::vector RiuSummaryCurveDefSelectionDialog::curveSelection() const { - return summaryAddressSelection()->allCurveDefinitionsFromSelection(); + return summaryAddressSelection()->selection(); } //-------------------------------------------------------------------------------------------------- @@ -142,7 +142,7 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionDialog::summaryAddressSe void RiuSummaryCurveDefSelectionDialog::updateLabel() { QString curveAddressText; - std::vector sumCasePairs = this->summaryAddressSelection()->allCurveDefinitionsFromSelection(); + std::vector sumCasePairs = this->summaryAddressSelection()->selection(); if (sumCasePairs.size() == 1) { curveAddressText = sumCasePairs.front().curveDefinitionText();