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

#1751 #1840 Curves are connected to their case

Browse Source
This commit is contained in:
Rebecca Cox 2017-09-07 14:13:51 +02:00
parent 88d37f6e7c
commit 063542af1b
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -541,10 +541,9 @@ void RimProject::allSummaryCases(std::vector<RimSummaryCase*>& sumCases)
RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection(); RimSummaryCaseMainCollection* sumCaseMainColl = oilField->summaryCaseMainCollection();
if(sumCaseMainColl) if(sumCaseMainColl)
{ {
for (size_t scIdx = 0; scIdx < sumCaseMainColl->summaryCaseCount(); ++scIdx) sumCases.clear();
{ std::vector<RimSummaryCase*> allSummaryCases = sumCaseMainColl->allSummaryCases();
sumCases.push_back(sumCaseMainColl->summaryCase(scIdx)); sumCases.insert(sumCases.end(), allSummaryCases.begin(), allSummaryCases.end());
}
} }
} }
} }

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@ -190,20 +190,10 @@ size_t RimSummaryCaseMainCollection::summaryCaseCount()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::allSummaryCases() std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::allSummaryCases()
{ {
std::vector<RimSummaryCase*> allCases;
for (RimSummaryCaseCollection* summaryCaseCollection : m_caseCollections)
{
std::vector<RimSummaryCase*> cases;
summaryCaseCollection->descendantsIncludingThisOfType(cases);
allCases.insert(allCases.end(), cases.begin(), cases.end());
}
std::vector<RimSummaryCase*> cases; std::vector<RimSummaryCase*> cases;
this->descendantsIncludingThisOfType(cases); this->descendantsIncludingThisOfType(cases);
allCases.insert(allCases.end(), cases.begin(), cases.end());
return allCases; return cases;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------