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 : Update calculated curves and plots

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-20 10:20:53 +02:00
parent bb4ac23c07
commit 167f56f95a
5 changed files with 75 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ApplicationCode/ProjectDataModel/RimCalculation.cpp
View File

@@ -22,14 +22,18 @@
#include "RiaLogging.h"
#include "RiaSummaryCurveDefinition.h"
#include "RiaSummaryTools.h"
#include "RimCalculationCollection.h"
#include "RimCalculationVariable.h"
#include "RimProject.h"
#include "RimSummaryCurve.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "cafPdmUiTextEditor.h"
#include <algorithm>
#include <numeric>
CAF_PDM_SOURCE_INIT(RimCalculation, "RimCalculation");
@@ -166,7 +170,7 @@ bool RimCalculation::parseExpression()
}
}
this->updateConnectedEditors();
m_description = buildCalculationName();
return true;
}
@@ -176,8 +180,6 @@ bool RimCalculation::parseExpression()
//--------------------------------------------------------------------------------------------------
bool RimCalculation::calculate()
{
if (!parseExpression()) return false;
QString leftHandSideVariableName = RimCalculation::findLeftHandSide(m_expression);
ExpressionParser parser;
@@ -333,13 +335,35 @@ QString RimCalculation::buildCalculationName() const
}
return name;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCalculation::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
void RimCalculation::updateDependentCurvesAndPlots()
{
m_description = buildCalculationName();
RimCalculationCollection* calcColl = nullptr;
this->firstAncestorOrThisOfTypeAsserted(calcColl);
calcColl->rebuildCaseMetaData();
RimSummaryPlotCollection* summaryPlotCollection = RiaSummaryTools::summaryPlotCollection();
for (RimSummaryPlot* sumPlot : summaryPlotCollection->summaryPlots())
{
bool plotContainsCalculatedCurves = false;
for (RimSummaryCurve* sumCurve : sumPlot->summaryCurves())
{
if (sumCurve->summaryAddress().category() == RifEclipseSummaryAddress::SUMMARY_CALCULATED)
{
sumCurve->updateConnectedEditors();
plotContainsCalculatedCurves = true;
}
}
if (plotContainsCalculatedCurves)
{
sumPlot->loadDataAndUpdate();
}
}
}