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

#2958 Ensemble curve sets. Make ensemble selected by default on 'new summary plot' command

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-05-28 13:26:56 +02:00
parent 135d58b57e
commit 278c8b672b
9 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
View File

@@ -377,7 +377,7 @@ void RiuSummaryCurveDefSelection::setFieldChangedHandler(const std::function<voi
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryCurveDefSelection::setDefaultSelection(const std::vector<RimSummaryCase*>& defaultCases)
void RiuSummaryCurveDefSelection::setDefaultSelection(const std::vector<SummarySource*>& defaultSources)
{
RimProject* proj = RiaApplication::instance()->project();
auto allSumCases = proj->allSummaryCases();
@@ -385,13 +385,16 @@ void RiuSummaryCurveDefSelection::setDefaultSelection(const std::vector<RimSumma
{
RifEclipseSummaryAddress defaultAddress = RifEclipseSummaryAddress::fieldAddress("FOPT");
std::vector<RimSummaryCase*> selectTheseCases = defaultCases;
if (selectTheseCases.empty()) selectTheseCases.push_back(allSumCases[0]);
std::vector<SummarySource*> selectTheseSources = defaultSources;
if (selectTheseSources.empty()) selectTheseSources.push_back(allSumCases[0]);
std::vector<RiaSummaryCurveDefinition> curveDefs;
for(RimSummaryCase* c : selectTheseCases)
for(SummarySource* s : selectTheseSources)
{
RiaSummaryCurveDefinition curveDef(c, defaultAddress);
RimSummaryCase* sumCase = dynamic_cast<RimSummaryCase*>(s);
RimSummaryCaseCollection* ensemble = dynamic_cast<RimSummaryCaseCollection*>(s);
RiaSummaryCurveDefinition curveDef(sumCase, defaultAddress, ensemble);
curveDefs.push_back(curveDef);
}

2
ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.h
View File

@@ -64,7 +64,7 @@ public:
void hideSummaryCases(bool hide);
void setFieldChangedHandler(const std::function<void()>& handlerFunc);
void setDefaultSelection(const std::vector<RimSummaryCase*>& defaultCases);
void setDefaultSelection(const std::vector<SummarySource*>& defaultCases);
private:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField,