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

Refactor: remove pass-through methods from Rim to Rig.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-11-18 09:31:45 +01:00
parent 06fb3e1241
commit eb6467c599
7 changed files with 69 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
ApplicationLibCode/ProjectDataModel/RimHistogramCalculator.cpp
View File

@@ -18,6 +18,7 @@
#include "RimHistogramCalculator.h"
#include "RigContourMapProjection.h"
#include "RigEclipseMultiPropertyStatCalc.h"
#include "RigEclipseNativeVisibleCellsStatCalc.h"
#include "RigFemNativeVisibleCellsStatCalc.h"
@@ -94,16 +95,16 @@ RigHistogramData RimHistogramCalculator::histogramData( RimEclipseContourMapView
{
RigHistogramData histData;
if ( contourMap )
if ( contourMap && contourMap->contourMapProjection() && contourMap->contourMapProjection()->mapProjection() )
{
bool isResultsInfoRelevant = contourMap->contourMapProjection()->numberOfValidCells() > 0u;
bool isResultsInfoRelevant = contourMap->contourMapProjection()->mapProjection()->numberOfValidCells() > 0u;
if ( isResultsInfoRelevant )
{
histData.min = contourMap->contourMapProjection()->minValue();
histData.max = contourMap->contourMapProjection()->maxValue();
histData.mean = contourMap->contourMapProjection()->meanValue();
histData.sum = contourMap->contourMapProjection()->sumAllValues();
histData.min = contourMap->contourMapProjection()->mapProjection()->minValue();
histData.max = contourMap->contourMapProjection()->mapProjection()->maxValue();
histData.mean = contourMap->contourMapProjection()->mapProjection()->meanValue();
histData.sum = contourMap->contourMapProjection()->mapProjection()->sumAllValues();
}
}
return histData;
@@ -116,16 +117,16 @@ RigHistogramData RimHistogramCalculator::histogramData( RimGeoMechContourMapView
{
RigHistogramData histData;
if ( contourMap )
if ( contourMap && contourMap->contourMapProjection() && contourMap->contourMapProjection()->mapProjection() )
{
bool isResultsInfoRelevant = contourMap->contourMapProjection()->numberOfValidCells() > 0u;
bool isResultsInfoRelevant = contourMap->contourMapProjection()->mapProjection()->numberOfValidCells() > 0u;
if ( isResultsInfoRelevant )
{
histData.min = contourMap->contourMapProjection()->minValue();
histData.max = contourMap->contourMapProjection()->maxValue();
histData.mean = contourMap->contourMapProjection()->meanValue();
histData.sum = contourMap->contourMapProjection()->sumAllValues();
histData.min = contourMap->contourMapProjection()->mapProjection()->minValue();
histData.max = contourMap->contourMapProjection()->mapProjection()->maxValue();
histData.mean = contourMap->contourMapProjection()->mapProjection()->meanValue();
histData.sum = contourMap->contourMapProjection()->mapProjection()->sumAllValues();
}
}
return histData;