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

#3492 Tidy up color code for well path components/completions and select colors that work better.

Browse Source
This commit is contained in:
Gaute Lindkvist
2018-10-11 16:03:49 +02:00
parent 8464d19696
commit 2035df2739
18 changed files with 139 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/Application/RiaDefines.cpp
View File

@@ -76,23 +76,6 @@ 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 };
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/Application/RiaDefines.h
View File

@@ -55,8 +55,6 @@ namespace RiaDefines
LINER,
PACKER
};
std::vector<WellPathComponentType> wellPathCompletionTypes();
std::vector<WellPathComponentType> wellPathAttributeTypes();
bool isPerCellFaceResult(const QString& resultName);

19
ApplicationCode/Application/Tools/RiaColorTables.cpp
View File

@@ -511,15 +511,20 @@ cvf::Color3f RiaColorTables::undefinedCellColor()
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
cvf::Color3f RiaColorTables::perforationLengthColor()
RiaColorTables::WellPathComponentColors RiaColorTables::wellPathComponentColors()
{
// based on hwb ( 85, 9%, 67%) dark_olive_green
// added 10 to each component
cvf::Color3ub color(69, 94, 33);
return cvf::Color3f(color);
return {{RiaDefines::WELL_PATH, cvf::Color3::CEETRON},
{RiaDefines::PERFORATION_INTERVAL, cvf::Color3::DARK_MAGENTA},
{RiaDefines::FISHBONES, cvf::Color3::DARK_GREEN},
{RiaDefines::FRACTURE, cvf::Color3::CRIMSON},
{RiaDefines::ICD, cvf::Color3::DARK_ORANGE},
{RiaDefines::AICD, cvf::Color3::INDIGO},
{RiaDefines::ICV, cvf::Color3::ORCHID},
{RiaDefines::CASING, cvf::Color3::SEA_GREEN},
{RiaDefines::LINER, cvf::Color3::OLIVE},
{RiaDefines::PACKER, cvf::Color3::GRAY}};
}
//--------------------------------------------------------------------------------------------------

8
ApplicationCode/Application/Tools/RiaColorTables.h
View File

@@ -18,8 +18,9 @@
#pragma once
#include "RiaDefines.h"
#include "cafColorTable.h"
#include <map>
//==================================================================================================
///
@@ -28,6 +29,8 @@
class RiaColorTables
{
public:
typedef std::map<RiaDefines::WellPathComponentType, cvf::Color3::ColorIdent> WellPathComponentColors;
static const caf::ColorTable& normalPaletteColors();
static const caf::ColorTable& normalPaletteOppositeOrderingColors();
static const caf::ColorTable& blackWhitePaletteColors();
@@ -57,7 +60,8 @@ public:
static const caf::ColorTable& wellPathsPaletteColors();
static cvf::Color3f undefinedCellColor();
static cvf::Color3f perforationLengthColor();
static WellPathComponentColors wellPathComponentColors();
private:
static std::vector<cvf::Color3ub> categoryColors();