#15084: Use shared statistics type enum

Add RiaDefines::StatisticsType and use it in Summary Table, statistics contour map and ensemble surface statistics instead of three separate enums with the same values.
This commit is contained in:
Magne Sjaastad committed 2026-11-10 09:40:19 +01:00
1 parent bb5da52a2d
commit 4daaa159ff
16 files changed
+149 -142

No files matched your search

@@ -51,7 +51,7 @@ RimEnsembleStatisticsSurface::~RimEnsembleStatisticsSurface()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleStatisticsSurface::setStatisticsType( RigSurfaceStatisticsCalculator::StatisticsType statisticsType )
void RimEnsembleStatisticsSurface::setStatisticsType( RiaDefines::StatisticsType statisticsType )
{
m_statisticsType = statisticsType;
@@ -61,7 +61,7 @@ void RimEnsembleStatisticsSurface::setStatisticsType( RigSurfaceStatisticsCalcul
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigSurfaceStatisticsCalculator::StatisticsType RimEnsembleStatisticsSurface::statisticsType() const
RiaDefines::StatisticsType RimEnsembleStatisticsSurface::statisticsType() const
{
return m_statisticsType();
}
@@ -71,7 +71,7 @@ RigSurfaceStatisticsCalculator::StatisticsType RimEnsembleStatisticsSurface::sta
//--------------------------------------------------------------------------------------------------
QString RimEnsembleStatisticsSurface::fullName() const
{
return caf::AppEnum<RigSurfaceStatisticsCalculator::StatisticsType>::uiText( m_statisticsType.v() );
return caf::AppEnum<RiaDefines::StatisticsType>::uiText( m_statisticsType.v() );
}
//--------------------------------------------------------------------------------------------------
@@ -131,8 +131,7 @@ std::vector<cvf::Vec3d> RimEnsembleStatisticsSurface::extractStatisticalDepthFor
CAF_ASSERT( surface );
std::vector<cvf::Vec3d> verts = surface->vertices();
const auto& meanValues =
surface->propertyValues( caf::AppEnum<RigSurfaceStatisticsCalculator::StatisticsType>::text( m_statisticsType.v() ) );
const auto& meanValues = surface->propertyValues( caf::AppEnum<RiaDefines::StatisticsType>::text( m_statisticsType.v() ) );
for ( size_t i = 0; i < verts.size(); i++ )
{