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

#2170 Summary Case: Simplified access function to all cases, remove unused function

Browse Source
This commit is contained in:
Magne Sjaastad 2017-12-01 09:34:43 +01:00
parent a2a7155d1c
commit 6103f290bf
4 changed files with 11 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryCurveCreator.cpp
View File

@ -368,10 +368,8 @@ std::set<std::string> RicSummaryCurveCreator::getAllSummaryCaseNames()
{ {
std::set<std::string> summaryCaseHashes; std::set<std::string> summaryCaseHashes;
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
std::vector<RimSummaryCase*> cases;
std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
proj->allSummaryCases(cases);
for (RimSummaryCase* rimCase : cases) for (RimSummaryCase* rimCase : cases)
{ {
summaryCaseHashes.insert(rimCase->summaryHeaderFilename().toUtf8().constData()); summaryCaseHashes.insert(rimCase->summaryHeaderFilename().toUtf8().constData());
@ -387,9 +385,8 @@ std::set<std::string> RicSummaryCurveCreator::getAllSummaryWellNames()
{ {
std::set<std::string> summaryWellNames; std::set<std::string> summaryWellNames;
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
std::vector<RimSummaryCase*> cases;
proj->allSummaryCases(cases); std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
for (RimSummaryCase* rimCase : cases) for (RimSummaryCase* rimCase : cases)
{ {
RifSummaryReaderInterface* reader = nullptr; RifSummaryReaderInterface* reader = nullptr;

23
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -547,9 +547,10 @@ void RimProject::allCases(std::vector<RimCase*>& cases)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimProject::allSummaryCases(std::vector<RimSummaryCase*>& sumCases) std::vector<RimSummaryCase*> RimProject::allSummaryCases() const
{ {
sumCases.clear(); std::vector<RimSummaryCase*> sumCases;
for (RimOilField* oilField: oilFields) for (RimOilField* oilField: oilFields)
{ {
if(!oilField) continue; if(!oilField) continue;
@ -567,24 +568,8 @@ void RimProject::allSummaryCases(std::vector<RimSummaryCase*>& sumCases)
sumCases.insert(sumCases.end(), observedData.begin(), observedData.end()); sumCases.insert(sumCases.end(), observedData.begin(), observedData.end());
} }
} }
}
//-------------------------------------------------------------------------------------------------- return sumCases;
///
//--------------------------------------------------------------------------------------------------
void RimProject::allObservedData(std::vector<RimSummaryCase*>& observedData)
{
for (RimOilField* oilField : oilFields)
{
if (!oilField) continue;
RimObservedDataCollection* observedDataCollection = oilField->observedDataCollection();
if (observedDataCollection)
{
observedData.clear();
std::vector<RimSummaryCase*> allObservedData = observedDataCollection->allObservedData();
observedData.insert(observedData.end(), allObservedData.begin(), allObservedData.end());
}
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationCode/ProjectDataModel/RimProject.h
View File

@ -100,8 +100,9 @@ public:
void assignIdToCaseGroup(RimIdenticalGridCaseGroup* caseGroup); void assignIdToCaseGroup(RimIdenticalGridCaseGroup* caseGroup);
void allCases(std::vector<RimCase*>& cases); void allCases(std::vector<RimCase*>& cases);
void allSummaryCases(std::vector<RimSummaryCase*>& sumCases);
void allObservedData(std::vector<RimSummaryCase*>& observedData); std::vector<RimSummaryCase*> allSummaryCases() const;
void allNotLinkedViews(std::vector<RimView*>& views); void allNotLinkedViews(std::vector<RimView*>& views);
void allVisibleViews(std::vector<RimView*>& views); void allVisibleViews(std::vector<RimView*>& views);

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -311,9 +311,8 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions(const caf::
fieldNeedingOptions == &m_xValuesSummaryCase) fieldNeedingOptions == &m_xValuesSummaryCase)
{ {
RimProject* proj = RiaApplication::instance()->project(); RimProject* proj = RiaApplication::instance()->project();
std::vector<RimSummaryCase*> cases;
proj->allSummaryCases(cases); std::vector<RimSummaryCase*> cases = proj->allSummaryCases();
cases.push_back(proj->calculationCollection->calculationSummaryCase()); cases.push_back(proj->calculationCollection->calculationSummaryCase());