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

router: partially migrate SHOVE algorithm to use new DEBUG_DECORATOR

This commit is contained in:
Tomasz Wlostowski 2021-02-11 23:07:40 +01:00
parent 0e6cf3f56e
commit 34c037684b
1 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
pcbnew/router/pns_shove.cpp
View File

@ -210,7 +210,10 @@ SHOVE::SHOVE_STATUS SHOVE::shoveLineToHullSet( const LINE& aCurLine, const LINE&
const SHAPE_LINE_CHAIN& hull = aHulls[invertTraversal ? aHulls.size() - 1 - i : i]; const SHAPE_LINE_CHAIN& hull = aHulls[invertTraversal ? aHulls.size() - 1 - i : i];
if( ! l.Walkaround( hull, path, clockwise ) ) if( ! l.Walkaround( hull, path, clockwise ) )
{
wxLogTrace("PNS", "Fail-Walk %s %s %d\n", hull.Format().c_str(), l.CLine().Format().c_str(), clockwise? 1:0);
return SH_INCOMPLETE; return SH_INCOMPLETE;
}
path.Simplify(); path.Simplify();
l.SetShape( path ); l.SetShape( path );
@ -409,13 +412,19 @@ SHOVE::SHOVE_STATUS SHOVE::onCollidingSegment( LINE& aCurrent, SEGMENT* aObstacl
assert( obstacleLine.LayersOverlap( &shovedLine ) ); assert( obstacleLine.LayersOverlap( &shovedLine ) );
#if 0 if( Dbg() )
m_logger.NewGroup( "on-colliding-segment", m_iter ); {
m_logger.Log( &tmp, 0, "obstacle-segment" ); Dbg()->BeginGroup( wxString::Format( "on-colliding-segment-iter-%d", m_iter ).ToStdString() );
m_logger.Log( &aCurrent, 1, "current-line" ); Dbg()->AddSegment( tmp.Seg(), 0, "obstacle-segment" );
m_logger.Log( &obstacleLine, 2, "obstacle-line" ); Dbg()->AddLine( aCurrent.CLine(), 1, 10000, "current-line" );
m_logger.Log( &shovedLine, 3, "shoved-line" ); Dbg()->AddLine( obstacleLine.CLine(), 2, 10000, "obstacle-line" );
#endif Dbg()->AddLine( shovedLine.CLine(), 3, 10000, "shoved-line" );
if( rv == SH_OK )
Dbg()->Message("Shove success");
else
Dbg()->Message("Shove FAIL");
Dbg()->EndGroup();
}
if( rv == SH_OK ) if( rv == SH_OK )
{ {
@ -470,13 +479,15 @@ SHOVE::SHOVE_STATUS SHOVE::onCollidingArc( LINE& aCurrent, ARC* aObstacleArc )
assert( obstacleLine.LayersOverlap( &shovedLine ) ); assert( obstacleLine.LayersOverlap( &shovedLine ) );
#if 0 if ( Dbg() )
m_logger.NewGroup( "on-colliding-segment", m_iter ); {
m_logger.Log( &tmp, 0, "obstacle-segment" ); Dbg()->BeginGroup( wxString::Format( "on-colliding-arc-iter-%d", m_iter ).ToStdString() );
m_logger.Log( &aCurrent, 1, "current-line" ); Dbg()->AddLine( tmp.CLine(), 0, 10000, "obstacle-segment" );
m_logger.Log( &obstacleLine, 2, "obstacle-line" ); Dbg()->AddLine( aCurrent.CLine(), 1, 10000, "current-line" );
m_logger.Log( &shovedLine, 3, "shoved-line" ); Dbg()->AddLine( obstacleLine.CLine(), 2, 10000, "obstacle-line" );
#endif Dbg()->AddLine( shovedLine.CLine(), 3, 10000, "shoved-line" );
Dbg()->EndGroup();
}
if( rv == SH_OK ) if( rv == SH_OK )
{ {
@ -511,13 +522,11 @@ SHOVE::SHOVE_STATUS SHOVE::onCollidingLine( LINE& aCurrent, LINE& aObstacle )
SHOVE_STATUS rv = ShoveObstacleLine( aCurrent, aObstacle, shovedLine ); SHOVE_STATUS rv = ShoveObstacleLine( aCurrent, aObstacle, shovedLine );
#if 0 Dbg()->BeginGroup( "on-colliding-line" );
m_logger.NewGroup( "on-colliding-line", m_iter ); Dbg()->AddLine( aObstacle.CLine(), 1, 100000, "obstacle-line" );
m_logger.Log( &aObstacle, 0, "obstacle-line" ); Dbg()->AddLine( aCurrent.CLine(), 2, 150000, "current-line" );
m_logger.Log( &aCurrent, 1, "current-line" ); Dbg()->AddLine( shovedLine.CLine(), 3, 200000, "shoved-line" );
m_logger.Log( &shovedLine, 3, "shoved-line" );
#endif
if( rv == SH_OK ) if( rv == SH_OK )
{ {
if( shovedLine.Marker() & MK_HEAD ) if( shovedLine.Marker() & MK_HEAD )
@ -1291,6 +1300,11 @@ SHOVE::SHOVE_STATUS SHOVE::ShoveLines( const LINE& aCurrentHead )
m_multiLineMode = false; m_multiLineMode = false;
if( Dbg() )
{
Dbg()->Message( wxString::Format( "Shove start, lc = %d", aCurrentHead.SegmentCount() ) );
}
// empty head? nothing to shove... // empty head? nothing to shove...
if( !aCurrentHead.SegmentCount() && !aCurrentHead.EndsWithVia() ) if( !aCurrentHead.SegmentCount() && !aCurrentHead.EndsWithVia() )
@ -1329,10 +1343,13 @@ SHOVE::SHOVE_STATUS SHOVE::ShoveLines( const LINE& aCurrentHead )
head.Mark( MK_HEAD ); head.Mark( MK_HEAD );
head.SetRank( 100000 ); head.SetRank( 100000 );
#if 0 if ( Dbg() )
m_logger.NewGroup( "initial", 0 ); {
m_logger.Log( &head, 0, "head" );
#endif Dbg()->BeginGroup( "initial" );
Dbg()->AddLine(head.CLine(), 5, head.Width(), "head" );
Dbg()->EndGroup();
}
if( head.EndsWithVia() ) if( head.EndsWithVia() )
{ {