From ade893099f8823ea6fe61caf6a93b5822f32f362 Mon Sep 17 00:00:00 2001 From: Gaute Lindkvist Date: Thu, 11 Oct 2018 13:03:36 +0200 Subject: [PATCH] #3490 Fix interpretation of fracture cell intersections in 3D view. * Also fix typo in variable name. --- ApplicationCode/Application/RiaDefines.cpp | 6 +++--- .../ProjectDataModel/RimEclipseCellColors.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ApplicationCode/Application/RiaDefines.cpp b/ApplicationCode/Application/RiaDefines.cpp index de9ab34351..f00f66f62b 100644 --- a/ApplicationCode/Application/RiaDefines.cpp +++ b/ApplicationCode/Application/RiaDefines.cpp @@ -63,15 +63,15 @@ namespace caf void caf::AppEnum< RiaDefines::WellPathComponentType >::setUp() { addItem(RiaDefines::WELL_PATH, "WELL_PATH", "Well Path"); - addItem(RiaDefines::CASING, "CASING", "Casing"); - addItem(RiaDefines::LINER, "LINER", "Liner"); - addItem(RiaDefines::PACKER, "PACKER", "Packer"); addItem(RiaDefines::PERFORATION_INTERVAL, "PERFORATION_INTERVAL", "Perforation Interval"); addItem(RiaDefines::FISHBONES, "FISHBONES", "Fishbones"); addItem(RiaDefines::FRACTURE, "FRACTURE", "Fracture"); addItem(RiaDefines::ICD, "ICD", "ICD"); addItem(RiaDefines::AICD, "AICD", "AICD"); addItem(RiaDefines::ICV, "ICV", "ICV"); + addItem(RiaDefines::CASING, "CASING", "Casing"); + addItem(RiaDefines::LINER, "LINER", "Liner"); + addItem(RiaDefines::PACKER, "PACKER", "Packer"); setDefault(RiaDefines::WELL_PATH); } } diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp index 1d68947fc7..90670de92f 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipseCellColors.cpp @@ -400,24 +400,24 @@ void RimEclipseCellColors::updateLegendData(size_t currentTimeStep, caf::AppEnum perforationInterval(RiaDefines::PERFORATION_INTERVAL); caf::AppEnum fracture(RiaDefines::FRACTURE); - const std::vector& visibleCatetories = cellResultsData->uniqueCellScalarValues(this->scalarResultIndex()); + const std::vector& visibleCategories = cellResultsData->uniqueCellScalarValues(this->scalarResultIndex()); - if (std::find(visibleCatetories.begin(), visibleCatetories.end(), wellPath.index()) != visibleCatetories.end()) + if (std::find(visibleCategories.begin(), visibleCategories.end(), wellPath.index()) != visibleCategories.end()) { categories.push_back(std::make_tuple(wellPath.uiText(), static_cast(wellPath.index()), cvf::Color3::RED)); } - if (std::find(visibleCatetories.begin(), visibleCatetories.end(), fishbone.index()) != visibleCatetories.end()) + if (std::find(visibleCategories.begin(), visibleCategories.end(), fishbone.index()) != visibleCategories.end()) { categories.push_back(std::make_tuple(fishbone.uiText(), static_cast(fishbone.index()), cvf::Color3::DARK_GREEN)); } - if (std::find(visibleCatetories.begin(), visibleCatetories.end(), perforationInterval.index()) != visibleCatetories.end()) + if (std::find(visibleCategories.begin(), visibleCategories.end(), perforationInterval.index()) != visibleCategories.end()) { categories.push_back(std::make_tuple(perforationInterval.uiText(), static_cast(perforationInterval.index()), cvf::Color3::GREEN)); } - if (std::find(visibleCatetories.begin(), visibleCatetories.end(), fracture.index()) != visibleCatetories.end()) + if (std::find(visibleCategories.begin(), visibleCategories.end(), fracture.index()) != visibleCategories.end()) { categories.push_back(std::make_tuple(fracture.uiText(), static_cast(fracture.index()), cvf::Color3::YELLOW_GREEN)); }