From 9ef37aca989e1d255bbeae8830848cafc3213a35 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 8 Sep 2020 09:29:13 +0200 Subject: [PATCH] #5315 Category Cell Results: Rename to Exclusively Category Colors --- ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp | 6 +++--- ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp index 1fd3bb0357..c29746f0aa 100644 --- a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp +++ b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.cpp @@ -127,9 +127,9 @@ template <> void AppEnum::setUp() { addItem( RimRegularLegendConfig::CategoryColorModeType::INTERPOLATE, "INTERPOLATE", "Interpolate" ); - addItem( RimRegularLegendConfig::CategoryColorModeType::COLOR_LEGEND_VALUES, + addItem( RimRegularLegendConfig::CategoryColorModeType::EXCLUSIVELY_COLORS, "COLOR_LEGEND_VALUES", - "Color Legend Values" ); + "Exclusively Category Colors" ); setDefault( RimRegularLegendConfig::CategoryColorModeType::INTERPOLATE ); } @@ -733,7 +733,7 @@ void RimRegularLegendConfig::updateCategoryItems() //-------------------------------------------------------------------------------------------------- void RimRegularLegendConfig::configureCategoryMapper() { - if ( m_categoryColorMode() == CategoryColorModeType::COLOR_LEGEND_VALUES ) + if ( m_categoryColorMode() == CategoryColorModeType::EXCLUSIVELY_COLORS ) { std::vector legendItems = m_colorLegend()->colorLegendItems(); cvf::Color3ubArray colorArray; diff --git a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h index ba35dbfda0..60e674c765 100644 --- a/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h +++ b/ApplicationCode/ProjectDataModel/RimRegularLegendConfig.h @@ -114,7 +114,7 @@ public: enum class CategoryColorModeType { INTERPOLATE, - COLOR_LEGEND_VALUES + EXCLUSIVELY_COLORS }; typedef caf::AppEnum CategoryColorModeEnum;