diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp index 8766a3989e..fbb6a5e3a0 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.cpp @@ -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(), diff --git a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.h b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.h index 1b2ecf1a40..79a96e9fe7 100644 --- a/ApplicationLibCode/ProjectDataModel/RimPlotCurve.h +++ b/ApplicationLibCode/ProjectDataModel/RimPlotCurve.h @@ -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 ); diff --git a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp index 52608ca978..163324a3a6 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp +++ b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp @@ -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; } diff --git a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.h b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.h index 1f51f6af83..54d48d16a9 100644 --- a/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.h +++ b/ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.h @@ -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 m_isStacked; diff --git a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 237a4a8d14..72d135edb9 100644 --- a/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -1831,12 +1831,6 @@ bool RimSummaryPlot::updateStackedCurveDataForAxis( RiuPlotAxis plotAxis ) std::map 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()]++;