Merge pull request #4818 from OPM/improve-ensemble-stepping

Improve ensemble stepping
This commit is contained in:
Magne Sjaastad
2019-10-04 11:43:06 +02:00
committed by GitHub
11 changed files with 120 additions and 127 deletions

View File

@@ -146,7 +146,7 @@ QString RicSummaryPlotTemplateTools::htmlTextFromPlotAndSelection(
RiaSummaryCurveAnalyzer selectionAnalyzer;
selectionAnalyzer.appendAdresses( selectedSummaryAddresses );
selectionAnalyzer.appendAddresses( selectedSummaryAddresses );
if ( templatePlot )
{
@@ -169,7 +169,7 @@ QString RicSummaryPlotTemplateTools::htmlTextFromPlotAndSelection(
}
}
templateAnalyzer.appendAdresses( templateAddresses );
templateAnalyzer.appendAddresses( templateAddresses );
}
text += "<b> Requirements </b><br>";

View File

@@ -127,7 +127,17 @@ void RicNewSummaryEnsembleCurveSetFeature::onActionTriggered( bool isChecked )
CVF_ASSERT( !project->summaryGroups().empty() );
auto ensemble = project->summaryGroups().back();
RicNewSummaryEnsembleCurveSetFeature::createPlotForCurveSetAndUpdate( ensemble );
auto curveSet = RicNewSummaryEnsembleCurveSetFeature::addDefaultCurveSet( plot, ensemble );
plot->loadDataAndUpdate();
plot->updateConnectedEditors();
RiaGuiApplication* app = RiaGuiApplication::instance();
RiuPlotMainWindow* mainPlotWindow = app->getOrCreateAndShowMainPlotWindow();
if ( mainPlotWindow )
{
mainPlotWindow->selectAsCurrentItem( curveSet );
mainPlotWindow->updateSummaryPlotToolBar();
}
}
}