haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GERBVIEW_RENDER_SETTINGS: verify item type 

Not all items displayed by Gerbview are GERBER_DRAW_ITEMs (e.g. WORKSHEET_VIEWITEM),
so appropriate checks have been added.
This commit is contained in:
Maciej Suminski 2018-09-18 15:18:55 +02:00
parent adb89afe6c
commit 40a3b4a533
1 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
gerbview/gerbview_painter.cpp
View File

@ -99,37 +99,38 @@ void GERBVIEW_RENDER_SETTINGS::LoadDisplayOptions( const GBR_DISPLAY_OPTIONS* aO
const COLOR4D& GERBVIEW_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) const const COLOR4D& GERBVIEW_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) const
{ {
const GERBER_DRAW_ITEM* item = static_cast<const GERBER_DRAW_ITEM*>( aItem ); const EDA_ITEM* item = static_cast<const EDA_ITEM*>( aItem );
static const COLOR4D transparent = COLOR4D( 0, 0, 0, 0 ); static const COLOR4D transparent = COLOR4D( 0, 0, 0, 0 );
const GERBER_DRAW_ITEM* gbrItem = nullptr;
if( item && item->Type() == GERBER_DRAW_ITEM_T )
gbrItem = static_cast<const GERBER_DRAW_ITEM*>( item );
// All DCODE layers stored under a single color setting // All DCODE layers stored under a single color setting
if( IsDCodeLayer( aLayer ) ) if( IsDCodeLayer( aLayer ) )
return m_layerColors[ LAYER_DCODES ]; return m_layerColors[ LAYER_DCODES ];
if( item ) if( item && item->IsSelected() )
{ return m_layerColorsSel[aLayer];
if( item->IsSelected() )
return m_layerColorsSel[aLayer];
if( item->GetLayerPolarity() ) if( gbrItem && gbrItem->GetLayerPolarity() )
{ {
if( m_showNegativeItems ) if( m_showNegativeItems )
return m_layerColors[LAYER_NEGATIVE_OBJECTS]; return m_layerColors[LAYER_NEGATIVE_OBJECTS];
else else
return transparent; return transparent;
}
} }
if( !m_netHighlightString.IsEmpty() && item && if( !m_netHighlightString.IsEmpty() && gbrItem &&
m_netHighlightString == item->GetNetAttributes().m_Netname ) m_netHighlightString == gbrItem->GetNetAttributes().m_Netname )
return m_layerColorsHi[aLayer]; return m_layerColorsHi[aLayer];
if( !m_componentHighlightString.IsEmpty() && item && if( !m_componentHighlightString.IsEmpty() && gbrItem &&
m_componentHighlightString == item->GetNetAttributes().m_Cmpref ) m_componentHighlightString == gbrItem->GetNetAttributes().m_Cmpref )
return m_layerColorsHi[aLayer]; return m_layerColorsHi[aLayer];
if( !m_attributeHighlightString.IsEmpty() && item && item->GetDcodeDescr() && if( !m_attributeHighlightString.IsEmpty() && gbrItem && gbrItem->GetDcodeDescr() &&
m_attributeHighlightString == item->GetDcodeDescr()->m_AperFunction ) m_attributeHighlightString == gbrItem->GetDcodeDescr()->m_AperFunction )
return m_layerColorsHi[aLayer]; return m_layerColorsHi[aLayer];
// Return grayish color for non-highlighted layers in the high contrast mode // Return grayish color for non-highlighted layers in the high contrast mode