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

#1794 Add missing #ifdefs for USE_PROTOTYPE_FEATURE_FRACTURES

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-22 11:38:31 +02:00
parent 75f5c6ab3b
commit 86365357f4
4 changed files with 36 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@@ -27,7 +27,11 @@
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimGeoMechResultDefinition.h"
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimStimPlanColors.h"
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
#include "RimViewLinker.h"
#include "cafCategoryLegend.h"
@@ -754,9 +758,12 @@ void RimLegendConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{
bool hasStimPlanParent = false;
#ifdef USE_PROTOTYPE_FEATURE_FRACTURES
RimStimPlanColors* stimPlanColors = nullptr;
this->firstAncestorOrThisOfType(stimPlanColors);
if (stimPlanColors) hasStimPlanParent = true;
#endif // USE_PROTOTYPE_FEATURE_FRACTURES
bool isCategoryResult = false;
{