diff --git a/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp b/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp index 6fd14caec6..184f8961e2 100644 --- a/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimPlotCurve.cpp @@ -87,6 +87,8 @@ RimPlotCurve::RimPlotCurve() caf::AppEnum< RimPlotCurve::PointSymbolEnum > pointSymbol = SYMBOL_NONE; 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_parentQwtPlot = NULL; @@ -121,7 +123,8 @@ void RimPlotCurve::fieldChangedByUi(const caf::PdmFieldHandle* changedField, con else if (&m_curveColor == changedField || &m_curveThickness == changedField || &m_pointSymbol == changedField - || &m_lineStyle == changedField) + || &m_lineStyle == changedField + || &m_symbolSkipPixelDistance == changedField) { updateCurveAppearance(); } @@ -343,10 +346,7 @@ void RimPlotCurve::updateCurveAppearance() m_qwtPlotCurve->setPen(curvePen); m_qwtPlotCurve->setStyle(curveStyle); m_qwtPlotCurve->setSymbol(symbol); - - m_qwtPlotCurve->setLegendAttribute(QwtPlotCurve::LegendShowLine, true); - m_qwtPlotCurve->setLegendAttribute(QwtPlotCurve::LegendShowSymbol, true); - m_qwtPlotCurve->setLegendAttribute(QwtPlotCurve::LegendShowBrush, true); + m_qwtPlotCurve->setSymbolSkipPixelDistance(m_symbolSkipPixelDistance()); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/RimPlotCurve.h b/ApplicationCode/ProjectDataModel/RimPlotCurve.h index 92310d4d0d..2b509c73cc 100644 --- a/ApplicationCode/ProjectDataModel/RimPlotCurve.h +++ b/ApplicationCode/ProjectDataModel/RimPlotCurve.h @@ -103,6 +103,8 @@ protected: caf::PdmField m_isUsingAutoName; caf::PdmField m_curveColor; caf::PdmField m_curveThickness; + caf::PdmField m_symbolSkipPixelDistance; + caf::PdmField< caf::AppEnum< PointSymbolEnum > > m_pointSymbol; caf::PdmField< caf::AppEnum< LineStyleEnum > > m_lineStyle; diff --git a/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp index 9e2ed28c86..2682229f63 100644 --- a/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimSummaryCurve.cpp @@ -165,6 +165,8 @@ RimSummaryCurve::RimSummaryCurve() m_curveVariable.uiCapability()->setUiChildrenHidden(true); m_curveVariable = new RimSummaryAddress; + + m_symbolSkipPixelDistance = 10.0f; updateOptionSensitivity(); } @@ -344,6 +346,7 @@ void RimSummaryCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& appearanceGroup->add(&m_curveColor); appearanceGroup->add(&m_curveThickness); appearanceGroup->add(&m_pointSymbol); + appearanceGroup->add(&m_symbolSkipPixelDistance); appearanceGroup->add(&m_lineStyle); appearanceGroup->add(&m_curveName); appearanceGroup->add(&m_isUsingAutoName); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp index 79c8506b7a..173f5d7fa2 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurve.cpp @@ -400,6 +400,7 @@ void RimWellLogExtractionCurve::defineUiOrdering(QString uiConfigName, caf::PdmU appearanceGroup->add(&m_curveColor); appearanceGroup->add(&m_curveThickness); appearanceGroup->add(&m_pointSymbol); + appearanceGroup->add(&m_symbolSkipPixelDistance); appearanceGroup->add(&m_lineStyle); appearanceGroup->add(&m_curveName); appearanceGroup->add(&m_isUsingAutoName); diff --git a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp index a358acaffd..061f75daf3 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp @@ -177,6 +177,7 @@ void RimWellLogFileCurve::defineUiOrdering(QString uiConfigName, caf::PdmUiOrder appearanceGroup->add(&m_curveColor); appearanceGroup->add(&m_curveThickness); appearanceGroup->add(&m_pointSymbol); + appearanceGroup->add(&m_symbolSkipPixelDistance); appearanceGroup->add(&m_lineStyle); appearanceGroup->add(&m_curveName); appearanceGroup->add(&m_isUsingAutoName);