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

#2917 Vector Selection Dialog: Fix missing selection text

Browse Source
This commit is contained in:
Jacob Støren
2018-05-15 14:25:53 +02:00
parent a222c096f3
commit d34e517968
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Application/RiaSummaryCurveDefinition.cpp
View File

@@ -20,6 +20,7 @@
#include "RifSummaryReaderInterface.h" #include "RifSummaryReaderInterface.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
@@ -116,7 +117,8 @@ QString RiaSummaryCurveDefinition::curveDefinitionText() const
{ {
QString caseName; QString caseName;
if (summaryCase() ) caseName = summaryCase()->caseName(); if (summaryCase() ) caseName = summaryCase()->caseName();
else if (ensemble()) caseName = ensemble()->name();
return RiaSummaryCurveDefinition::curveDefinitionText(caseName, summaryAddress()); return RiaSummaryCurveDefinition::curveDefinitionText(caseName, summaryAddress());
} }

4
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
View File

@@ -109,7 +109,7 @@ void RiuSummaryCurveDefSelectionDialog::setEnsembleAndAddress(RimSummaryCaseColl
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RiaSummaryCurveDefinition> RiuSummaryCurveDefSelectionDialog::curveSelection() const std::vector<RiaSummaryCurveDefinition> RiuSummaryCurveDefSelectionDialog::curveSelection() const
{ {
return summaryAddressSelection()->allCurveDefinitionsFromSelection(); return summaryAddressSelection()->selection();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -142,7 +142,7 @@ RiuSummaryCurveDefSelection* RiuSummaryCurveDefSelectionDialog::summaryAddressSe
void RiuSummaryCurveDefSelectionDialog::updateLabel() void RiuSummaryCurveDefSelectionDialog::updateLabel()
{ {
QString curveAddressText; QString curveAddressText;
std::vector<RiaSummaryCurveDefinition> sumCasePairs = this->summaryAddressSelection()->allCurveDefinitionsFromSelection(); std::vector<RiaSummaryCurveDefinition> sumCasePairs = this->summaryAddressSelection()->selection();
if (sumCasePairs.size() == 1) if (sumCasePairs.size() == 1)
{ {
curveAddressText = sumCasePairs.front().curveDefinitionText(); curveAddressText = sumCasePairs.front().curveDefinitionText();