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

Code formatting

This commit is contained in:
Maciej Suminski 2017-04-20 16:37:36 +02:00
parent 481fd233d4
commit 0e14cdf6da
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
pcbnew/tools/grid_helper.cpp
View File

@ -113,7 +113,7 @@ VECTOR2I GRID_HELPER::Align( const VECTOR2I& aPoint ) const
} }
VECTOR2I GRID_HELPER::AlignToSegment ( const VECTOR2I& aPoint, const SEG& aSeg ) VECTOR2I GRID_HELPER::AlignToSegment( const VECTOR2I& aPoint, const SEG& aSeg )
{ {
OPT_VECTOR2I pts[6]; OPT_VECTOR2I pts[6];
@ -147,6 +147,7 @@ VECTOR2I GRID_HELPER::AlignToSegment ( const VECTOR2I& aPoint, const SEG& aSeg )
return nearest; return nearest;
} }
VECTOR2I GRID_HELPER::BestDragOrigin( const VECTOR2I &aMousePos, BOARD_ITEM* aItem ) VECTOR2I GRID_HELPER::BestDragOrigin( const VECTOR2I &aMousePos, BOARD_ITEM* aItem )
{ {
clearAnchors(); clearAnchors();
@ -231,12 +232,13 @@ VECTOR2I GRID_HELPER::BestSnapAnchor( const VECTOR2I& aOrigin, BOARD_ITEM* aDrag
VECTOR2I nearestGrid = Align( aOrigin ); VECTOR2I nearestGrid = Align( aOrigin );
double gridDist = ( nearestGrid - aOrigin ).EuclideanNorm(); double gridDist = ( nearestGrid - aOrigin ).EuclideanNorm();
if( nearest ) if( nearest )
{ {
double snapDist = nearest->Distance( aOrigin ); double snapDist = nearest->Distance( aOrigin );
if( nearest && snapDist < gridDist ) if( nearest && snapDist < gridDist )
return nearest->pos; return nearest->pos;
} }
return nearestGrid; return nearestGrid;
@ -260,7 +262,6 @@ void GRID_HELPER::computeAnchors( BOARD_ITEM* aItem, const VECTOR2I& aRefPos )
break; break;
} }
case PCB_PAD_T: case PCB_PAD_T:
{ {
D_PAD* pad = static_cast<D_PAD*>( aItem ); D_PAD* pad = static_cast<D_PAD*>( aItem );
@ -367,25 +368,25 @@ void GRID_HELPER::computeAnchors( BOARD_ITEM* aItem, const VECTOR2I& aRefPos )
GRID_HELPER::ANCHOR* GRID_HELPER::nearestAnchor( const VECTOR2I& aPos, int aFlags, LSET aMatchLayers ) GRID_HELPER::ANCHOR* GRID_HELPER::nearestAnchor( const VECTOR2I& aPos, int aFlags, LSET aMatchLayers )
{ {
double minDist = std::numeric_limits<double>::max(); double minDist = std::numeric_limits<double>::max();
ANCHOR* best = NULL; ANCHOR* best = NULL;
for( ANCHOR& a : m_anchors ) for( ANCHOR& a : m_anchors )
{ {
if( !aMatchLayers[a.item->GetLayer()] ) if( !aMatchLayers[a.item->GetLayer()] )
continue; continue;
if( ( aFlags & a.flags ) != aFlags ) if( ( aFlags & a.flags ) != aFlags )
continue; continue;
double dist = a.Distance( aPos ); double dist = a.Distance( aPos );
if( dist < minDist ) if( dist < minDist )
{ {
minDist = dist; minDist = dist;
best = &a; best = &a;
} }
} }
return best; return best;
} }