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

Area Fill: Fix are fill issue related to stacking of curves

Browse Source
This commit is contained in:
Magne Sjaastad
2023-10-20 14:33:36 +02:00
parent 35d0be6b62
commit 12794f80f2
5 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp
View File

@@ -1027,7 +1027,7 @@ void RimPlotCurve::updateCurveAppearance()
QColor fillColor = RiaColorTools::toQColor( m_curveAppearance->fillColor() );
fillColor = RiaColorTools::blendQColors( fillColor, QColor( Qt::white ), 3, 1 );
QBrush fillBrush( fillColor, m_curveAppearance->fillStyle() );
QBrush fillBrush( fillColor, fillStyle() );
m_plotCurve->setAppearance( m_curveAppearance->lineStyle(),
m_curveAppearance->interpolation(),
m_curveAppearance->lineThickness(),

2
ApplicationLibCode/ProjectDataModel/RimPlotCurve.h
View File

@@ -76,7 +76,7 @@ public:
void setSymbolSize( int sizeInPixels );
void setLineThickness( int thickness );
void resetAppearance();
Qt::BrushStyle fillStyle() const;
virtual Qt::BrushStyle fillStyle() const;
void setFillStyle( Qt::BrushStyle brushStyle );
void setFillColor( const cvf::Color3f& fillColor );

20
ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp
View File

@@ -108,7 +108,6 @@ void RimStackablePlotCurve::setIsStacked( bool stacked )
{
m_isStacked = stacked;
updateStackingAppearance();
stackingChanged.send( m_isStacked() );
}
@@ -121,7 +120,6 @@ void RimStackablePlotCurve::fieldChangedByUi( const caf::PdmFieldHandle* changed
if ( changedField == &m_isStacked )
{
updateStackingAppearance();
stackingChanged.send( m_isStacked() );
}
else if ( changedField == &m_isStackedWithPhaseColors )
@@ -171,21 +169,11 @@ void RimStackablePlotCurve::defaultUiOrdering( caf::PdmUiOrdering& uiOrdering )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimStackablePlotCurve::updateCurveAppearance()
Qt::BrushStyle RimStackablePlotCurve::fillStyle() const
{
updateStackingAppearance();
auto selectedFillStyle = RimPlotCurve::fillStyle();
RimPlotCurve::updateCurveAppearance();
}
if ( m_isStacked() && selectedFillStyle == Qt::NoBrush ) return Qt::SolidPattern;
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimStackablePlotCurve::updateStackingAppearance()
{
if ( !m_isStacked() && fillStyle() != Qt::NoBrush )
{
// Switch off area fill when turning off stacking.
setFillStyle( Qt::NoBrush );
}
return selectedFillStyle;
}

3
ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.h
View File

@@ -34,7 +34,7 @@ public:
bool isStacked() const;
bool isStackedWithPhaseColors() const;
void setIsStacked( bool stacked );
void updateCurveAppearance() override;
Qt::BrushStyle fillStyle() const override;
void defaultUiOrdering( caf::PdmUiOrdering& uiOrdering );
void stackingUiOrdering( caf::PdmUiOrdering& uiOrdering );
@@ -44,7 +44,6 @@ protected:
private:
void onFillColorChanged( const caf::SignalEmitter* emitter ) override;
void updateStackingAppearance();
protected:
caf::PdmField<bool> m_isStacked;

6
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -1831,12 +1831,6 @@ bool RimSummaryPlot::updateStackedCurveDataForAxis( RiuPlotAxis plotAxis )
std::map<RiaDefines::PhaseType, size_t> curvePhaseCount;
for ( RimSummaryCurve* curve : stackedCurves )
{
// Apply a area filled style if it isn't already set
if ( curve->fillStyle() == Qt::NoBrush )
{
curve->setFillStyle( Qt::SolidPattern );
}
curve->loadDataAndUpdate( false );
curvePhaseCount[curve->phaseType()]++;