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

#2022 Curve Calculator : Make sure calculated summary case is always present

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-18 12:47:07 +02:00
parent 9d335e1163
commit 6015b99df9
4 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/RiaSummaryCurveDefinition.cpp
View File

@ -66,7 +66,7 @@ void RiaSummaryCurveDefinition::resultValues(const RiaSummaryCurveDefinition& cu
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
const std::vector<time_t>& RiaSummaryCurveDefinition::timeSteps(const RiaSummaryCurveDefinition& curveDefinition) const std::vector<time_t>& RiaSummaryCurveDefinition::timeSteps(const RiaSummaryCurveDefinition& curveDefinition)
{ {
std::vector<time_t> dummy; static std::vector<time_t> dummy;
if (!curveDefinition.summaryAddress().isValid()) return dummy; if (!curveDefinition.summaryAddress().isValid()) return dummy;
if (!curveDefinition.summaryCase()) return dummy; if (!curveDefinition.summaryCase()) return dummy;

8
ApplicationCode/ProjectDataModel/RimCalculationCollection.cpp
View File

@ -101,14 +101,6 @@ RimSummaryCase* RimCalculationCollection::calculationSummaryCase()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimCalculationCollection::deleteAllContainedObjects() void RimCalculationCollection::deleteAllContainedObjects()
{ {
RimCalculatedSummaryCase* sumCase = m_calcuationSummaryCase();
if (sumCase)
{
m_calcuationSummaryCase.removeChildObject(sumCase);
delete sumCase;
}
m_calcuations.deleteAllChildObjects(); m_calcuations.deleteAllChildObjects();
} }

7
ApplicationCode/ProjectDataModel/Summary/RimCalculatedSummaryCase.cpp
View File

@ -164,10 +164,8 @@ void RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::buildMetaData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimCalculation* RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const RimCalculation* RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::findCalculationByName(const RifEclipseSummaryAddress& resultAddress) const
{ {
if (!m_calculationCollection) return false; if (m_calculationCollection && resultAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED)
{
CVF_ASSERT(resultAddress.category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED);
QString calculatedName = QString::fromStdString(resultAddress.quantityName()); QString calculatedName = QString::fromStdString(resultAddress.quantityName());
for (RimCalculation* calc : m_calculationCollection->calculations()) for (RimCalculation* calc : m_calculationCollection->calculations())
@ -177,6 +175,7 @@ RimCalculation* RimCalculatedSummaryCase::RifCalculatedSummaryCurveReader::findC
return calc; return calc;
} }
} }
}
return nullptr; return nullptr;
} }

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

@ -159,6 +159,7 @@ RimSummaryCurve::RimSummaryCurve()
CAF_PDM_InitFieldNoDefault(&m_summaryCase, "SummaryCase", "Case", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_summaryCase, "SummaryCase", "Case", "", "", "");
m_summaryCase.uiCapability()->setUiTreeChildrenHidden(true); m_summaryCase.uiCapability()->setUiTreeChildrenHidden(true);
m_summaryCase.uiCapability()->setAutoAddingOptionFromValue(false);
CAF_PDM_InitFieldNoDefault(&m_selectedVariableDisplayField, "SelectedVariableDisplayVar", "Vector", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_selectedVariableDisplayField, "SelectedVariableDisplayVar", "Vector", "", "", "");
m_selectedVariableDisplayField.xmlCapability()->setIOWritable(false); m_selectedVariableDisplayField.xmlCapability()->setIOWritable(false);