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

Avoid removing segments that do not maintain conns 

If the two segments being merged have connection points originally, then
the merged segment must have the same connection points.  We had been
moving the merged segment to match the original connections but this is
not as robust as just not merging these lines (and therefore leaving the
original)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/15495
This commit is contained in:
Seth Hillbrand 2024-01-05 11:38:16 -08:00
parent f5aa2ea8cf
commit d3e1e54b24
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcbnew/tracks_cleaner.cpp
View File

@ -85,7 +85,9 @@ void TRACKS_CLEANER::CleanupBoard( bool aDryRun,
wxSafeYield(); // Timeslice to update UI wxSafeYield(); // Timeslice to update UI
} }
cleanup( false, false, true, aMergeSegments ); // If we didn't remove duplicates above, do it now
if( !aMergeSegments )
cleanup( false, false, true, false );
if( aRemoveMisConnected ) if( aRemoveMisConnected )
{ {
@ -481,6 +483,7 @@ void TRACKS_CLEANER::cleanup( bool aDeleteDuplicateVias, bool aDeleteNullSegment
auto mergeSegments = auto mergeSegments =
[&]( std::shared_ptr<CN_CONNECTIVITY_ALGO> connectivity ) -> bool [&]( std::shared_ptr<CN_CONNECTIVITY_ALGO> connectivity ) -> bool
{ {
for( PCB_TRACK* segment : m_brd->Tracks() ) for( PCB_TRACK* segment : m_brd->Tracks() )
{ {
// one can merge only collinear segments, not vias or arcs. // one can merge only collinear segments, not vias or arcs.
@ -626,6 +629,8 @@ bool TRACKS_CLEANER::mergeCollinearSegments( PCB_TRACK* aSeg1, PCB_TRACK* aSeg2
collectPts( item ); collectPts( item );
} }
int64_t combined_length = aSeg1->GetLength() + aSeg2->GetLength();
// This means there is a node in the center // This means there is a node in the center
if( pts.size() > 2 ) if( pts.size() > 2 )
return false; return false;
@ -656,19 +661,12 @@ bool TRACKS_CLEANER::mergeCollinearSegments( PCB_TRACK* aSeg1, PCB_TRACK* aSeg2
dummy_seg.SetEnd( VECTOR2I( max_x, min_y ) ); dummy_seg.SetEnd( VECTOR2I( max_x, min_y ) );
} }
// If the existing connected points are not the same as the points generated by our // The new ends of the segment must be connected to all of the same points as the original
// min/max alg, then assign the missing points to the end closest. This ensures that // segments. If not, the segments cannot be merged.
// our replacement track is still connected
for( auto& pt : pts ) for( auto& pt : pts )
{ {
if( !dummy_seg.IsPointOnEnds( VECTOR2I( pt.x, pt.y ) ) ) if( !dummy_seg.IsPointOnEnds( pt ) )
{ return false;
if( ( VECTOR2I( dummy_seg.GetStart() ) - pt ).SquaredEuclideanNorm() <
( VECTOR2I( dummy_seg.GetEnd() ) - pt ).SquaredEuclideanNorm() )
dummy_seg.SetStart( VECTOR2I( pt.x, pt.y ) );
else
dummy_seg.SetEnd( VECTOR2I( pt.x, pt.y ) );
}
} }
// Now find the removed end(s) and stop merging if it is a node: // Now find the removed end(s) and stop merging if it is a node: