OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-11-13 01:26:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

#7805 Convert RimPlotCurve to use RimPlotCurveAppearance configuration.

Browse Source
This commit is contained in:
Kristian Bendiksen committed 2021-09-29 14:16:43 +02:00
1 parent ea3fdef281
commit dfa378fb85
12 files changed
+251 -181
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/RimStackablePlotCurve.cpp
+16 -11
View File
@@ -65,13 +65,13 @@ void RimStackablePlotCurve::assignStackColor( size_t index, size_t count )
}
}
m_fillColor = curveColor;
setFillColor( curveColor );
{
auto moreSaturatedColor = RiaColorTools::toQColor( curveColor );
moreSaturatedColor = RiaColorTools::modifySaturation( moreSaturatedColor, 1.2 );
m_curveColor = RiaColorTools::fromQColorTo3f( moreSaturatedColor );
m_curveAppearance->setColor( RiaColorTools::fromQColorTo3f( moreSaturatedColor ) );
}
this->updateCurveAppearance();
@@ -100,10 +100,10 @@ void RimStackablePlotCurve::setIsStacked( bool stacked )
{
m_isStacked = stacked;
if ( !m_isStacked() && m_fillStyle() != Qt::NoBrush )
if ( !m_isStacked() && fillStyle() != Qt::NoBrush )
{
// Switch off area fill when turning off stacking.
m_fillStyle = Qt::NoBrush;
setFillStyle( Qt::NoBrush );
}
stackingChanged.send( m_isStacked() );
}
@@ -119,10 +119,10 @@ void RimStackablePlotCurve::fieldChangedByUi( const caf::PdmFieldHandle* changed
if ( changedField == &m_isStacked )
{
if ( !m_isStacked() && m_fillStyle() != Qt::NoBrush )
if ( !m_isStacked() && fillStyle() != Qt::NoBrush )
{
// Switch off area fill when turning off stacking.
m_fillStyle = Qt::NoBrush;
setFillStyle( Qt::NoBrush );
}
stackingChanged.send( m_isStacked() );
}
@@ -130,11 +130,16 @@ void RimStackablePlotCurve::fieldChangedByUi( const caf::PdmFieldHandle* changed
{
stackingColorsChanged.send( m_isStackedWithPhaseColors() );
}
else if ( changedField == &m_fillColor )
{
m_isStackedWithPhaseColors = false;
this->updateConnectedEditors();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimStackablePlotCurve::onFillColorChanged( const caf::SignalEmitter* emitter )
{
m_isStackedWithPhaseColors = false;
this->updateConnectedEditors();
stackingColorsChanged.send( m_isStackedWithPhaseColors() );
}
//--------------------------------------------------------------------------------------------------