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

Don't call BuildInitialTrace() for entry gateways. 

We're going to call it to connect the entry and target gateways
anyway, so all we need are gateways at 22.5 degrees to setup entry
at +/- 45 degrees from the current direction.

Fixes https://gitlab.com/kicad/code/kicad/issues/14324

Fixes https://gitlab.com/kicad/code/kicad/issues/12459
This commit is contained in:
Jeff Young 2023-04-10 22:21:20 +01:00
parent cec4109176
commit 507a25f150
1 changed files with 28 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
pcbnew/router/pns_diff_pair.cpp
View File

@ -179,13 +179,15 @@ static DIRECTION_45::AngleType angle( const VECTOR2I &a, const VECTOR2I &b )
static bool checkGap( const SHAPE_LINE_CHAIN &p, const SHAPE_LINE_CHAIN &n, int gap ) static bool checkGap( const SHAPE_LINE_CHAIN &p, const SHAPE_LINE_CHAIN &n, int gap )
{ {
SEG::ecoord gap_sq = SEG::Square( gap - 100 );
for( int i = 0; i < p.SegmentCount(); i++ ) for( int i = 0; i < p.SegmentCount(); i++ )
{ {
for( int j = 0; j < n.SegmentCount() ; j++ ) for( int j = 0; j < n.SegmentCount() ; j++ )
{ {
int dist = p.CSegment( i ).Distance( n.CSegment( j ) ); SEG::ecoord dist_sq = p.CSegment( i ).SquaredDistance( n.CSegment( j ) );
if( dist < gap - 100 ) if( dist_sq < gap_sq )
return false; return false;
} }
} }
@ -607,45 +609,34 @@ void DP_GATEWAYS::buildDpContinuation( const DP_PRIMITIVE_PAIR& aPair, bool aIsD
if( !aPair.Directional() ) if( !aPair.Directional() )
return; return;
DIRECTION_45 dP = aPair.DirP(); // Add gateways that angle the anchor points by 22.5 degrees for connection to tracks which
DIRECTION_45 dN = aPair.DirN(); // are at +/- 45 degrees from the existing direction.
int gap = ( aPair.AnchorP() - aPair.AnchorN() ).EuclideanNorm(); auto addAngledGateways =
[&]( int length, int priority )
VECTOR2I vdP = aPair.AnchorP() + dP.Left().ToVector();
VECTOR2I vdN = aPair.AnchorN() + dN.Left().ToVector();
SEGMENT* sP = static_cast<SEGMENT*>( aPair.PrimP() );
VECTOR2I t1, t2;
auto vL = makeGapVector( dP.Left().ToVector(), ( gap + 1 ) / 2 );
auto vR = makeGapVector( dP.Right().ToVector(), ( gap + 1 ) / 2 );
if( sP->Seg().Side( vdP ) == sP->Seg().Side( vdN ) )
{ {
t1 = aPair.AnchorP() + vL; SHAPE_LINE_CHAIN entryLineP;
t2 = aPair.AnchorN() + vR; entryLineP.Append( aPair.AnchorP() );
} entryLineP.Append( aPair.AnchorP() + aPair.DirP().ToVector().Resize( length ) );
else DP_GATEWAY gwExtendP( entryLineP.CLastPoint(), aPair.AnchorN(), aIsDiagonal );
{ gwExtendP.SetPriority( priority );
t1 = aPair.AnchorP() + vR; gwExtendP.SetEntryLines( entryLineP, SHAPE_LINE_CHAIN() );
t2 = aPair.AnchorN() + vL; m_gateways.push_back( gwExtendP );
}
DP_GATEWAY gwL( t2, aPair.AnchorN(), !aIsDiagonal ); SHAPE_LINE_CHAIN entryLineN;
SHAPE_LINE_CHAIN ep = dP.BuildInitialTrace( aPair.AnchorP(), t2, !aIsDiagonal ); entryLineN.Append( aPair.AnchorN() );
gwL.SetPriority( 10 ); entryLineN.Append( aPair.AnchorN() + aPair.DirN().ToVector().Resize( length ) );
gwL.SetEntryLines( ep , SHAPE_LINE_CHAIN() ); DP_GATEWAY gwExtendN( aPair.AnchorP(), entryLineN.CLastPoint(), aIsDiagonal );
gwExtendN.SetPriority( priority );
gwExtendN.SetEntryLines( SHAPE_LINE_CHAIN(), entryLineN );
m_gateways.push_back( gwExtendN );
};
m_gateways.push_back( gwL ); addAngledGateways( KiROUND( (double) m_gap * 0.38268 ), 20 );
DP_GATEWAY gwR( aPair.AnchorP(), t1, !aIsDiagonal ); // fixme; sin(22.5) doesn't always work, so we also add some lower priority ones with a bit
SHAPE_LINE_CHAIN en = dP.BuildInitialTrace( aPair.AnchorN(), t1, !aIsDiagonal ); // of wiggle room. See https://gitlab.com/kicad/code/kicad/-/issues/12459.
gwR.SetPriority( 10) ; addAngledGateways( KiROUND( (double) m_gap * 0.4 ), 5 );
gwR.SetEntryLines( SHAPE_LINE_CHAIN(), en );
m_gateways.push_back( gwR );
} }