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

Color Legend : Make sure there are at least two color items (#7006)

Browse Source 
* #7004 Color Legend : Make sure there are at least two color items 

The interpolation methods require minimum two items
This commit is contained in:
Magne Sjaastad 2020-11-18 15:06:24 +01:00 committed by GitHub
parent f20939ffbd
commit 9884d531bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimColorLegend.cpp
View File

@ -25,6 +25,8 @@
#include "cafPdmFieldReorderCapability.h"
#include <algorithm>
CAF_PDM_SOURCE_INIT( RimColorLegend, "ColorLegend" );
//--------------------------------------------------------------------------------------------------
@ -94,6 +96,7 @@ void RimColorLegend::addReorderCapability()
void RimColorLegend::appendColorLegendItem( RimColorLegendItem* colorLegendItem )
{
m_colorLegendItems.push_back( colorLegendItem );
onColorLegendItemHasChanged();
}
//--------------------------------------------------------------------------------------------------
@ -143,11 +146,18 @@ void RimColorLegend::orderChanged( const caf::SignalEmitter* emitter )
cvf::Color3ubArray RimColorLegend::colorArray() const
{
std::vector<RimColorLegendItem*> legendItems = colorLegendItems();
cvf::Color3ubArray colorArray( legendItems.size() );
// The interpolation algorithm requires minimum two levels
size_t colorCount = std::max( size_t( 2 ), legendItems.size() );
cvf::Color3ubArray colorArray( colorCount );
colorArray.setAll( cvf::Color3ub::GRAY );
for ( size_t i = 0; i < legendItems.size(); i++ )
{
colorArray.set( i, cvf::Color3ub( legendItems[i]->color() ) );
}
return colorArray;
}