From 3cdf19b19d6d1f4ddeac90aa2d4b33fc8548a8d7 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Thu, 25 Apr 2019 07:42:38 +0200 Subject: [PATCH] #4357 Grid Case Group Statistics: Crash when creating contour map --- .../RimEclipseContourMapProjection.cpp | 12 ++++++------ .../RimEclipseContourMapProjection.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp index 9d6d9b22eb..9ee5933e0a 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.cpp @@ -31,11 +31,11 @@ #include "RigMainGrid.h" #include "RimCellRangeFilterCollection.h" -#include "RimEclipseContourMapView.h" +#include "RimEclipseCase.h" #include "RimEclipseCellColors.h" -#include "RimEclipseView.h" -#include "RimEclipseResultCase.h" +#include "RimEclipseContourMapView.h" #include "RimEclipseResultDefinition.h" +#include "RimEclipseView.h" #include "RimProject.h" #include "RimRegularLegendConfig.h" #include "RimTextAnnotation.h" @@ -177,7 +177,7 @@ std::vector RimEclipseContourMapProjection::generateResults(int timeStep std::vector aggregatedResults = std::vector(nCells, std::numeric_limits::infinity()); RimEclipseCellColors* cellColors = view()->cellResult(); - RimEclipseResultCase* eclipseCase = this->eclipseCase(); + RimEclipseCase* eclipseCase = this->eclipseCase(); { if (!cellColors->isTernarySaturationSelected()) { @@ -345,9 +345,9 @@ std::vector RimEclipseContourMapProjection::retrieveParameterWeights() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimEclipseResultCase* RimEclipseContourMapProjection::eclipseCase() const +RimEclipseCase* RimEclipseContourMapProjection::eclipseCase() const { - RimEclipseResultCase* eclipseCase = nullptr; + RimEclipseCase* eclipseCase = nullptr; firstAncestorOrThisOfType(eclipseCase); return eclipseCase; } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.h b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.h index 1d726793cc..78ddef9866 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.h +++ b/ApplicationCode/ProjectDataModel/RimEclipseContourMapProjection.h @@ -35,7 +35,7 @@ class RigMainGrid; class RigResultAccessor; class RimEclipseContourMapView; -class RimEclipseResultCase; +class RimEclipseCase; class RimEclipseResultDefinition; //================================================================================================== @@ -77,7 +77,7 @@ protected: // Eclipse implementation specific data generation methods std::vector calculateColumnResult(ResultAggregation resultAggregation) const; - RimEclipseResultCase* eclipseCase() const; + RimEclipseCase* eclipseCase() const; RimEclipseContourMapView* view() const;