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

Support selecting area fill color separately from curve color

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-06-19 12:30:29 +02:00
parent 7f4db78e38
commit 007f0282df
2 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@ -136,6 +136,7 @@ RimPlotCurve::RimPlotCurve()
CAF_PDM_InitField( &m_isUsingAutoName, "AutoName", true, "Auto Name", "", "", "" );
CAF_PDM_InitField( &m_curveColor, "Color", cvf::Color3f( cvf::Color3::BLACK ), "Color", "", "", "" );
CAF_PDM_InitField( &m_fillColor, "FillColor", cvf::Color3f( -1.0, -1.0, -1.0 ), "Fill Color", "", "", "" );
CAF_PDM_InitField( &m_curveThickness, "Thickness", 1, "Line Thickness", "", "", "" );
m_curveThickness.uiCapability()->setUiEditorTypeName( caf::PdmUiComboBoxEditor::uiEditorTypeName() );
@ -211,8 +212,13 @@ void RimPlotCurve::fieldChangedByUi( const caf::PdmFieldHandle* changedField, co
else if ( &m_curveColor == changedField || &m_curveThickness == changedField || &m_pointSymbol == changedField ||
&m_lineStyle == changedField || &m_symbolSkipPixelDistance == changedField ||
&m_curveInterpolation == changedField || &m_symbolSize == changedField ||
&m_symbolEdgeColor == changedField || &m_fillStyle == changedField )
&m_symbolEdgeColor == changedField || &m_fillStyle == changedField || &m_fillColor == changedField )
{
if ( &m_fillStyle == changedField )
{
checkAndApplyDefaultFillColor();
}
updateCurveAppearance();
if ( &m_pointSymbol == changedField )
@ -309,6 +315,8 @@ void RimPlotCurve::initAfterRead()
m_symbolSkipPixelDistance.uiCapability()->setUiReadOnly( m_pointSymbol() == RiuQwtSymbol::SYMBOL_NONE );
m_curveThickness.uiCapability()->setUiReadOnly( m_lineStyle() == RiuQwtPlotCurve::STYLE_NONE );
m_curveInterpolation.uiCapability()->setUiReadOnly( m_lineStyle() == RiuQwtPlotCurve::STYLE_NONE );
checkAndApplyDefaultFillColor();
}
//--------------------------------------------------------------------------------------------------
@ -376,6 +384,7 @@ caf::PdmFieldHandle* RimPlotCurve::userDescriptionField()
void RimPlotCurve::setColor( const cvf::Color3f& color )
{
m_curveColor = color;
m_fillColor = color;
}
//--------------------------------------------------------------------------------------------------
@ -623,6 +632,10 @@ void RimPlotCurve::appearanceUiOrdering( caf::PdmUiOrdering& uiOrdering )
uiOrdering.add( &m_symbolSkipPixelDistance );
uiOrdering.add( &m_lineStyle );
uiOrdering.add( &m_fillStyle );
if ( m_fillStyle != Qt::BrushStyle::NoBrush )
{
uiOrdering.add( &m_fillColor );
}
uiOrdering.add( &m_curveThickness );
uiOrdering.add( &m_curveInterpolation );
}
@ -696,6 +709,17 @@ void RimPlotCurve::attachCurveAndErrorBars()
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotCurve::checkAndApplyDefaultFillColor()
{
if ( !m_fillColor().isValid() )
{
m_fillColor = m_curveColor;
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -745,7 +769,7 @@ void RimPlotCurve::updateCurveAppearance()
if ( m_qwtPlotCurve )
{
QColor fillColor = curveColor;
QColor fillColor( m_fillColor.value().rByte(), m_fillColor.value().gByte(), m_fillColor.value().bByte() );
fillColor.setAlpha( 130 );
QBrush fillBrush( fillColor, m_fillStyle() );
m_qwtPlotCurve->setAppearance( m_lineStyle(), m_curveInterpolation(), m_curveThickness(), curveColor, fillBrush );

6
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@ -146,8 +146,9 @@ protected:
void curveNameUiOrdering( caf::PdmUiOrdering& uiOrdering );
private:
bool canCurveBeAttached() const;
void attachCurveAndErrorBars();
bool canCurveBeAttached() const;
void attachCurveAndErrorBars();
virtual void checkAndApplyDefaultFillColor();
protected:
QPointer<QwtPlot> m_parentQwtPlot;
@ -172,6 +173,7 @@ protected:
caf::PdmField<PointSymbol> m_pointSymbol;
caf::PdmField<LineStyle> m_lineStyle;
caf::PdmField<FillStyle> m_fillStyle;
caf::PdmField<cvf::Color3f> m_fillColor;
caf::PdmField<CurveInterpolation> m_curveInterpolation;
caf::PdmField<LabelPosition> m_symbolLabelPosition;
caf::PdmField<cvf::Color3f> m_symbolEdgeColor;