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

#6652 Fix missing legend entries in summary editor

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-10-01 08:28:08 +02:00
committed by Magne Sjaastad
parent fde2c5e4af
commit 2de49891fb
5 changed files with 45 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -542,7 +542,7 @@ void RimWellRftPlot::updateCurvesInPlot( const std::set<RiaRftPltCurveDefinition
bool isFirstSummaryCurveInEnsemble =
ensemblesWithSummaryCurves.count( curveDefToAdd.address().ensemble() ) == 0u;
curve->showLegend( isFirstSummaryCurveInEnsemble );
curve->setShowInLegend( isFirstSummaryCurveInEnsemble );
ensemblesWithSummaryCurves.insert( curveDefToAdd.address().ensemble() );
}
else if ( m_showStatisticsCurves && curveDefToAdd.address().sourceType() == RifDataSourceForRftPlt::ENSEMBLE_RFT )

2
ApplicationCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@@ -618,7 +618,7 @@ void RimGridCrossPlotDataSet::createCurves( const RigEclipseCrossPlotResult& res
}
curve->setSymbolEdgeColor( curve->color() );
curve->setSamples( it->second.xValues, it->second.yValues );
curve->showLegend( m_crossPlotCurves.empty() );
curve->setShowInLegend( m_crossPlotCurves.empty() );
curve->setLegendEntryText( createAutoName() );
curve->setCurveAutoAppearance();
curve->updateUiIconFromPlotSymbol();

18
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -1034,7 +1034,23 @@ void RimPlotCurve::setFillColor( const cvf::Color3f& fillColor )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotCurve::showLegend( bool show )
bool RimPlotCurve::showInLegend() const
{
return m_showLegend;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimPlotCurve::errorBarsVisible() const
{
return m_showErrorBars;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotCurve::setShowInLegend( bool show )
{
m_showLegend = show;
updateLegendEntryVisibilityNoPlotUpdate();

5
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@@ -111,10 +111,11 @@ public:
void updateLegendEntryVisibilityAndPlotLegend();
void updateLegendEntryVisibilityNoPlotUpdate();
void showLegend( bool show );
bool showInLegend() const;
bool errorBarsVisible() const;
void setShowInLegend( bool show );
void setZOrder( double z );
void setErrorBarsVisible( bool isVisible );
virtual void updateCurveAppearance();