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

Improve performance of checkZoneZoneConnection.

This commit is contained in:
Jeff Young 2022-02-14 01:07:25 +00:00
parent 4e5b30ad80
commit d07910de06
2 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -681,6 +681,9 @@ void CN_VISITOR::checkZoneItemConnection( CN_ZONE_LAYER* aZoneLayer, CN_ITEM* aI
void CN_VISITOR::checkZoneZoneConnection( CN_ZONE_LAYER* aZoneLayerA, CN_ZONE_LAYER* aZoneLayerB ) void CN_VISITOR::checkZoneZoneConnection( CN_ZONE_LAYER* aZoneLayerA, CN_ZONE_LAYER* aZoneLayerB )
{ {
const ZONE* zoneA = static_cast<const ZONE*>( aZoneLayerA->Parent() );
const ZONE* zoneB = static_cast<const ZONE*>( aZoneLayerB->Parent() );
if( aZoneLayerA->Layer() != aZoneLayerB->Layer() ) if( aZoneLayerA->Layer() != aZoneLayerB->Layer() )
return; return;
@ -695,10 +698,36 @@ void CN_VISITOR::checkZoneZoneConnection( CN_ZONE_LAYER* aZoneLayerA, CN_ZONE_LA
PCB_LAYER_ID layer = static_cast<PCB_LAYER_ID>( aZoneLayerA->Layer() ); PCB_LAYER_ID layer = static_cast<PCB_LAYER_ID>( aZoneLayerA->Layer() );
if( aZoneLayerA->Collide( aZoneLayerB->Parent()->GetEffectiveShape( layer ).get() ) ) const SHAPE_LINE_CHAIN& outline =
zoneA->GetFilledPolysList( layer ).COutline( aZoneLayerA->SubpolyIndex() );
for( int i = 0; i < outline.PointCount(); i++ )
{ {
aZoneLayerA->Connect( aZoneLayerB ); if( !boxB.Contains( outline.CPoint( i ) ) )
aZoneLayerB->Connect( aZoneLayerA ); continue;
if( aZoneLayerB->ContainsPoint( outline.CPoint( i ) ) )
{
aZoneLayerA->Connect( aZoneLayerB );
aZoneLayerB->Connect( aZoneLayerA );
return;
}
}
const SHAPE_LINE_CHAIN& outline2 =
zoneB->GetFilledPolysList( layer ).COutline( aZoneLayerB->SubpolyIndex() );
for( int i = 0; i < outline2.PointCount(); i++ )
{
if( !boxA.Contains( outline2.CPoint( i ) ) )
continue;
if( aZoneLayerA->ContainsPoint( outline2.CPoint( i ) ) )
{
aZoneLayerA->Connect( aZoneLayerB );
aZoneLayerB->Connect( aZoneLayerA );
return;
}
} }
} }

23
pcbnew/connectivity/connectivity_items.h
View File

@ -313,6 +313,29 @@ public:
return m_subpolyIndex; return m_subpolyIndex;
} }
bool ContainsPoint( const VECTOR2I& p ) const
{
int min[2] = { p.x, p.y };
int max[2] = { p.x, p.y };
bool collision = false;
auto visitor =
[&]( const SHAPE* aShape ) -> bool
{
if( aShape->Collide( p ) )
{
collision = true;
return false;
}
return true;
};
m_rTree.Search( min, max, visitor );
return collision;
}
PCB_LAYER_ID GetLayer() { return m_layer; } PCB_LAYER_ID GetLayer() { return m_layer; }
virtual int AnchorCount() const override; virtual int AnchorCount() const override;