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

#785 Symbol skip distance implemented

Browse Source
This commit is contained in:
Jacob Støren 2016-06-22 10:42:45 +02:00
parent 12e1e47bf1
commit bb4e2c7f45
5 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimPlotCurve.cpp
View File

@ -87,6 +87,8 @@ RimPlotCurve::RimPlotCurve()
caf::AppEnum< RimPlotCurve::PointSymbolEnum > pointSymbol = SYMBOL_NONE; caf::AppEnum< RimPlotCurve::PointSymbolEnum > pointSymbol = SYMBOL_NONE;
CAF_PDM_InitField(&m_pointSymbol, "PointSymbol", pointSymbol, "Point style", "", "", ""); CAF_PDM_InitField(&m_pointSymbol, "PointSymbol", pointSymbol, "Point style", "", "", "");
CAF_PDM_InitField(&m_symbolSkipPixelDistance, "SymbolSkipPxDist", 0.0f, "Symbol Skip Distance", "", "Minimum pixel distance between symbols", "");
m_qwtPlotCurve = new RiuLineSegmentQwtPlotCurve; m_qwtPlotCurve = new RiuLineSegmentQwtPlotCurve;
m_parentQwtPlot = NULL; m_parentQwtPlot = NULL;
@ -121,7 +123,8 @@ void RimPlotCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, con
else if (&m_curveColor == changedField else if (&m_curveColor == changedField
|| &m_curveThickness == changedField || &m_curveThickness == changedField
|| &m_pointSymbol == changedField || &m_pointSymbol == changedField
|| &m_lineStyle == changedField) || &m_lineStyle == changedField
|| &m_symbolSkipPixelDistance == changedField)
{ {
updateCurveAppearance(); updateCurveAppearance();
} }
@ -343,10 +346,7 @@ void RimPlotCurve::updateCurveAppearance()
m_qwtPlotCurve->setPen(curvePen); m_qwtPlotCurve->setPen(curvePen);
m_qwtPlotCurve->setStyle(curveStyle); m_qwtPlotCurve->setStyle(curveStyle);
m_qwtPlotCurve->setSymbol(symbol); m_qwtPlotCurve->setSymbol(symbol);
m_qwtPlotCurve->setSymbolSkipPixelDistance(m_symbolSkipPixelDistance());
m_qwtPlotCurve->setLegendAttribute(QwtPlotCurve::LegendShowLine, true);
m_qwtPlotCurve->setLegendAttribute(QwtPlotCurve::LegendShowSymbol, true);
m_qwtPlotCurve->setLegendAttribute(QwtPlotCurve::LegendShowBrush, true);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimPlotCurve.h
View File

@ -103,6 +103,8 @@ protected:
caf::PdmField<bool> m_isUsingAutoName; caf::PdmField<bool> m_isUsingAutoName;
caf::PdmField<cvf::Color3f> m_curveColor; caf::PdmField<cvf::Color3f> m_curveColor;
caf::PdmField<float> m_curveThickness; caf::PdmField<float> m_curveThickness;
caf::PdmField<float> m_symbolSkipPixelDistance;
caf::PdmField< caf::AppEnum< PointSymbolEnum > > m_pointSymbol; caf::PdmField< caf::AppEnum< PointSymbolEnum > > m_pointSymbol;
caf::PdmField< caf::AppEnum< LineStyleEnum > > m_lineStyle; caf::PdmField< caf::AppEnum< LineStyleEnum > > m_lineStyle;

3
ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp
View File

@ -165,6 +165,8 @@ RimSummaryCurve::RimSummaryCurve()
m_curveVariable.uiCapability()->setUiChildrenHidden(true); m_curveVariable.uiCapability()->setUiChildrenHidden(true);
m_curveVariable = new RimSummaryAddress; m_curveVariable = new RimSummaryAddress;
m_symbolSkipPixelDistance = 10.0f;
updateOptionSensitivity(); updateOptionSensitivity();
} }
@ -344,6 +346,7 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
appearanceGroup->add(&m_curveColor); appearanceGroup->add(&m_curveColor);
appearanceGroup->add(&m_curveThickness); appearanceGroup->add(&m_curveThickness);
appearanceGroup->add(&m_pointSymbol); appearanceGroup->add(&m_pointSymbol);
appearanceGroup->add(&m_symbolSkipPixelDistance);
appearanceGroup->add(&m_lineStyle); appearanceGroup->add(&m_lineStyle);
appearanceGroup->add(&m_curveName); appearanceGroup->add(&m_curveName);
appearanceGroup->add(&m_isUsingAutoName); appearanceGroup->add(&m_isUsingAutoName);

1
ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp
View File

@ -400,6 +400,7 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU
appearanceGroup->add(&m_curveColor); appearanceGroup->add(&m_curveColor);
appearanceGroup->add(&m_curveThickness); appearanceGroup->add(&m_curveThickness);
appearanceGroup->add(&m_pointSymbol); appearanceGroup->add(&m_pointSymbol);
appearanceGroup->add(&m_symbolSkipPixelDistance);
appearanceGroup->add(&m_lineStyle); appearanceGroup->add(&m_lineStyle);
appearanceGroup->add(&m_curveName); appearanceGroup->add(&m_curveName);
appearanceGroup->add(&m_isUsingAutoName); appearanceGroup->add(&m_isUsingAutoName);

1
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
View File

@ -177,6 +177,7 @@ void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder
appearanceGroup->add(&m_curveColor); appearanceGroup->add(&m_curveColor);
appearanceGroup->add(&m_curveThickness); appearanceGroup->add(&m_curveThickness);
appearanceGroup->add(&m_pointSymbol); appearanceGroup->add(&m_pointSymbol);
appearanceGroup->add(&m_symbolSkipPixelDistance);
appearanceGroup->add(&m_lineStyle); appearanceGroup->add(&m_lineStyle);
appearanceGroup->add(&m_curveName); appearanceGroup->add(&m_curveName);
appearanceGroup->add(&m_isUsingAutoName); appearanceGroup->add(&m_isUsingAutoName);