Refactor: make contour map calculation easier to reuse.

OPM · Oct 23, 2024 · a9d6acd · a9d6acd
1 parent ac96150
commit a9d6acd
Show file tree

Hide file tree

Showing 7 changed files with 575 additions and 359 deletions.
diff --git a/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp b/ApplicationLibCode/ProjectDataModel/GeoMech/RimGeoMechContourMapProjection.cpp
@@ -21,6 +21,7 @@
 #include "RiaWeightedMeanCalculator.h"
 
 #include "RigCellGeometryTools.h"
+#include "RigContourMapCalculator.h"
 #include "RigContourMapGrid.h"
 #include "RigFemAddressDefines.h"
 #include "RigFemPart.h"
@@ -611,10 +612,15 @@ QList<caf::PdmOptionItemInfo> RimGeoMechContourMapProjection::calculateValueOpti
 
     if ( fieldNeedingOptions == &m_resultAggregation )
     {
-        std::vector<ResultAggregationEnum> validOptions =
-            { RESULTS_TOP_VALUE, RESULTS_MEAN_VALUE, RESULTS_GEOM_VALUE, RESULTS_HARM_VALUE, RESULTS_MIN_VALUE, RESULTS_MAX_VALUE, RESULTS_SUM };
-
-        for ( ResultAggregationEnum option : validOptions )
+        std::vector<RigContourMapCalculator::ResultAggregationEnum> validOptions = { RigContourMapCalculator::RESULTS_TOP_VALUE,
+                                                                                     RigContourMapCalculator::RESULTS_MEAN_VALUE,
+                                                                                     RigContourMapCalculator::RESULTS_GEOM_VALUE,
+                                                                                     RigContourMapCalculator::RESULTS_HARM_VALUE,
+                                                                                     RigContourMapCalculator::RESULTS_MIN_VALUE,
+                                                                                     RigContourMapCalculator::RESULTS_MAX_VALUE,
+                                                                                     RigContourMapCalculator::RESULTS_SUM };
+
+        for ( RigContourMapCalculator::ResultAggregationEnum option : validOptions )
         {
             options.push_back( caf::PdmOptionItemInfo( ResultAggregation::uiText( option ), option ) );
         }