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

router: clean some debug clutter

This commit is contained in:
Tomasz Wlostowski 2021-05-28 00:19:36 +02:00
parent b3caa3c4d4
commit 132eb53a40
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pcbnew/router/pns_line_placer.cpp
View File

@ -538,8 +538,7 @@ bool LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, LINE& aNewHead )
do { do {
viaOk = buildInitialLine( walkP, initTrack, round == 0 ); viaOk = buildInitialLine( walkP, initTrack, round == 0 );
printf("round %d vok %d\n", round, viaOk?1:0);
double initialLength = initTrack.CLine().Length(); double initialLength = initTrack.CLine().Length();
double hugThresholdLength = initialLength * Settings().WalkaroundHugLengthThreshold(); double hugThresholdLength = initialLength * Settings().WalkaroundHugLengthThreshold();
@ -556,7 +555,6 @@ bool LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, LINE& aNewHead )
Dbg()->AddLine( wr.lineCw.CLine(), 6, 10000, "wf-result-cw" ); Dbg()->AddLine( wr.lineCw.CLine(), 6, 10000, "wf-result-cw" );
Dbg()->AddLine( wr.lineCcw.CLine(), 5, 20000, "wf-result-ccw" ); Dbg()->AddLine( wr.lineCcw.CLine(), 5, 20000, "wf-result-ccw" );
int bestLength = len_cw < len_ccw ? len_cw : len_ccw; int bestLength = len_cw < len_ccw ? len_cw : len_ccw;
if( bestLength > hugThresholdLength ) if( bestLength > hugThresholdLength )
@ -574,7 +572,7 @@ bool LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, LINE& aNewHead )
bool valid_cw = false, valid_ccw = false; bool valid_cw = false, valid_ccw = false;
VECTOR2I p_cw, p_ccw; VECTOR2I p_cw, p_ccw;
int dist_ccw, dist_cw; int dist_ccw, dist_cw;
if( wr.statusCcw == WALKAROUND::ALMOST_DONE ) if( wr.statusCcw == WALKAROUND::ALMOST_DONE )
{ {
valid_ccw = cursorDistMinimum( l_ccw, aP, hugThresholdLength, dist_ccw, p_ccw ); valid_ccw = cursorDistMinimum( l_ccw, aP, hugThresholdLength, dist_ccw, p_ccw );
@ -584,15 +582,13 @@ bool LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, LINE& aNewHead )
l_ccw = l_ccw.Slice( 0, idx_ccw ); l_ccw = l_ccw.Slice( 0, idx_ccw );
Dbg()->AddPoint( p_ccw, 5, 500000, "hug-target-ccw" ); Dbg()->AddPoint( p_ccw, 5, 500000, "hug-target-ccw" );
// Dbg()->AddLine( l_ccw, 5, 200000, "wh-result-ccw" ); // Dbg()->AddLine( l_ccw, 5, 200000, "wh-result-ccw" );
} }
} }
if( wr.statusCw == WALKAROUND::ALMOST_DONE ) if( wr.statusCw == WALKAROUND::ALMOST_DONE )
{ {
valid_cw = cursorDistMinimum( l_cw, aP, hugThresholdLength, dist_cw, p_cw ); valid_cw = cursorDistMinimum( l_cw, aP, hugThresholdLength, dist_cw, p_cw );
if( valid_cw ) if( valid_cw )
{ {
int idx_cw = l_cw.Split( p_cw ); int idx_cw = l_cw.Split( p_cw );
l_cw = l_cw.Slice( 0, idx_cw ); l_cw = l_cw.Slice( 0, idx_cw );
Dbg()->AddPoint( p_cw, 4, 500000, "hug-target-cw" ); Dbg()->AddPoint( p_cw, 4, 500000, "hug-target-cw" );
@ -600,8 +596,6 @@ bool LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, LINE& aNewHead )
} }
} }
// return false;
if( dist_cw < dist_ccw && valid_cw ) if( dist_cw < dist_ccw && valid_cw )
{ {
walkFull.SetShape( l_cw ); walkFull.SetShape( l_cw );
@ -619,8 +613,6 @@ bool LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, LINE& aNewHead )
} }
else if ( wr.statusCcw == WALKAROUND::STUCK || wr.statusCw == WALKAROUND::STUCK ) else if ( wr.statusCcw == WALKAROUND::STUCK || wr.statusCw == WALKAROUND::STUCK )
{ {
printf("FINISH3\n");
return false; return false;
} }
@ -629,7 +621,6 @@ bool LINE_PLACER::rhWalkOnly( const VECTOR2I& aP, LINE& aNewHead )
Dbg()->AddLine( walkFull.CLine(), 2, 200000, "walk-full" ); Dbg()->AddLine( walkFull.CLine(), 2, 200000, "walk-full" );
switch( Settings().OptimizerEffort() ) switch( Settings().OptimizerEffort() )
{ {
case OE_LOW: case OE_LOW: