OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-13 17:02:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2917 Vector Selection Dialog: Fixed problem with dialog initialization when single selecting ensemble curve sets.

Browse Source
This commit is contained in:
Jacob Støren committed 2018-05-15 14:26:28 +02:00
1 parent 9b591f622c
commit 6c6e7df3c9
5 files changed
+21 -21
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
+5 -5
View File
@@ -368,8 +368,9 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions(const std::vector<
for (const auto& curveDef : curveDefinitions)
{
if (!(curveDef.summaryCase() || curveDef.isEnsembleCurve()) ) continue;
RimSummaryCase* summaryCase = curveDef.summaryCase();
if (!summaryCase) continue;
RifEclipseSummaryAddress summaryAddress = curveDef.summaryAddress();
if (summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_INVALID)
@@ -393,13 +394,12 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions(const std::vector<
}
// Select case if not already selected
if (std::find(m_selectedSources.begin(), m_selectedSources.end(),
curveDef.isEnsembleCurve() ? (SummarySource*)curveDef.ensemble() : summaryCase) == m_selectedSources.end())
SummarySource* summSource = curveDef.isEnsembleCurve() ? static_cast<SummarySource*>(curveDef.ensemble()) : summaryCase;
if (std::find(m_selectedSources.begin(), m_selectedSources.end(), summSource) == m_selectedSources.end())
{
if (summaryCase != calculatedSummaryCase())
{
m_selectedSources.push_back(curveDef.isEnsembleCurve() ? (SummarySource*)curveDef.ensemble() : summaryCase);
m_selectedSources.push_back(summSource);
}
}
ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
+1 -4
View File
@@ -96,10 +96,7 @@ void RiuSummaryCurveDefSelectionDialog::setEnsembleAndAddress(RimSummaryCaseColl
if (ensemble)
{
std::vector<RiaSummaryCurveDefinition> curveDefs;
for (const auto& summaryCase : ensemble->allSummaryCases())
{
curveDefs.push_back(RiaSummaryCurveDefinition(summaryCase, address, ensemble));
}
curveDefs.push_back(RiaSummaryCurveDefinition(nullptr, address, ensemble));
summaryAddressSelection()->setSelectedCurveDefinitions(curveDefs);
}