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

#2026 Curve Calculator : Create calculated summary case once

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-20 10:04:05 +02:00
parent 84440c0ca5
commit bb4ac23c07
2 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/ProjectDataModel/RimCalculationCollection.cpp
View File

@@ -38,8 +38,7 @@ RimCalculationCollection::RimCalculationCollection()
CAF_PDM_InitFieldNoDefault(&m_calcuationSummaryCase, "CalculationsSummaryCase", "Calculations Summary Case", "", "", "");
m_calcuationSummaryCase.xmlCapability()->disableIO();
ensureSummaryCaseIsCreated();
m_calcuationSummaryCase = new RimCalculatedSummaryCase;
}
//--------------------------------------------------------------------------------------------------
@@ -52,8 +51,7 @@ RimCalculation* RimCalculationCollection::addCalculation()
m_calcuations.push_back(calculation);
ensureSummaryCaseIsCreated();
m_calcuationSummaryCase->buildMetaData();
rebuildCaseMetaData();
return calculation;
}
@@ -65,8 +63,7 @@ void RimCalculationCollection::deleteCalculation(RimCalculation* calculation)
{
m_calcuations.removeChildObject(calculation);
ensureSummaryCaseIsCreated();
m_calcuationSummaryCase->buildMetaData();
rebuildCaseMetaData();
delete calculation;
}
@@ -91,8 +88,6 @@ std::vector<RimCalculation*> RimCalculationCollection::calculations() const
//--------------------------------------------------------------------------------------------------
RimSummaryCase* RimCalculationCollection::calculationSummaryCase()
{
ensureSummaryCaseIsCreated();
return m_calcuationSummaryCase();
}
@@ -102,16 +97,23 @@ RimSummaryCase* RimCalculationCollection::calculationSummaryCase()
void RimCalculationCollection::deleteAllContainedObjects()
{
m_calcuations.deleteAllChildObjects();
rebuildCaseMetaData();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCalculationCollection::ensureSummaryCaseIsCreated()
void RimCalculationCollection::rebuildCaseMetaData()
{
if (!m_calcuationSummaryCase())
{
m_calcuationSummaryCase = new RimCalculatedSummaryCase;
}
m_calcuationSummaryCase->buildMetaData();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCalculationCollection::initAfterRead()
{
rebuildCaseMetaData();
}

3
ApplicationCode/ProjectDataModel/RimCalculationCollection.h
View File

@@ -44,9 +44,10 @@ public:
RimSummaryCase* calculationSummaryCase();
void deleteAllContainedObjects();
void rebuildCaseMetaData();
private:
void ensureSummaryCaseIsCreated();
virtual void initAfterRead() override;
private:
caf::PdmChildArrayField<RimCalculation*> m_calcuations;