AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 22:13:44 +00:00
Files Issues Releases Activity

Pcbnew: Fix pad/via clearance lines

Browse Source 
After 4eb68c2840, we need to check the actual copper
layer represented by aLayer (i..e copperLayer), not
aLayer itself.
This commit is contained in:
John Beard 2024-12-29 02:40:40 +08:00
parent c77426cc12
commit e384628478
1 changed files with 7 additions and 6 deletions

13
pcbnew/pcb_painter.cpp
View File

@ -989,7 +989,7 @@ void PCB_PAINTER::draw( const PCB_VIA* aVia, int aLayer )
if( color == COLOR4D::CLEAR )
return;
int copperLayer = IsViaCopperLayer( aLayer ) ? aLayer - LAYER_VIA_COPPER_START : aLayer;
const int copperLayer = IsViaCopperLayer( aLayer ) ? aLayer - LAYER_VIA_COPPER_START : aLayer;
PCB_LAYER_ID currentLayer = ToLAYER_ID( copperLayer );
PCB_LAYER_ID layerTop, layerBottom;
@ -1218,9 +1218,10 @@ void PCB_PAINTER::draw( const PCB_VIA* aVia, int aLayer )
* of this, we choose to not display clearance lines at all on non-copper active layers as
* it's not clear which we'd be displaying.
*/
PCB_LAYER_ID activeLayer = m_pcbSettings.GetActiveLayer();
const PCB_LAYER_ID activeLayer = m_pcbSettings.GetActiveLayer();
if( IsCopperLayer( activeLayer ) && board->GetVisibleLayers().test( activeLayer ) )
if( activeLayer == copperLayer && IsCopperLayer( activeLayer )
&& board->GetVisibleLayers().test( activeLayer ) )
{
double radius;
@ -1244,7 +1245,7 @@ void PCB_PAINTER::draw( const PAD* aPad, int aLayer )
const BOARD* board = aPad->GetBoard();
COLOR4D color = m_pcbSettings.GetColor( aPad, aLayer );
int copperLayer = IsPadCopperLayer( aLayer ) ? aLayer - LAYER_PAD_COPPER_START : aLayer;
const int copperLayer = IsPadCopperLayer( aLayer ) ? aLayer - LAYER_PAD_COPPER_START : aLayer;
const PCB_LAYER_ID& pcbLayer = static_cast<PCB_LAYER_ID>( copperLayer );
@ -1757,9 +1758,9 @@ void PCB_PAINTER::draw( const PAD* aPad, int aLayer )
* we choose to not display clearance lines at all on non-copper active layers as it's
* not clear which we'd be displaying.
*/
PCB_LAYER_ID activeLayer = m_pcbSettings.GetActiveLayer();
const PCB_LAYER_ID activeLayer = m_pcbSettings.GetActiveLayer();
if( activeLayer == aLayer && IsCopperLayer( activeLayer )
if( activeLayer == copperLayer && IsCopperLayer( activeLayer )
&& board->GetVisibleLayers().test( activeLayer ) )
{
if( aPad->GetAttribute() == PAD_ATTRIB::NPTH )