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

PNS::NODE Use PointCount instead of calculating segment index manually 

There is no need to manually calculate the segment index - we know
that the last point that was added is the start point of the segment.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/8945
This commit is contained in:
Roberto Fernandez Bautista 2021-08-13 17:13:54 +01:00
parent 4c3954aea8
commit aa67abb681
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pcbnew/router/pns_node.cpp
View File

@ -989,8 +989,6 @@ const LINE NODE::AssembleLine( LINKED_ITEM* aSeg, int* aOriginSegmentIndex,
if( li && prev_seg != li ) if( li && prev_seg != li )
{ {
int segIdxIncrement = 1;
if( li->Kind() == ITEM::ARC_T ) if( li->Kind() == ITEM::ARC_T )
{ {
const ARC* arc = static_cast<const ARC*>( li ); const ARC* arc = static_cast<const ARC*>( li );
@ -1001,13 +999,6 @@ const LINE NODE::AssembleLine( LINKED_ITEM* aSeg, int* aOriginSegmentIndex,
ssize_t lastShape = nSegs ? line.ArcIndex( static_cast<ssize_t>( nSegs ) - 1 ) : -1; ssize_t lastShape = nSegs ? line.ArcIndex( static_cast<ssize_t>( nSegs ) - 1 ) : -1;
line.Append( arcReversed[i] ? sa->Reversed() : *sa ); line.Append( arcReversed[i] ? sa->Reversed() : *sa );
segIdxIncrement = line.PointCount() - nSegs - 1;
// Are we adding an arc after an arc? add the hidden segment if the arcs overlap.
// If they don't overlap, don't add this, as it will have been added as a segment.
if( lastShape >= 0 && last == line.CPoint( nSegs ) )
segIdxIncrement++;
} }
pl.Link( li ); pl.Link( li );
@ -1017,11 +1008,9 @@ const LINE NODE::AssembleLine( LINKED_ITEM* aSeg, int* aOriginSegmentIndex,
{ {
wxASSERT( n < line.SegmentCount() || wxASSERT( n < line.SegmentCount() ||
( n == line.SegmentCount() && li->Kind() == ITEM::SEGMENT_T ) ); ( n == line.SegmentCount() && li->Kind() == ITEM::SEGMENT_T ) );
*aOriginSegmentIndex = n; *aOriginSegmentIndex = line.PointCount() - 1;
originSet = true; originSet = true;
} }
n += segIdxIncrement;
} }
prev_seg = li; prev_seg = li;