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

#924 Cleaned up includes and use RimGeoMechResultDefinition instead of RimGeoMechCellColors

Browse Source
This commit is contained in:
Magne Sjaastad
2016-10-18 07:31:02 +02:00
parent 941eed6625
commit 649c11efcb
12 changed files with 91 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@@ -22,8 +22,10 @@
#include "RiaApplication.h"
#include "RimCellEdgeColors.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimGeoMechResultDefinition.h"
#include "cafCategoryLegend.h"
#include "cafCategoryMapper.h"
@@ -42,8 +44,6 @@
#include "cvfqtUtils.h"
#include <cmath>
#include "RimGeoMechCellColors.h"
#include "RimCellEdgeColors.h"
CAF_PDM_SOURCE_INIT(RimLegendConfig, "Legend");
@@ -790,7 +790,7 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
{
RimEclipseCellColors* eclCellColors = nullptr;
this->firstAncestorOrThisOfType(eclCellColors);
RimGeoMechCellColors* gmCellColors = nullptr;
RimGeoMechResultDefinition* gmCellColors = nullptr;
this->firstAncestorOrThisOfType(gmCellColors);
RimCellEdgeColors* eclCellEdgColors = nullptr;
this->firstAncestorOrThisOfType(eclCellEdgColors);