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

Cleanup & compiler warnings.

This commit is contained in:
Jeff Young 2023-10-09 21:59:55 +01:00
parent 642938455e
commit 994f9f8823
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
pcbnew/generators/pcb_generator_meanders.cpp
View File

@ -263,9 +263,8 @@ public:
} }
} }
PNS::LINKED_ITEM* PickSegment( PNS::ROUTER* aRouter, const VECTOR2I& aWhere, PNS::LINKED_ITEM* PickSegment( PNS::ROUTER* aRouter, const VECTOR2I& aWhere, int aLayer,
PNS::NET_HANDLE aNet, int aLayer, VECTOR2I& aPointOut, VECTOR2I& aPointOut )
const std::set<PNS::ITEM*> aAvoidItems = {} )
{ {
static const int candidateCount = 2; static const int candidateCount = 2;
PNS::LINKED_ITEM* prioritized[candidateCount]; PNS::LINKED_ITEM* prioritized[candidateCount];
@ -278,16 +277,17 @@ public:
dist[i] = VECTOR2I::ECOORD_MAX; dist[i] = VECTOR2I::ECOORD_MAX;
} }
auto haveCandidates = [&]() auto haveCandidates =
{ [&]()
for( PNS::ITEM* item : prioritized ) {
{ for( PNS::ITEM* item : prioritized )
if( item ) {
return true; if( item )
} return true;
}
return false; return false;
}; };
for( bool useClearance : { false, true } ) for( bool useClearance : { false, true } )
{ {
@ -304,12 +304,6 @@ public:
if( !item->Layers().Overlaps( aLayer ) ) if( !item->Layers().Overlaps( aLayer ) )
continue; continue;
if( aAvoidItems.find( item ) != aAvoidItems.end() )
continue;
if( aNet && item->Net() != aNet )
continue;
PNS::LINKED_ITEM* linked = static_cast<PNS::LINKED_ITEM*>( item ); PNS::LINKED_ITEM* linked = static_cast<PNS::LINKED_ITEM*>( item );
if( item->Kind() & PNS::ITEM::ARC_T ) if( item->Kind() & PNS::ITEM::ARC_T )
@ -377,8 +371,8 @@ public:
VECTOR2I startSnapPoint, endSnapPoint; VECTOR2I startSnapPoint, endSnapPoint;
PNS::LINKED_ITEM* startItem = PickSegment( router, m_origin, nullptr, layer, startSnapPoint ); PNS::LINKED_ITEM* startItem = PickSegment( router, m_origin, layer, startSnapPoint );
PNS::LINKED_ITEM* endItem = PickSegment( router, m_end, nullptr, layer, endSnapPoint ); PNS::LINKED_ITEM* endItem = PickSegment( router, m_end, layer, endSnapPoint );
wxASSERT( startItem ); wxASSERT( startItem );
wxASSERT( endItem ); wxASSERT( endItem );
@ -386,8 +380,8 @@ public:
if( !startItem || !endItem || startSnapPoint == endSnapPoint ) if( !startItem || !endItem || startSnapPoint == endSnapPoint )
return false; return false;
PNS::LINE line = world->AssembleLine( startItem, nullptr, false, true ); PNS::LINE line = world->AssembleLine( startItem, nullptr, false, true );
SHAPE_LINE_CHAIN chain = line.CLine(); const SHAPE_LINE_CHAIN& chain = line.CLine();
wxASSERT( line.ContainsLink( endItem ) ); wxASSERT( line.ContainsLink( endItem ) );
@ -496,8 +490,8 @@ public:
{ {
PNS::NODE* world = router->GetWorld(); PNS::NODE* world = router->GetWorld();
PNS::LINKED_ITEM* startItem = PickSegment( router, aStart, nullptr, layer, aStartOut ); PNS::LINKED_ITEM* startItem = PickSegment( router, aStart, layer, aStartOut );
PNS::LINKED_ITEM* endItem = PickSegment( router, aEnd, nullptr, layer, aEndOut ); PNS::LINKED_ITEM* endItem = PickSegment( router, aEnd, layer, aEndOut );
wxASSERT( startItem ); wxASSERT( startItem );
wxASSERT( endItem ); wxASSERT( endItem );
@ -646,9 +640,8 @@ public:
// Snap points // Snap points
VECTOR2I startSnapPoint, endSnapPoint; VECTOR2I startSnapPoint, endSnapPoint;
PNS::LINKED_ITEM* startItem = PNS::LINKED_ITEM* startItem = PickSegment( router, m_origin, layer, startSnapPoint );
PickSegment( router, m_origin, nullptr, layer, startSnapPoint ); PNS::LINKED_ITEM* endItem = PickSegment( router, m_end, layer, endSnapPoint );
PNS::LINKED_ITEM* endItem = PickSegment( router, m_end, nullptr, layer, endSnapPoint );
wxASSERT( startItem ); wxASSERT( startItem );
wxASSERT( endItem ); wxASSERT( endItem );
@ -744,7 +737,7 @@ public:
points->Point( 2 ).SetGridConstraint( IGNORE_GRID ); points->Point( 2 ).SetGridConstraint( IGNORE_GRID );
VECTOR2I spacingHandleOffset = VECTOR2I spacingHandleOffset =
widthHandleOffset + ( base.B - base.A ).Resize( m_spacing * 1.5 ); widthHandleOffset + ( base.B - base.A ).Resize( KiROUND( m_spacing * 1.5 ) );
points->AddPoint( m_origin + spacingHandleOffset ); points->AddPoint( m_origin + spacingHandleOffset );
points->Point( 3 ).SetGridConstraint( IGNORE_GRID ); points->Point( 3 ).SetGridConstraint( IGNORE_GRID );
@ -781,7 +774,7 @@ public:
VECTOR2I wHandle = aEditPoints->Point( 2 ).GetPosition(); VECTOR2I wHandle = aEditPoints->Point( 2 ).GetPosition();
VECTOR2I sHandle = aEditPoints->Point( 3 ).GetPosition(); VECTOR2I sHandle = aEditPoints->Point( 3 ).GetPosition();
int value = SEG( m_origin, wHandle ).LineDistance( sHandle ) / 1.5; int value = KiROUND( SEG( m_origin, wHandle ).LineDistance( sHandle ) / 1.5 );
SetSpacing( KiROUND( value / pcbIUScale.mmToIU( 0.01 ) ) * pcbIUScale.mmToIU( 0.01 ) ); SetSpacing( KiROUND( value / pcbIUScale.mmToIU( 0.01 ) ) * pcbIUScale.mmToIU( 0.01 ) );
} }
@ -807,7 +800,7 @@ public:
aEditPoints->Point( 2 ).SetPosition( m_origin + widthHandleOffset ); aEditPoints->Point( 2 ).SetPosition( m_origin + widthHandleOffset );
VECTOR2I spacingHandleOffset = VECTOR2I spacingHandleOffset =
widthHandleOffset + ( base.B - base.A ).Resize( m_spacing * 1.5 ); widthHandleOffset + ( base.B - base.A ).Resize( KiROUND( m_spacing * 1.5 ) );
aEditPoints->Point( 3 ).SetPosition( m_origin + spacingHandleOffset ); aEditPoints->Point( 3 ).SetPosition( m_origin + spacingHandleOffset );
@ -845,8 +838,8 @@ public:
{ {
SHAPE_POLY_SET poly; SHAPE_POLY_SET poly;
poly.OffsetLineChain( *m_baseLine, m_maxAmplitude * 2, CORNER_STRATEGY::ROUND_ALL_CORNERS, poly.OffsetLineChain( *m_baseLine, m_maxAmplitude * 2,
ARC_LOW_DEF, false ); CORNER_STRATEGY::ROUND_ALL_CORNERS, ARC_LOW_DEF, false );
if( poly.OutlineCount() > 0 ) if( poly.OutlineCount() > 0 )
{ {