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

Minor code cleaning (PNS).

This commit is contained in:
Maciej Suminski 2015-07-24 09:42:46 +02:00
parent d6bc33bd42
commit 7650b0e8ad
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
pcbnew/router/pns_diff_pair.cpp
View File

@ -628,24 +628,24 @@ void PNS_DP_GATEWAYS::BuildGeneric( const VECTOR2I& p0_p, const VECTOR2I& p0_n,
{ {
for( int j = 0; j < 2; j++ ) for( int j = 0; j < 2; j++ )
{ {
OPT_VECTOR2I ips[2], m; OPT_VECTOR2I ips[2];
m = OPT_VECTOR2I();
ips[0] = d_n[i].IntersectLines( d_p[j] ); ips[0] = d_n[i].IntersectLines( d_p[j] );
ips[1] = st_p[i].IntersectLines( st_n[j] ); ips[1] = st_p[i].IntersectLines( st_n[j] );
if( d_n[i].Collinear( d_p[j] ) ) if( d_n[i].Collinear( d_p[j] ) )
ips[0] = OPT_VECTOR2I(); ips[0] = boost::none;
if( st_p[i].Collinear( st_p[j] ) ) if( st_p[i].Collinear( st_p[j] ) )
ips[1] = OPT_VECTOR2I(); ips[1] = boost::none;
// diagonal-diagonal and straight-straight cases - the most typical case if the pads // diagonal-diagonal and straight-straight cases - the most typical case if the pads
// are on the same straight/diagonal line // are on the same straight/diagonal line
for( int k = 0; k < 2; k++ ) for( int k = 0; k < 2; k++ )
{ {
if (ips[k] ) if( ips[k] )
{ {
const VECTOR2I m ( *ips[k] ); const VECTOR2I m( *ips[k] );
if( m != p0_p && m != p0_n ) if( m != p0_p && m != p0_n )
{ {
int prio = ( padDist > padToGapThreshold * m_gap ? 10 : 20 ); int prio = ( padDist > padToGapThreshold * m_gap ? 10 : 20 );
@ -660,26 +660,29 @@ void PNS_DP_GATEWAYS::BuildGeneric( const VECTOR2I& p0_p, const VECTOR2I& p0_n,
ips[0] = st_n[i].IntersectLines( d_p[j] ); ips[0] = st_n[i].IntersectLines( d_p[j] );
ips[1] = st_p[i].IntersectLines( d_n[j] ); ips[1] = st_p[i].IntersectLines( d_n[j] );
// diagonal-straight cases: 8 possibilities of "weirder" exists // diagonal-straight cases: 8 possibilities of "weirder" exists
for( int k = 0; k < 2; k++ ) for( int k = 0; k < 2; k++ )
{ {
m = ips[k]; if( ips[k] )
if( !aViaMode && m && *m != p0_p && *m != p0_n )
{ {
VECTOR2I g_p, g_n; const VECTOR2I m( *ips[k] );
g_p = ( p0_p - *m ).Resize( (double) m_gap * M_SQRT2 ); if( !aViaMode && m != p0_p && m != p0_n )
g_n = ( p0_n - *m ).Resize( (double) m_gap ); {
VECTOR2I g_p, g_n;
if( angle( g_p, g_n ) != DIRECTION_45::ANG_ACUTE ) g_p = ( p0_p - m ).Resize( (double) m_gap * M_SQRT2 );
m_gateways.push_back( PNS_DP_GATEWAY( *m + g_p, *m + g_n, true ) ); g_n = ( p0_n - m ).Resize( (double) m_gap );
g_p = ( p0_p - *m ).Resize( m_gap ); if( angle( g_p, g_n ) != DIRECTION_45::ANG_ACUTE )
g_n = ( p0_n - *m ).Resize( (double) m_gap * M_SQRT2 ); m_gateways.push_back( PNS_DP_GATEWAY( m + g_p, m + g_n, true ) );
if( angle( g_p, g_n ) != DIRECTION_45::ANG_ACUTE ) g_p = ( p0_p - m ).Resize( m_gap );
m_gateways.push_back( PNS_DP_GATEWAY( *m + g_p, *m + g_n, true ) ); g_n = ( p0_n - m ).Resize( (double) m_gap * M_SQRT2 );
if( angle( g_p, g_n ) != DIRECTION_45::ANG_ACUTE )
m_gateways.push_back( PNS_DP_GATEWAY( m + g_p, m + g_n, true ) );
}
} }
} }
} }