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

#2496 Tensor vectors: Use dark magenta for principal 1 and move color code to RiaColorTables

Browse Source
This commit is contained in:
Rebecca Cox 2018-02-20 14:27:03 +01:00
parent 479247dc4d
commit b69b15145f
3 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,6 +190,36 @@ const caf::ColorTable& RiaColorTables::categoryPaletteColors()
return colorTable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const caf::ColorTable& RiaColorTables::tensorWhiteGrayBlackPaletteColors()
{
static std::vector<cvf::Color3ub> colors{
cvf::Color3ub::WHITE,
cvf::Color3ub::GRAY,
cvf::Color3ub::BLACK,
};
static caf::ColorTable colorTable = caf::ColorTable(colors);
return colorTable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const caf::ColorTable& RiaColorTables::tensorMagentaBrownBlackPaletteColors()
{
static std::vector<cvf::Color3ub> colors{
cvf::Color3ub::DARK_MAGENTA,
cvf::Color3ub::BROWN,
cvf::Color3ub::BLACK,
};
static caf::ColorTable colorTable = caf::ColorTable(colors);
return colorTable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

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

@ -37,6 +37,8 @@ public:
static const caf::ColorTable& blueWhiteRedPaletteColors();
static const caf::ColorTable& redWhiteBluePaletteColors();
static const caf::ColorTable& categoryPaletteColors();
static const caf::ColorTable& tensorWhiteGrayBlackPaletteColors();
static const caf::ColorTable& tensorMagentaBrownBlackPaletteColors();
static const caf::ColorTable& angularPaletteColors();
static const caf::ColorTable& stimPlanPaletteColors();
static const caf::ColorTable& faultsPaletteColors();

10
ApplicationCode/ModelVisualization/RivTensorResultPartMgr.cpp
View File

@ -18,6 +18,8 @@
#include "RivTensorResultPartMgr.h"
#include "RiaColorTables.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechView.h"
#include "RimLegendConfig.h"
@ -382,15 +384,11 @@ void RivTensorResultPartMgr::createOneColorPerPrincipalScalarMapper(const RimTen
arrowColors.resize(3);
if (colorSet == RimTensorResults::MAGENTA_BROWN_BLACK)
{
arrowColors[0] = cvf::Color3::MAGENTA;
arrowColors[1] = cvf::Color3::BROWN;
arrowColors[2] = cvf::Color3::BLACK;
arrowColors = RiaColorTables::tensorMagentaBrownBlackPaletteColors().color3ubArray();
}
else if (colorSet == RimTensorResults::WHITE_GRAY_BLACK)
{
arrowColors[0] = cvf::Color3::WHITE;
arrowColors[1] = cvf::Color3::GRAY;
arrowColors[2] = cvf::Color3::BLACK;
arrowColors = RiaColorTables::tensorWhiteGrayBlackPaletteColors().color3ubArray();
}
scalarMapper->setColors(arrowColors);