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

PNS: Fix IsLineCorner logic 

Handle segment width test in the case of locked segs
Fix logic failure where vias on path cause crash

Fixes https://gitlab.com/kicad/code/kicad/-/issues/11990
This commit is contained in:
Jon Evans 2022-07-11 22:46:20 -04:00
parent 4b4d082fa4
commit 2512375988
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pcbnew/router/pns_joint.h
View File

@ -102,7 +102,15 @@ public:
*/ */
bool IsLineCorner( bool aAllowLockedSegs = false ) const bool IsLineCorner( bool aAllowLockedSegs = false ) const
{ {
if( m_linkedItems.Size() != 2 || m_linkedItems.Count( SEGMENT_T | ARC_T ) != 2 ) if( m_linkedItems.Size() == 2 && m_linkedItems.Count( SEGMENT_T | ARC_T ) == 2 )
{
LINKED_ITEM* seg1 = static_cast<LINKED_ITEM*>( m_linkedItems[0] );
LINKED_ITEM* seg2 = static_cast<LINKED_ITEM*>( m_linkedItems[1] );
// joints between segments of different widths are not considered trivial.
return seg1->Width() == seg2->Width();
}
else if( m_linkedItems.Size() > 2 && m_linkedItems.Count( SEGMENT_T | ARC_T ) == 2 )
{ {
if( !aAllowLockedSegs ) if( !aAllowLockedSegs )
{ {
@ -113,8 +121,10 @@ public:
else if( ( m_linkedItems.Size() - m_linkedItems.Count( SEGMENT_T | ARC_T ) ) else if( ( m_linkedItems.Size() - m_linkedItems.Count( SEGMENT_T | ARC_T ) )
== m_linkedItems.Count( VIA_T ) ) == m_linkedItems.Count( VIA_T ) )
{ {
const VIA* via = nullptr; const LINKED_ITEM* seg1 = nullptr;
bool hasNonVirtualVia = false; const LINKED_ITEM* seg2 = nullptr;
const VIA* via = nullptr;
bool hasNonVirtualVia = false;
for( const ITEM* item : m_linkedItems.CItems() ) for( const ITEM* item : m_linkedItems.CItems() )
{ {
@ -123,28 +133,26 @@ public:
via = static_cast<const VIA*>( item ); via = static_cast<const VIA*>( item );
hasNonVirtualVia = !via->IsVirtual(); hasNonVirtualVia = !via->IsVirtual();
}
if( hasNonVirtualVia ) else if( item->Kind() == SEGMENT_T || item->Kind() == ARC_T )
break; {
if( !seg1 )
seg1 = static_cast<const LINKED_ITEM*>( item );
else
seg2 = static_cast<const LINKED_ITEM*>( item );
} }
} }
assert( via );
if( !via || hasNonVirtualVia ) if( !via || hasNonVirtualVia )
return false; return false;
}
else assert ( seg1 && seg2 );
{
return false; return seg1->Width() == seg2->Width();
} }
} }
auto seg1 = static_cast<LINKED_ITEM*>( m_linkedItems[0] ); return false;
auto seg2 = static_cast<LINKED_ITEM*>( m_linkedItems[1] );
// joints between segments of different widths are not considered trivial.
return seg1->Width() == seg2->Width();
} }
bool IsNonFanoutVia() const bool IsNonFanoutVia() const