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

Formatting.

This commit is contained in:
Jeff Young 2023-10-16 13:14:42 +01:00
parent 64cc8dd6aa
commit 2c9d43474d
1 changed files with 40 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
pcbnew/router/pns_meander.cpp
View File

@ -2,7 +2,7 @@
* KiRouter - a push-and-(sometimes-)shove PCB router * KiRouter - a push-and-(sometimes-)shove PCB router
* *
* Copyright (C) 2013-2014 CERN * Copyright (C) 2013-2014 CERN
* Copyright (C) 2016-2022 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2016-2023 KiCad Developers, see AUTHORS.txt for contributors.
* Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch> * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
@ -19,8 +19,6 @@
* with this program. If not, see <http://www.gnu.org/licenses/>. * with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <base_units.h> // God forgive me doing this...
#include "pns_node.h" #include "pns_node.h"
#include "pns_itemset.h" #include "pns_itemset.h"
#include "pns_meander.h" #include "pns_meander.h"
@ -69,39 +67,43 @@ void MEANDERED_LINE::MeanderSegment( const SEG& aBase, bool aSide, int aBaseInde
double thr = (double) m.spacing(); double thr = (double) m.spacing();
bool fail = false; bool fail = false;
double remaining = base_len - ( m_last - aBase.A ).EuclideanNorm(); double remaining = base_len - ( m_last - aBase.A ).EuclideanNorm();
auto addSingleIfFits = [&]() auto flipInitialSide =
{ [&]()
fail = true;
if( m.Fit( MT_SINGLE, aBase, m_last, side ) )
{
AddMeander( new MEANDER_SHAPE( m ) );
fail = false;
started = false;
}
if( fail && !singleSided )
{
if( m.Fit( MT_SINGLE, aBase, m_last, !side ) )
{ {
if( !started ) MEANDER_SETTINGS settings = m_placer->MeanderSettings();
settings.m_initialSide = (PNS::MEANDER_SIDE) -settings.m_initialSide;
m_placer->UpdateSettings( settings );
};
auto addSingleIfFits =
[&]()
{
fail = true;
if( m.Fit( MT_SINGLE, aBase, m_last, side ) )
{ {
// Update initial side to the one that fits AddMeander( new MEANDER_SHAPE( m ) );
MEANDER_SETTINGS settings = m_placer->MeanderSettings(); fail = false;
settings.m_initialSide = ( PNS::MEANDER_SIDE) -settings.m_initialSide; started = false;
m_placer->UpdateSettings( settings );
} }
AddMeander( new MEANDER_SHAPE( m ) ); if( fail && !singleSided )
fail = false; {
started = false; if( m.Fit( MT_SINGLE, aBase, m_last, !side ) )
side = !side; {
} if( !started )
} flipInitialSide();
};
AddMeander( new MEANDER_SHAPE( m ) );
fail = false;
started = false;
side = !side;
}
}
};
if( remaining < Settings( ).m_step ) if( remaining < Settings( ).m_step )
break; break;
@ -117,12 +119,7 @@ void MEANDERED_LINE::MeanderSegment( const SEG& aBase, bool aSide, int aBaseInde
if( m.Fit( MT_CHECK_START, aBase, m_last, checkSide ) ) if( m.Fit( MT_CHECK_START, aBase, m_last, checkSide ) )
{ {
if( !started && checkSide != side ) if( !started && checkSide != side )
{ flipInitialSide();
// Update initial side to the one that fits
MEANDER_SETTINGS settings = m_placer->MeanderSettings();
settings.m_initialSide = ( PNS::MEANDER_SIDE) -settings.m_initialSide;
m_placer->UpdateSettings( settings );
}
turning = true; turning = true;
AddMeander( new MEANDER_SHAPE( m ) ); AddMeander( new MEANDER_SHAPE( m ) );
@ -189,9 +186,8 @@ void MEANDERED_LINE::MeanderSegment( const SEG& aBase, bool aSide, int aBaseInde
VECTOR2I pn = m_last + dir.Resize( nextP ); VECTOR2I pn = m_last + dir.Resize( nextP );
if( aBase.Contains( pn ) && !m_dual ) if( aBase.Contains( pn ) && !m_dual )
{
AddCorner( pn ); AddCorner( pn );
} else else
break; break;
} }
@ -272,8 +268,8 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::makeMiterShape( const VECTOR2D& aP, const VECTOR
VECTOR2D center = aP + dir_v * ( aSide ? -1.0 : 1.0 ); VECTOR2D center = aP + dir_v * ( aSide ? -1.0 : 1.0 );
lc.Append( SHAPE_ARC( center, aP, ( aSide ? -ANGLE_90 : ANGLE_90 ) ) ); lc.Append( SHAPE_ARC( center, aP, ( aSide ? -ANGLE_90 : ANGLE_90 ) ) );
}
break; break;
}
case MEANDER_STYLE_CHAMFER: case MEANDER_STYLE_CHAMFER:
{ {
@ -290,7 +286,10 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::makeMiterShape( const VECTOR2D& aP, const VECTOR
lc.Append( ( int ) p.x, ( int ) p.y ); lc.Append( ( int ) p.x, ( int ) p.y );
p = aP + dir_u + (dir_v + dir_cv) * ( aSide ? -1.0 : 1.0 ); p = aP + dir_u + (dir_v + dir_cv) * ( aSide ? -1.0 : 1.0 );
lc.Append( ( int ) p.x, ( int ) p.y ); lc.Append( ( int ) p.x, ( int ) p.y );
break;
} }
default:
break; break;
} }
@ -373,19 +372,13 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::genMeanderShape( const VECTOR2D& aP, const VECTO
VECTOR2D dir_v_b( dir_u_b.Perpendicular() ); VECTOR2D dir_v_b( dir_u_b.Perpendicular() );
if( 2 * cr > amplitude ) if( 2 * cr > amplitude )
{
cr = amplitude / 2; cr = amplitude / 2;
}
if( 2 * cr > spc ) if( 2 * cr > spc )
{
cr = spc / 2; cr = spc / 2;
}
if( cr - offset < 0 ) if( cr - offset < 0 )
{
cr = offset; cr = offset;
}
m_meanCornerRadius = cr; m_meanCornerRadius = cr;
@ -463,7 +456,8 @@ SHAPE_LINE_CHAIN MEANDER_SHAPE::genMeanderShape( const VECTOR2D& aP, const VECTO
break; break;
} }
default: break; default:
break;
} }
if( aSide ) if( aSide )
@ -705,9 +699,7 @@ void MEANDERED_LINE::AddMeander( MEANDER_SHAPE* aShape )
void MEANDERED_LINE::Clear() void MEANDERED_LINE::Clear()
{ {
for( MEANDER_SHAPE* m : m_meanders ) for( MEANDER_SHAPE* m : m_meanders )
{
delete m; delete m;
}
m_meanders.clear( ); m_meanders.clear( );
} }