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

#3482 Fix Eclipse property filter behaviour by reverting order of WellPathComponentType enum

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-10-10 10:06:52 +02:00
parent 06f91a6762
commit fbe7561896
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/Application/RiaDefines.cpp
View File

@ -77,6 +77,22 @@ namespace caf
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RiaDefines::WellPathComponentType> RiaDefines::wellPathCompletionTypes()
{
return { PERFORATION_INTERVAL, FISHBONES, FRACTURE, ICD, AICD, ICV };
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RiaDefines::WellPathComponentType> RiaDefines::wellPathAttributeTypes()
{
return { CASING, LINER, PACKER };
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

13
ApplicationCode/Application/RiaDefines.h
View File

@ -41,19 +41,22 @@ namespace RiaDefines
}; };
enum WellPathComponentType { enum WellPathComponentType {
// Well path construction features // Production Tube
WELL_PATH, WELL_PATH,
CASING,
LINER,
PACKER,
// Well path flow completions // Well path flow completions
PERFORATION_INTERVAL, PERFORATION_INTERVAL,
FISHBONES, FISHBONES,
FRACTURE, FRACTURE,
ICD, ICD,
AICD, AICD,
ICV ICV,
// Well path construction features
CASING,
LINER,
PACKER
}; };
std::vector<WellPathComponentType> wellPathCompletionTypes();
std::vector<WellPathComponentType> wellPathAttributeTypes();
bool isPerCellFaceResult(const QString& resultName); bool isPerCellFaceResult(const QString& resultName);

7
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@ -20,6 +20,8 @@
#include "RimEclipsePropertyFilter.h" #include "RimEclipsePropertyFilter.h"
#include "RiaDefines.h"
#include "RigCaseCellResultsData.h" #include "RigCaseCellResultsData.h"
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigFlowDiagResults.h" #include "RigFlowDiagResults.h"
@ -390,9 +392,10 @@ void RimEclipsePropertyFilter::computeResultValueRange()
else if (resultDefinition->resultVariable() == RiaDefines::completionTypeResultName()) else if (resultDefinition->resultVariable() == RiaDefines::completionTypeResultName())
{ {
std::vector<QString> ctNames; std::vector<QString> ctNames;
for (const QString& ctName : caf::AppEnum<RiaDefines::WellPathComponentType>::uiTexts()) ctNames.push_back(caf::AppEnum<RiaDefines::WellPathComponentType>::uiText(RiaDefines::WELL_PATH));
for (RiaDefines::WellPathComponentType type : RiaDefines::wellPathCompletionTypes())
{ {
ctNames.push_back(ctName); ctNames.push_back(caf::AppEnum<RiaDefines::WellPathComponentType>::uiText(type));
} }
setCategoryNames(ctNames); setCategoryNames(ctNames);
} }