From c30b34511b45b149d4a5b2a26eb56995a2674f9b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 16 Aug 2019 14:40:12 +0200 Subject: [PATCH] #4581 Summary Plot: Rename to setCurveAppearanceFromCaseType() --- .../ProjectDataModel/Summary/RimSummaryCurve.cpp | 9 +++------ .../ProjectDataModel/Summary/RimSummaryCurve.h | 2 +- .../Summary/RimSummaryCurveAppearanceCalculator.cpp | 5 +---- .../Summary/RimSummaryPlotSourceStepping.cpp | 3 +-- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp index 9b07f1e12b..a2b8bd674a 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp @@ -799,7 +799,7 @@ QString RimSummaryCurve::curveExportDescription(const RifEclipseSummaryAddress& //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryCurve::forceUpdateCurveAppearanceFromCaseType() +void RimSummaryCurve::setCurveAppearanceFromCaseType() { if (m_yValuesSummaryCase) { @@ -811,11 +811,8 @@ void RimSummaryCurve::forceUpdateCurveAppearanceFromCaseType() { setSymbol(RiuQwtSymbol::SYMBOL_XCROSS); } - } - else - { - setLineStyle(RiuQwtPlotCurve::STYLE_SOLID); - setSymbol(RiuQwtSymbol::SYMBOL_NONE); + + return; } } } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h index b919d22b3e..3360e4af95 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h @@ -79,7 +79,7 @@ public: void applyCurveAutoNameSettings(const RimSummaryCurveAutoName& autoNameSettings); QString curveExportDescription(const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress()) const override; - void forceUpdateCurveAppearanceFromCaseType(); + void setCurveAppearanceFromCaseType(); void markCachedDataForPurge(); diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp index d0a99f3ab4..c5c2dfad16 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp @@ -357,10 +357,7 @@ void RimSummaryCurveAppearanceCalculator::setupCurveLook(RimSummaryCurve* curve) curve->setColor(gradeColor(m_currentCurveBaseColor, m_currentCurveGradient)); - if ( curve->summaryCaseY()->isObservedData() ) - { - curve->forceUpdateCurveAppearanceFromCaseType(); - } + curve->setCurveAppearanceFromCaseType(); } //-------------------------------------------------------------------------------------------------- diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp index 62fc50d1f1..ed6410a891 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp @@ -402,9 +402,8 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi(const caf::PdmFieldHandle* c { if (previousCase == curve->summaryCaseY()) { - bool doSetAppearance = curve->summaryCaseY()->isObservedData() != m_summaryCase->isObservedData(); curve->setSummaryCaseY(m_summaryCase); - if (doSetAppearance) curve->forceUpdateCurveAppearanceFromCaseType(); + curve->setCurveAppearanceFromCaseType(); } }