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

Fix yet another edge case in B&W printing of holes. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7944
This commit is contained in:
Jeff Young 2021-03-18 23:20:35 +00:00
parent af88b01068
commit 4034fcb7ac
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pcbnew/pcb_painter.cpp
View File

@ -235,19 +235,22 @@ COLOR4D PCB_RENDER_SETTINGS::GetColor( const VIEW_ITEM* aItem, int aLayer ) cons
const PAD* pad = dynamic_cast<const PAD*>( item ); const PAD* pad = dynamic_cast<const PAD*>( item );
const VIA* via = dynamic_cast<const VIA*>( item ); const VIA* via = dynamic_cast<const VIA*>( item );
int holeLayer = aLayer; int holeLayer = aLayer;
int annularRingLayer; int annularRingLayer = UNDEFINED_LAYER;
if( pad ) if( pad && pad->GetAttribute() == PAD_ATTRIB_PTH )
annularRingLayer = LAYER_PADS_TH; annularRingLayer = LAYER_PADS_TH;
else if( via && via->GetViaType() == VIATYPE::MICROVIA ) else if( via && via->GetViaType() == VIATYPE::MICROVIA )
annularRingLayer = LAYER_VIA_MICROVIA; annularRingLayer = LAYER_VIA_MICROVIA;
else if( via && via->GetViaType() == VIATYPE::BLIND_BURIED ) else if( via && via->GetViaType() == VIATYPE::BLIND_BURIED )
annularRingLayer = LAYER_VIA_BBLIND; annularRingLayer = LAYER_VIA_BBLIND;
else else if( via && via->GetViaType() == VIATYPE::THROUGH )
annularRingLayer = LAYER_VIA_THROUGH; annularRingLayer = LAYER_VIA_THROUGH;
if( m_layerColors[ holeLayer ] == m_layerColors[ annularRingLayer ] ) if( annularRingLayer != UNDEFINED_LAYER
&& m_layerColors[ holeLayer ] == m_layerColors[ annularRingLayer ] )
{
aLayer = LAYER_PCB_BACKGROUND; aLayer = LAYER_PCB_BACKGROUND;
}
} }
// Zones should pull from the copper layer // Zones should pull from the copper layer