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

PNS: Fix UseConnectedTrackWidth when starting from ARCs

This commit is contained in:
david-beinder 2021-04-06 00:48:28 +02:00 committed by Jon Evans
parent 5d3465c54c
commit b2f788adc1
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pcbnew/router/pns_kicad_iface.cpp
View File

@ -369,6 +369,25 @@ bool PNS_KICAD_IFACE_BASE::inheritTrackWidth( PNS::ITEM* aItem, int* aInheritedW
assert( aItem->Owner() != NULL );
auto tryGetTrackWidth =
[]( PNS::ITEM* aPnsItem ) -> int
{
switch( aPnsItem->Kind() )
{
case PNS::ITEM::SEGMENT_T: return static_cast<PNS::SEGMENT*>( aPnsItem )->Width();
case PNS::ITEM::ARC_T: return static_cast<PNS::ARC*>( aPnsItem )->Width();
default: return -1;
}
};
int itemTrackWidth = tryGetTrackWidth( aItem );
if( itemTrackWidth > 0 )
{
*aInheritedWidth = itemTrackWidth;
return true;
}
switch( aItem->Kind() )
{
case PNS::ITEM::VIA_T:
@ -379,10 +398,6 @@ bool PNS_KICAD_IFACE_BASE::inheritTrackWidth( PNS::ITEM* aItem, int* aInheritedW
p = static_cast<PNS::SOLID*>( aItem )->Pos();
break;
case PNS::ITEM::SEGMENT_T:
*aInheritedWidth = static_cast<PNS::SEGMENT*>( aItem )->Width();
return true;
default:
return false;
}
@ -394,11 +409,12 @@ bool PNS_KICAD_IFACE_BASE::inheritTrackWidth( PNS::ITEM* aItem, int* aInheritedW
int mval = INT_MAX;
PNS::ITEM_SET linkedSegs = jt->Links();
linkedSegs.ExcludeItem( aItem ).FilterKinds( PNS::ITEM::SEGMENT_T );
linkedSegs.ExcludeItem( aItem ).FilterKinds( PNS::ITEM::SEGMENT_T | PNS::ITEM::ARC_T );
for( PNS::ITEM* item : linkedSegs.Items() )
{
int w = static_cast<PNS::SEGMENT*>( item )->Width();
int w = tryGetTrackWidth( item );
assert( w > 0 );
mval = std::min( w, mval );
}