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

#6479 Update analysis and correlation plots when closing derived cases

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-09-11 13:55:04 +02:00
parent 81b2bd1720
commit b4aaaa98e9
22 changed files with 269 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ void RicNewDerivedEnsembleFeature::onActionTriggered( bool isChecked )
if ( ensembles.size() == 2 )
{
newEnsemble->setEnsemble2( ensembles[1] );
newEnsemble->updateDerivedEnsembleCases();
newEnsemble->createDerivedEnsembleCases();
if ( newEnsemble->allSummaryCases().empty() )
{

14
ApplicationCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@@ -355,8 +355,10 @@ void RicSummaryPlotEditorUi::syncPreviewCurvesFromUiSelection()
for ( const auto& curve : currentCurvesInPreviewPlot )
{
RimSummaryCase* sumCase = curve->summaryCaseY();
currentCurveDefs.insert(
RiaSummaryCurveDefinition( sumCase, curve->summaryAddressY(), sumCase ? sumCase->ensemble() : nullptr ) );
currentCurveDefs.insert( RiaSummaryCurveDefinition( sumCase,
curve->summaryAddressY(),
sumCase ? sumCase->ensemble() : nullptr,
sumCase && sumCase->ensemble() ) );
}
{
@@ -373,7 +375,8 @@ void RicSummaryPlotEditorUi::syncPreviewCurvesFromUiSelection()
RimSummaryCase* sumCase = curve->summaryCaseY();
if ( sumCase && sumCase->ensemble() ) continue;
RiaSummaryCurveDefinition curveDef = RiaSummaryCurveDefinition( sumCase, curve->summaryAddressY() );
RiaSummaryCurveDefinition curveDef =
RiaSummaryCurveDefinition( sumCase, curve->summaryAddressY(), nullptr, false );
if ( deleteCurveDefs.count( curveDef ) > 0 ) curvesToDelete.insert( curve );
}
}
@@ -594,7 +597,7 @@ void RicSummaryPlotEditorUi::populateCurveCreator( const RimSummaryPlot& sourceS
for ( const auto& curve : sourceSummaryPlot.summaryCurves() )
{
curveDefs.push_back( RiaSummaryCurveDefinition( curve->summaryCaseY(), curve->summaryAddressY() ) );
curveDefs.push_back( RiaSummaryCurveDefinition( curve->summaryCaseY(), curve->summaryAddressY(), nullptr, false ) );
// Copy curve object to the preview plot
copyCurveAndAddToPlot( curve, m_previewPlot.get(), true );
@@ -610,7 +613,8 @@ void RicSummaryPlotEditorUi::populateCurveCreator( const RimSummaryPlot& sourceS
RimSummaryCaseCollection* ensemble = curveSet->summaryCaseCollection();
for ( const auto& curve : curveSet->curves() )
{
curveDefs.push_back( RiaSummaryCurveDefinition( curve->summaryCaseY(), curve->summaryAddressY(), ensemble ) );
curveDefs.push_back(
RiaSummaryCurveDefinition( curve->summaryCaseY(), curve->summaryAddressY(), ensemble, true ) );
}
}