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

#1923 Add no-plot-update versions of update methods in curve system. onLoadDataAndUpdate is improved for summary curve but not always called with the "no update" flag set

Browse Source
This commit is contained in:
Jacob Støren
2017-09-23 08:47:04 +02:00
parent f9b26ce104
commit 0bb47cba88
38 changed files with 233 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
View File

@@ -294,7 +294,7 @@ RimSummaryCurve* RicPlotProductionRateFeature::addSummaryCurve( RimSummaryPlot*
}
RimSummaryCurve* newCurve = new RimSummaryCurve();
plot->addCurve(newCurve);
plot->addCurveAndUpdate(newCurve);
newCurve->setSummaryCase(gridSummaryCase);
newCurve->setSummaryAddress(addr);

2
ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
View File

@@ -67,7 +67,7 @@ void RicNewGridTimeHistoryCurveFeature::createCurveFromSelectionItem(const RiuSe
plot->addGridTimeHistoryCurve(newCurve);
newCurve->loadDataAndUpdate();
newCurve->loadDataAndUpdate(true);
plot->updateConnectedEditors();

4
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp
View File

@@ -70,7 +70,7 @@ void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
cvf::Color3f curveColor = RicWellLogPlotCurveFeatureImpl::curveColorFromTable(plot->curveCount());
newCurve->setColor(curveColor);
plot->addCurve(newCurve);
plot->addCurveAndUpdate(newCurve);
RimSummaryCase* defaultCase = nullptr;
if (project->activeOilField()->summaryCaseMainCollection()->summaryCaseCount() > 0)
@@ -80,7 +80,7 @@ void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
newCurve->setSummaryAddress(RifEclipseSummaryAddress::fieldVarAddress("FOPT"));
newCurve->loadDataAndUpdate();
newCurve->loadDataAndUpdate(true);
}
plot->updateConnectedEditors();

2
ApplicationCode/Commands/SummaryPlotCommands/RicPasteAsciiDataCurveFeature.cpp
View File

@@ -90,7 +90,7 @@ void RicPasteAsciiDataCurveFeature::onActionTriggered(bool isChecked)
newObject->initAfterReadRecursively();
newObject->loadDataAndUpdate();
newObject->loadDataAndUpdate(true);
newObject->updateConnectedEditors();
summaryPlot->updateConnectedEditors();

4
ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryCurveFeature.cpp
View File

@@ -74,7 +74,7 @@ void RicPasteSummaryCurveFeature::onActionTriggered(bool isChecked)
RimSummaryCurve* newObject = dynamic_cast<RimSummaryCurve*>(sourceObjects[i]->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(newObject);
summaryPlot->addCurve(newObject);
summaryPlot->addCurveAndUpdate(newObject);
// Resolve references after object has been inserted into the project data model
newObject->resolveReferencesRecursively();
@@ -85,7 +85,7 @@ void RicPasteSummaryCurveFeature::onActionTriggered(bool isChecked)
newObject->initAfterReadRecursively();
newObject->loadDataAndUpdate();
newObject->loadDataAndUpdate(true);
newObject->updateConnectedEditors();
summaryPlot->updateConnectedEditors();

2
ApplicationCode/Commands/SummaryPlotCommands/RicPasteTimeHistoryCurveFeature.cpp
View File

@@ -90,7 +90,7 @@ void RicPasteTimeHistoryCurveFeature::onActionTriggered(bool isChecked)
newObject->initAfterReadRecursively();
newObject->loadDataAndUpdate();
newObject->loadDataAndUpdate(true);
newObject->updateConnectedEditors();
summaryPlot->updateConnectedEditors();

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

@@ -51,6 +51,7 @@
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurveAutoName.h"
#include "cafPdmUiComboBoxEditor.h"
#include "RiuSummaryQwtPlot.h"
CAF_PDM_SOURCE_INIT(RicSummaryCurveCreator, "RicSummaryCurveCreator");
@@ -934,7 +935,7 @@ void RicSummaryCurveCreator::updatePreviewCurvesFromCurveDefinitions(const std::
curve->setSummaryCase(currentCase);
curve->setSummaryAddress(curveDef.second);
curve->applyCurveAutoNameSettings(*m_curveNameConfig());
m_previewPlot->addCurve(curve);
m_previewPlot->addCurveNoUpdate(curve);
curveLookCalc.setupCurveLook(curve);
}
@@ -1141,9 +1142,12 @@ void RicSummaryCurveCreator::copyCurveAndAddToPlot(const RimSummaryCurve *curve,
RimSummaryCurve* curveCopy = dynamic_cast<RimSummaryCurve*>(curve->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(curveCopy);
if (forceVisible)
if (forceVisible)
{
curveCopy->setCurveVisiblity(true);
plot->addCurve(curveCopy);
}
plot->addCurveNoUpdate(curveCopy);
// Resolve references after object has been inserted into the project data model
curveCopy->resolveReferencesRecursively();
@@ -1151,7 +1155,7 @@ void RicSummaryCurveCreator::copyCurveAndAddToPlot(const RimSummaryCurve *curve,
// The curve creator is not a descendant of the project, and need to be set manually
curveCopy->setSummaryCase(curve->summaryCase());
curveCopy->initAfterReadRecursively();
curveCopy->loadDataAndUpdate();
curveCopy->loadDataAndUpdate(true);
}
//--------------------------------------------------------------------------------------------------
@@ -1306,6 +1310,8 @@ void RicSummaryCurveCreator::updateCurveNames()
for (RimSummaryCurve* curve : m_previewPlot->summaryCurves())
{
curve->applyCurveAutoNameSettings(*m_curveNameConfig());
curve->updateCurveName();
curve->updateCurveNameNoLegendUpdate();
}
if (m_previewPlot && m_previewPlot->qwtPlot()) m_previewPlot->qwtPlot()->updateLegend();
}

2
ApplicationCode/Commands/WellLogCommands/RicAddWellLogToPlotFeature.cpp
View File

@@ -100,7 +100,7 @@ void RicAddWellLogToPlotFeature::onActionTriggered(bool isChecked)
curve->setWellPath(wellPath);
curve->setWellLogChannelName(wellLog->name());
curve->loadDataAndUpdate();
curve->loadDataAndUpdate(true);
}
}

2
ApplicationCode/Commands/WellLogCommands/RicChangeDataSourceFeature.cpp
View File

@@ -67,7 +67,7 @@ void RicChangeDataSourceFeature::onActionTriggered(bool isChecked)
extractionCurve->setWellPath(featureUi.wellPathToApply);
extractionCurve->setCase(featureUi.caseToApply);
extractionCurve->loadDataAndUpdate();
extractionCurve->loadDataAndUpdate(true);
}
}
}

2
ApplicationCode/Commands/WellLogCommands/RicNewWellLogCurveExtractionFeature.cpp
View File

@@ -79,7 +79,7 @@ void RicNewWellLogCurveExtractionFeature::onActionTriggered(bool isChecked)
RimWellLogTrack* wellLogPlotTrack = RicNewWellLogPlotFeatureImpl::createWellLogPlotTrack();
RimWellLogExtractionCurve* plotCurve = addCurve(wellLogPlotTrack, RiaApplication::instance()->activeReservoirView(), wellPath, simWell, branchIndex);
plotCurve->loadDataAndUpdate();
plotCurve->loadDataAndUpdate(true);
RimWellLogPlot* plot = NULL;
wellLogPlotTrack->firstAncestorOrThisOfType(plot);

2
ApplicationCode/Commands/WellLogCommands/RicNewWellLogFileCurveFeature.cpp
View File

@@ -174,7 +174,7 @@ void RicNewWellLogFileCurveFeature::addWellLogChannelsToPlotTrack(RimWellLogTrac
{
plotCurve->setWellPath(wellPath);
plotCurve->setWellLogChannelName(wellLogFileChannels[cIdx]->name());
plotCurve->loadDataAndUpdate();
plotCurve->loadDataAndUpdate(true);
plotCurve->updateConnectedEditors();
}
}

4
ApplicationCode/Commands/WellLogCommands/RicPasteWellLogCurveFeature.cpp
View File

@@ -88,7 +88,7 @@ void RicPasteWellLogCurveFeature::onActionTriggered(bool isChecked)
newObject->resolveReferencesRecursively();
newObject->initAfterReadRecursively();
newObject->loadDataAndUpdate();
newObject->loadDataAndUpdate(true);
wellLogTrack->updateConnectedEditors();
}
@@ -105,7 +105,7 @@ void RicPasteWellLogCurveFeature::onActionTriggered(bool isChecked)
newObject->resolveReferencesRecursively();
newObject->initAfterReadRecursively();
newObject->loadDataAndUpdate();
newObject->loadDataAndUpdate(true);
wellLogTrack->updateConnectedEditors();
}