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

#4709 Summary Plot Editor : Avoid default selection of field vectors

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-13 19:16:06 +02:00
parent d212201a3a
commit 8e3e16c7e6
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
View File

@@ -579,7 +579,7 @@ void RiuSummaryCurveDefSelection::setDefaultSelection( const std::vector<Summary
if ( allSumCases.size() > 0 )
{
RifEclipseSummaryAddress defaultAddress = RifEclipseSummaryAddress::fieldAddress( "FOPT" );
RifEclipseSummaryAddress defaultAddress;
std::vector<SummarySource*> selectTheseSources = defaultSources;
if ( selectTheseSources.empty() ) selectTheseSources.push_back( allSumCases[0] );
@@ -612,11 +612,6 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions( const std::vector
RimSummaryCase* summaryCase = curveDef.summaryCase();
RifEclipseSummaryAddress summaryAddress = curveDef.summaryAddress();
if ( summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_INVALID )
{
// If we have an invalid address, set the default address to Field
summaryAddress = RifEclipseSummaryAddress::fieldAddress( summaryAddress.quantityName() );
}
// Ignore ensemble statistics curves
if ( summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_ENSEMBLE_STATISTICS ) continue;
@@ -627,7 +622,15 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions( const std::vector
if ( std::find( selectedCategories.begin(), selectedCategories.end(), summaryAddress.category() ) ==
selectedCategories.end() )
{
m_selectedSummaryCategories.v().push_back( summaryAddress.category() );
if ( summaryAddress.category() != RifEclipseSummaryAddress::SUMMARY_INVALID )
{
m_selectedSummaryCategories.v().push_back( summaryAddress.category() );
}
else
{
// Use field category as fall back category to avoid an empty list of vectors
summaryAddress = RifEclipseSummaryAddress::fieldAddress( "" );
}
}
// Select case if not already selected