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

Fix source list in Summary Editor for ensemble plots

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-09-15 12:53:46 +02:00
parent b4aaaa98e9
commit 71d032f4ad
15 changed files with 164 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -354,11 +354,7 @@ void RicSummaryPlotEditorUi::syncPreviewCurvesFromUiSelection()
for ( const auto& curve : currentCurvesInPreviewPlot )
{
RimSummaryCase* sumCase = curve->summaryCaseY();
currentCurveDefs.insert( RiaSummaryCurveDefinition( sumCase,
curve->summaryAddressY(),
sumCase ? sumCase->ensemble() : nullptr,
sumCase && sumCase->ensemble() ) );
currentCurveDefs.insert( curve->curveDefinitionY() );
}
{
@@ -372,11 +368,7 @@ void RicSummaryPlotEditorUi::syncPreviewCurvesFromUiSelection()
for ( const auto& curve : currentCurvesInPreviewPlot )
{
RimSummaryCase* sumCase = curve->summaryCaseY();
if ( sumCase && sumCase->ensemble() ) continue;
RiaSummaryCurveDefinition curveDef =
RiaSummaryCurveDefinition( sumCase, curve->summaryAddressY(), nullptr, false );
RiaSummaryCurveDefinition curveDef = curve->curveDefinitionY();
if ( deleteCurveDefs.count( curveDef ) > 0 ) curvesToDelete.insert( curve );
}
}
@@ -597,7 +589,7 @@ void RicSummaryPlotEditorUi::populateCurveCreator( const RimSummaryPlot& sourceS
for ( const auto& curve : sourceSummaryPlot.summaryCurves() )
{
curveDefs.push_back( RiaSummaryCurveDefinition( curve->summaryCaseY(), curve->summaryAddressY(), nullptr, false ) );
curveDefs.push_back( curve->curveDefinitionY() );
// Copy curve object to the preview plot
copyCurveAndAddToPlot( curve, m_previewPlot.get(), true );
@@ -613,8 +605,7 @@ 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, true ) );
curveDefs.push_back( curve->curveDefinitionY() );
}
}