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

Special handling for connecting vias in hatched zones. 

Fixes https://gitlab.com/kicad/code/kicad/issues/2568
This commit is contained in:
Jeff Young 2020-08-05 23:39:54 +01:00
parent c3f8f57cd5
commit 6a4f611e61
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcbnew/connectivity/connectivity_algo.cpp
View File

@ -617,6 +617,14 @@ void CN_CONNECTIVITY_ALGO::MarkNetAsDirty( int aNet )
}
// Via contact with zones (especially if they're hatched) is a bit of a special case. Anchor
// contact (the center of the hole) doesn't really tell the whole story, but we don't want to
// go to cardinal points like we do with pads because we don't use thermals for vias.
//
// Instead we use an accuracy which is set to slightly less than the via width (less because
// single-point contact isn't electrically sufficient.
constexpr static double VIA_CONTACT_MINIMUM = 0.04;
void CN_VISITOR::checkZoneItemConnection( CN_ZONE* aZone, CN_ITEM* aItem )
{
if( aZone->Net() != aItem->Net() && !aItem->CanChangeNet() )
@ -625,11 +633,18 @@ void CN_VISITOR::checkZoneItemConnection( CN_ZONE* aZone, CN_ITEM* aItem )
if( !aZone->BBox().Intersects( aItem->BBox() ) )
return;
auto zoneItem = static_cast<CN_ZONE*> ( aZone );
CN_ZONE* zoneItem = static_cast<CN_ZONE*> ( aZone );
int accuracy = 0;
if( aItem->Valid() && aItem->Parent()->Type() == PCB_VIA_T )
{
int viaRadius = static_cast<VIA*>( aItem->Parent() )->GetWidth() / 2;
accuracy = KiROUND( viaRadius * ( 1.0 - VIA_CONTACT_MINIMUM ) );
}
for( int i = 0; i < aItem->AnchorCount(); ++i )
{
if( zoneItem->ContainsPoint( aItem->GetAnchor( i ) ) )
if( zoneItem->ContainsPoint( aItem->GetAnchor( i ), accuracy ) )
{
zoneItem->Connect( aItem );
aItem->Connect( zoneItem );
@ -661,7 +676,7 @@ void CN_VISITOR::checkZoneZoneConnection( CN_ZONE* aZoneA, CN_ZONE* aZoneB )
for( int i = 0; i < outline.PointCount(); i++ )
{
if( aZoneB->ContainsPoint( outline.CPoint( i ) ) )
if( aZoneB->ContainsPoint( outline.CPoint( i ), 0 ) )
{
aZoneA->Connect( aZoneB );
aZoneB->Connect( aZoneA );
@ -674,7 +689,7 @@ void CN_VISITOR::checkZoneZoneConnection( CN_ZONE* aZoneA, CN_ZONE* aZoneB )
for( int i = 0; i < outline2.PointCount(); i++ )
{
if( aZoneA->ContainsPoint( outline2.CPoint( i ) ) )
if( aZoneA->ContainsPoint( outline2.CPoint( i ), 0 ) )
{
aZoneA->Connect( aZoneB );
aZoneB->Connect( aZoneA );

6
pcbnew/connectivity/connectivity_items.h
View File

@ -372,14 +372,14 @@ public:
bool ContainsAnchor( const CN_ANCHOR_PTR anchor ) const
{
return ContainsPoint( anchor->Pos() );
return ContainsPoint( anchor->Pos(), 0 );
}
bool ContainsPoint( const VECTOR2I p ) const
bool ContainsPoint( const VECTOR2I p, int aAccuracy ) const
{
auto zone = static_cast<ZONE_CONTAINER*> ( Parent() );
int clearance = zone->GetFilledPolysUseThickness() ? zone->GetMinThickness() / 2 : 0;
return m_cachedPoly->ContainsPoint( p, clearance );
return m_cachedPoly->ContainsPoint( p, clearance + aAccuracy );
}
const BOX2I& BBox()