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

Implement multi-layer stitching via logic.

This commit is contained in:
Jeff Young 2022-02-24 21:09:47 +00:00
parent 369f53bb19
commit d65f9ad2d8
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pcbnew/tools/drawing_tool.cpp
View File

@ -2615,37 +2615,32 @@ int DRAWING_TOOL::DrawVia( const TOOL_EVENT& aEvent )
int findStitchedZoneNet( PCB_VIA* aVia ) int findStitchedZoneNet( PCB_VIA* aVia )
{ {
const VECTOR2I position = aVia->GetPosition(); const VECTOR2I position = aVia->GetPosition();
const LSET lset = aVia->GetLayerSet(); const LSET lset = aVia->GetLayerSet();
std::vector<ZONE*> foundZones; // first take the net of the active layer
if( lset.test( m_frame->GetActiveLayer() ) )
for( ZONE* zone : m_board->Zones() )
{ {
for( PCB_LAYER_ID layer : LSET( zone->GetLayerSet() & lset ).Seq() ) for( ZONE* z : m_board->Zones() )
{ {
if( zone->HitTestFilledArea( layer, position ) ) if( z->IsOnLayer( m_frame->GetActiveLayer() ) )
foundZones.push_back( zone ); {
if( z->HitTestFilledArea( m_frame->GetActiveLayer(), position ) )
return z->GetNetCode();
}
} }
} }
std::sort( foundZones.begin(), foundZones.end(),
[] ( const ZONE* a, const ZONE* b )
{
return a->GetFirstLayer() < b->GetFirstLayer();
} );
// first take the net of the active layer
for( ZONE* z : foundZones )
{
if( m_frame->GetActiveLayer() == z->GetLayer() )
return z->GetNetCode();
}
// none? take the topmost visible layer // none? take the topmost visible layer
for( ZONE* z : foundZones ) for( PCB_LAYER_ID layer : LSET( m_board->GetVisibleLayers() & lset ).Seq() )
{ {
if( m_board->IsLayerVisible( z->GetLayer() ) ) for( ZONE* z : m_board->Zones() )
return z->GetNetCode(); {
if( z->IsOnLayer( m_frame->GetActiveLayer() ) )
{
if( z->HitTestFilledArea( layer, position ) )
return z->GetNetCode();
}
}
} }
return -1; return -1;