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

#6533 Speed up ensemble curve preview.

Browse Source 
Made faster by hiding legends and error bars when there are many curves.
This commit is contained in:
Kristian Bendiksen 2020-09-23 14:35:57 +02:00 committed by Gaute Lindkvist
parent 7f9cab5300
commit 3e1a019783
4 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -455,11 +455,16 @@ void RicSummaryPlotEditorUi::updatePreviewCurvesFromCurveDefinitions(
size_t ensembleCurveCnt = ensembleCurveCount( allCurveDefsToDisplay ); size_t ensembleCurveCnt = ensembleCurveCount( allCurveDefsToDisplay );
// Disable legends when adding curves
m_previewPlot->setLegendsVisible( false );
// Add new curves // Add new curves
for ( const auto& curveDef : curveDefsToAdd ) for ( const auto& curveDef : curveDefsToAdd )
{ {
RimSummaryCase* currentCase = curveDef.summaryCase(); RimSummaryCase* currentCase = curveDef.summaryCase();
RimSummaryCurve* curve = new RimSummaryCurve(); RimSummaryCurve* curve = new RimSummaryCurve();
curve->setErrorBarsVisible( false );
curve->showLegend( false );
curve->setSummaryCaseY( currentCase ); curve->setSummaryCaseY( currentCase );
curve->setSummaryAddressYAndApplyInterpolation( curveDef.summaryAddress() ); curve->setSummaryAddressYAndApplyInterpolation( curveDef.summaryAddress() );
curve->applyCurveAutoNameSettings( *m_curveNameConfig() ); curve->applyCurveAutoNameSettings( *m_curveNameConfig() );
@ -522,6 +527,8 @@ void RicSummaryPlotEditorUi::updatePreviewCurvesFromCurveDefinitions(
} }
} }
// Enable legends if there is not too many curves
m_previewPlot->setLegendsVisible( !warningDisplayed );
m_previewPlot->loadDataAndUpdate(); m_previewPlot->loadDataAndUpdate();
m_previewPlot->zoomAll(); m_previewPlot->zoomAll();
m_previewPlot->updateConnectedEditors(); m_previewPlot->updateConnectedEditors();

8
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@ -301,6 +301,14 @@ void RimPlotCurve::setLegendEntryText( const QString& legendEntryText )
m_legendEntryText = legendEntryText; m_legendEntryText = legendEntryText;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotCurve::setErrorBarsVisible( bool isVisible )
{
m_showErrorBars = isVisible;
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@ -115,6 +115,8 @@ public:
void setZOrder( double z ); void setZOrder( double z );
void setErrorBarsVisible( bool isVisible );
virtual void updateCurveAppearance(); virtual void updateCurveAppearance();
bool isCrossPlotCurve() const; bool isCrossPlotCurve() const;
void updateUiIconFromPlotSymbol(); void updateUiIconFromPlotSymbol();

2
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@ -967,7 +967,7 @@ void RimEnsembleCurveSet::updateEnsembleCurves( const std::vector<RimSummaryCase
if ( plot->viewer() ) if ( plot->viewer() )
{ {
plot->viewer()->updateLegend(); if ( plot->legendsVisible() ) plot->viewer()->updateLegend();
plot->viewer()->scheduleReplot(); plot->viewer()->scheduleReplot();
plot->updateAxes(); plot->updateAxes();
plot->updatePlotInfoLabel(); plot->updatePlotInfoLabel();