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

#912 Fixed the custom option menue based on the new standard from caf. Added an "experimental" color range for angular results.

Browse Source
This commit is contained in:
Jacob Støren 2016-10-13 12:13:32 +02:00
parent eb066a71b0
commit f4fde3cc1c
2 changed files with 48 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -72,6 +72,7 @@ namespace caf {
addItem(RimLegendConfig::WHITE_BLACK, "WHITE_BLACK", "White to black"); addItem(RimLegendConfig::WHITE_BLACK, "WHITE_BLACK", "White to black");
addItem(RimLegendConfig::BLACK_WHITE, "BLACK_WHITE", "Black to white"); addItem(RimLegendConfig::BLACK_WHITE, "BLACK_WHITE", "Black to white");
addItem(RimLegendConfig::CATEGORY, "CATEGORY", "Category colors"); addItem(RimLegendConfig::CATEGORY, "CATEGORY", "Category colors");
addItem(RimLegendConfig::ANGULAR, "ANGULAR", "Full color cyclic");
setDefault(RimLegendConfig::NORMAL); setDefault(RimLegendConfig::NORMAL);
} }
} }
@ -370,6 +371,21 @@ void RimLegendConfig::updateLegend()
} }
break; break;
case ANGULAR:
{
legendColors.reserve(9);
legendColors.add(cvf::Color3ub(255, 0, 255));
legendColors.add(cvf::Color3ub(0, 0, 255));
legendColors.add(cvf::Color3ub(0, 127, 255));
legendColors.add(cvf::Color3ub(0, 255, 255));
legendColors.add(cvf::Color3ub(0, 255, 0));
legendColors.add(cvf::Color3ub(255, 255, 0));
legendColors.add(cvf::Color3ub(255, 127, 0));
legendColors.add(cvf::Color3ub(255, 0, 0));
legendColors.add(cvf::Color3ub(255, 0, 255));
}
break;
} }
m_linDiscreteScalarMapper->setColors(legendColors); m_linDiscreteScalarMapper->setColors(legendColors);
@ -769,7 +785,6 @@ void RimLegendConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering&
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{ {
QStringList optionTexts;
bool isCategoryResult = false; bool isCategoryResult = false;
{ {
@ -788,45 +803,52 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
} }
} }
QList<caf::PdmOptionItemInfo> optionList;
if (fieldNeedingOptions == &m_mappingMode) if (fieldNeedingOptions == &m_mappingMode)
{ {
// This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of this type // This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of this type
std::vector<MappingType> mappingTypes;
optionTexts << m_mappingMode.v().uiText(LINEAR_DISCRETE); mappingTypes.push_back(LINEAR_DISCRETE);
optionTexts << m_mappingMode.v().uiText(LINEAR_CONTINUOUS); mappingTypes.push_back(LINEAR_CONTINUOUS);
optionTexts << m_mappingMode.v().uiText(LOG10_CONTINUOUS); mappingTypes.push_back(LOG10_CONTINUOUS);
optionTexts << m_mappingMode.v().uiText(LOG10_DISCRETE); mappingTypes.push_back(LOG10_DISCRETE);
if (isCategoryResult) if (isCategoryResult)
{ {
optionTexts << m_mappingMode.v().uiText(CATEGORY_INTEGER); mappingTypes.push_back(CATEGORY_INTEGER);
}
for(MappingType mapType: mappingTypes)
{
optionList.push_back(caf::PdmOptionItemInfo(MappingEnum::uiText(mapType), mapType));
} }
} }
else if (fieldNeedingOptions == &m_colorRangeMode) else if (fieldNeedingOptions == &m_colorRangeMode)
{ {
// This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of this type // This is an app enum field, see cafInternalPdmFieldTypeSpecializations.h for the default specialization of this type
std::vector<ColorRangesType> rangeTypes;
optionTexts << m_colorRangeMode.v().uiText(NORMAL); rangeTypes.push_back(NORMAL);
optionTexts << m_colorRangeMode.v().uiText(OPPOSITE_NORMAL); rangeTypes.push_back(OPPOSITE_NORMAL);
optionTexts << m_colorRangeMode.v().uiText(WHITE_PINK); rangeTypes.push_back(WHITE_PINK);
optionTexts << m_colorRangeMode.v().uiText(PINK_WHITE); rangeTypes.push_back(PINK_WHITE);
optionTexts << m_colorRangeMode.v().uiText(BLUE_WHITE_RED); rangeTypes.push_back(BLUE_WHITE_RED);
optionTexts << m_colorRangeMode.v().uiText(RED_WHITE_BLUE); rangeTypes.push_back(RED_WHITE_BLUE);
optionTexts << m_colorRangeMode.v().uiText(WHITE_BLACK); rangeTypes.push_back(WHITE_BLACK);
optionTexts << m_colorRangeMode.v().uiText(BLACK_WHITE); rangeTypes.push_back(BLACK_WHITE);
rangeTypes.push_back(ANGULAR);
if (isCategoryResult) if (isCategoryResult)
{ {
optionTexts << m_colorRangeMode.v().uiText(CATEGORY); rangeTypes.push_back(CATEGORY);
}
for(ColorRangesType colType: rangeTypes)
{
optionList.push_back(caf::PdmOptionItemInfo(ColorRangeEnum::uiText(colType), colType));
} }
} }
QList<caf::PdmOptionItemInfo> optionList;
for (int i = 0; i < optionTexts.size(); ++i)
{
optionList.push_back(caf::PdmOptionItemInfo(optionTexts[i], static_cast<unsigned int>(i)));
}
return optionList; return optionList;
} }

3
ApplicationCode/ProjectDataModel/RimLegendConfig.h
View File

@ -80,7 +80,8 @@ public:
BLACK_WHITE, BLACK_WHITE,
BLUE_WHITE_RED, BLUE_WHITE_RED,
RED_WHITE_BLUE, RED_WHITE_BLUE,
CATEGORY CATEGORY,
ANGULAR
}; };
typedef caf::AppEnum<ColorRangesType> ColorRangeEnum; typedef caf::AppEnum<ColorRangesType> ColorRangeEnum;