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

Don't connect disparate nets 

Only some elements get their nets assigned based on connectivity.  Other
elements should be keps in different clusters for connection

Fixes https://gitlab.com/kicad/code/kicad/issues/12622

(cherry picked from commit c9f11827a7)
This commit is contained in:
Seth Hillbrand 2022-10-11 23:02:22 +01:00 committed by Jeff Young
parent af159c9841
commit 2ca7a76693
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -669,10 +669,9 @@ void CN_CONNECTIVITY_ALGO::MarkNetAsDirty( int aNet )
void CN_VISITOR::checkZoneItemConnection( CN_ZONE_LAYER* aZoneLayer, CN_ITEM* aItem )
{
if( aZoneLayer->Net() != aItem->Net() && !aItem->CanChangeNet() )
return;
PCB_LAYER_ID layer = aZoneLayer->GetLayer();
if( !aZoneLayer->BBox().Intersects( aItem->BBox() ) )
if( !aItem->Parent()->IsOnLayer( layer ) )
return;
int accuracy = 0;
@ -703,9 +702,6 @@ void CN_VISITOR::checkZoneZoneConnection( CN_ZONE_LAYER* aZoneLayerA, CN_ZONE_LA
if( aZoneLayerA->Layer() != aZoneLayerB->Layer() )
return;
if( aZoneLayerB->Net() != aZoneLayerA->Net() )
return; // we only test zones belonging to the same net
const BOX2I& boxA = aZoneLayerA->BBox();
const BOX2I& boxB = aZoneLayerB->BBox();
@ -765,6 +761,10 @@ bool CN_VISITOR::operator()( CN_ITEM* aCandidate )
if( parentA == parentB )
return true;
// Don't connect items in different nets that can't be changed
if( !aCandidate->CanChangeNet() && !m_item->CanChangeNet() && aCandidate->Net() != m_item->Net() )
return true;
LSET commonLayers = parentA->GetLayerSet() & parentB->GetLayerSet();
if( !commonLayers.any() )