OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-24 22:27:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

#13609 Extract default curve appearance as static constexpr members

Browse Source 
Replace local variables and magic numbers with static constexpr
defaults. Reset curves to default appearance when switching back
from custom to default mode.
This commit is contained in:
Kristian Bendiksen authored and Magne Sjaastad committed 2026-02-23 12:18:09 +01:00
1 parent 69ba3c2418
commit 7cc1853302
2 files changed
+15 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
+11 -8
View File
@@ -167,19 +167,16 @@ RimEnsembleCurveSet::RimEnsembleCurveSet()
CAF_PDM_InitFieldNoDefault( &m_ensembleParameterSorting, "EnsembleParameterSorting", "Parameter Sorting" );
auto defaultLineStyle = LineStyle( RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_NONE );
auto defaultPointSymbol = PointSymbol( RiuPlotCurveSymbol::PointSymbolEnum::SYMBOL_CROSS );
CAF_PDM_InitFieldNoDefault( &m_useCustomAppearance, "UseCustomAppearance", "Appearance" );
CAF_PDM_InitField( &m_lineStyle, "LineStyle", defaultLineStyle, "Line Style" );
CAF_PDM_InitField( &m_pointSymbol, "PointSymbol", defaultPointSymbol, "Symbol" );
CAF_PDM_InitField( &m_symbolSize, "SymbolSize", 6, "Symbol Size" );
CAF_PDM_InitField( &m_lineStyle, "LineStyle", LineStyle( defaultLineStyle ), "Line Style" );
CAF_PDM_InitField( &m_pointSymbol, "PointSymbol", PointSymbol( defaultSymbol ), "Symbol" );
CAF_PDM_InitField( &m_symbolSize, "SymbolSize", defaultSymbolSize, "Symbol Size" );
auto defaultStatisticsPointSymbol = PointSymbol( RiuPlotCurveSymbol::PointSymbolEnum::SYMBOL_ELLIPSE );
CAF_PDM_InitFieldNoDefault( &m_statisticsUseCustomAppearance, "StatisticsUseCustomAppearance", "Appearance" );
CAF_PDM_InitField( &m_statisticsLineStyle, "StatisticsLineStyle", defaultLineStyle, "Line Style" );
CAF_PDM_InitField( &m_statisticsLineStyle, "StatisticsLineStyle", LineStyle( defaultLineStyle ), "Line Style" );
CAF_PDM_InitField( &m_statisticsPointSymbol, "StatisticsPointSymbol", defaultStatisticsPointSymbol, "Symbol" );
CAF_PDM_InitField( &m_statisticsSymbolSize, "StatisticsSymbolSize", 6, "Symbol Size" );
CAF_PDM_InitField( &m_statisticsSymbolSize, "StatisticsSymbolSize", defaultSymbolSize, "Symbol Size" );
CAF_PDM_InitFieldNoDefault( &m_objectiveValuesSummaryAddressesUiField, "SelectedObjectiveSummaryVar", "Vector" );
m_objectiveValuesSummaryAddressesUiField.xmlCapability()->disableIO();
@@ -2174,6 +2171,12 @@ void RimEnsembleCurveSet::updateEnsembleCurves( const std::vector<RimSummaryCase
c->setSymbol( m_pointSymbol() );
c->setSymbolSize( m_symbolSize() );
}
else
{
c->setLineStyle( defaultLineStyle );
c->setSymbol( defaultSymbol );
c->setSymbolSize( defaultSymbolSize );
}
}
}
ApplicationLibCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
+4
View File
@@ -195,6 +195,10 @@ protected:
void initAfterRead() override;
private:
static constexpr auto defaultLineStyle = RiuQwtPlotCurveDefines::LineStyleEnum::STYLE_SOLID;
static constexpr auto defaultSymbol = RiuPlotCurveSymbol::SYMBOL_NONE;
static constexpr int defaultSymbolSize = 6;
void updateEnsembleCurves( const std::vector<RimSummaryCase*>& sumCases );
void updateStatisticsCurves( const std::vector<RimSummaryCase*>& sumCases );