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

#4581 Summary Plot: Rename to setCurveAppearanceFromCaseType()

Browse Source
This commit is contained in:
Magne Sjaastad
2019-08-16 14:40:12 +02:00
parent c5542463aa
commit c30b34511b
4 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -799,7 +799,7 @@ QString RimSummaryCurve::curveExportDescription(const RifEclipseSummaryAddress&
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryCurve::forceUpdateCurveAppearanceFromCaseType() void RimSummaryCurve::setCurveAppearanceFromCaseType()
{ {
if (m_yValuesSummaryCase) if (m_yValuesSummaryCase)
{ {
@@ -811,11 +811,8 @@ void RimSummaryCurve::forceUpdateCurveAppearanceFromCaseType()
{ {
setSymbol(RiuQwtSymbol::SYMBOL_XCROSS); setSymbol(RiuQwtSymbol::SYMBOL_XCROSS);
} }
}
else return;
{
setLineStyle(RiuQwtPlotCurve::STYLE_SOLID);
setSymbol(RiuQwtSymbol::SYMBOL_NONE);
} }
} }
} }

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@@ -79,7 +79,7 @@ public:
void applyCurveAutoNameSettings(const RimSummaryCurveAutoName& autoNameSettings); void applyCurveAutoNameSettings(const RimSummaryCurveAutoName& autoNameSettings);
QString curveExportDescription(const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress()) const override; QString curveExportDescription(const RifEclipseSummaryAddress& address = RifEclipseSummaryAddress()) const override;
void forceUpdateCurveAppearanceFromCaseType(); void setCurveAppearanceFromCaseType();
void markCachedDataForPurge(); void markCachedDataForPurge();

5
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveAppearanceCalculator.cpp
View File

@@ -357,10 +357,7 @@ void RimSummaryCurveAppearanceCalculator::setupCurveLook(RimSummaryCurve* curve)
curve->setColor(gradeColor(m_currentCurveBaseColor, m_currentCurveGradient)); curve->setColor(gradeColor(m_currentCurveBaseColor, m_currentCurveGradient));
if ( curve->summaryCaseY()->isObservedData() ) curve->setCurveAppearanceFromCaseType();
{
curve->forceUpdateCurveAppearanceFromCaseType();
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotSourceStepping.cpp
View File

@@ -402,9 +402,8 @@ void RimSummaryPlotSourceStepping::fieldChangedByUi(const caf::PdmFieldHandle* c
{ {
if (previousCase == curve->summaryCaseY()) if (previousCase == curve->summaryCaseY())
{ {
bool doSetAppearance = curve->summaryCaseY()->isObservedData() != m_summaryCase->isObservedData();
curve->setSummaryCaseY(m_summaryCase); curve->setSummaryCaseY(m_summaryCase);
if (doSetAppearance) curve->forceUpdateCurveAppearanceFromCaseType(); curve->setCurveAppearanceFromCaseType();
} }
} }