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

#829 Fixed crash due to color interpolation assert

Browse Source
This commit is contained in:
Jacob Støren 2016-09-12 14:04:53 +02:00
parent 0b4a0fef4c
commit e2d200de88
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Fwk/AppFwk/cafVizExtensions/cafCategoryMapper.cpp
View File

@ -64,13 +64,21 @@ void CategoryMapper::setCycleColors(const Color3ubArray& colorArray)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void CategoryMapper::setInterpolateColors(const cvf::Color3ubArray& colorArray) void CategoryMapper::setInterpolateColors(const cvf::Color3ubArray& colorArray)
{ {
if (m_categoryValues.size() > 0) CVF_ASSERT(colorArray.size());
if (m_categoryValues.size() > 1 && colorArray.size() > 1)
{ {
m_colors = *interpolateColorArray(colorArray, static_cast<cvf::uint>(m_categoryValues.size())); m_colors = *interpolateColorArray(colorArray, static_cast<cvf::uint>(m_categoryValues.size()));
return;
} }
else
// Either we are requesting one output color, or we have only one input color
m_colors.clear();
m_colors.reserve(m_categoryValues.size());
for (size_t cIdx = 0; cIdx < m_categoryValues.size(); ++cIdx)
{ {
m_colors.clear(); m_colors.add(colorArray[0]);
} }
} }