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-01-24 16:14:38 +01:00
parent 80956ef1e6
commit fc122834c2
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/router/pns_kicad_iface.cpp
View File

@ -910,7 +910,7 @@ void PNS_KICAD_IFACE::Commit()
} }
void PNS_KICAD_IFACE::SetView( KIGFX::VIEW *aView ) void PNS_KICAD_IFACE::SetView( KIGFX::VIEW* aView )
{ {
wxLogTrace( "PNS", "SetView %p", aView ); wxLogTrace( "PNS", "SetView %p", aView );

19
pcbnew/router/pns_router.cpp
View File

@ -68,7 +68,6 @@ ROUTER::ROUTER()
{ {
theRouter = this; theRouter = this;
m_state = IDLE; m_state = IDLE;
m_mode = PNS_MODE_ROUTE_SINGLE; m_mode = PNS_MODE_ROUTE_SINGLE;
@ -94,11 +93,12 @@ ROUTER::~ROUTER()
theRouter = nullptr; theRouter = nullptr;
} }
void ROUTER::SyncWorld( )
void ROUTER::SyncWorld()
{ {
ClearWorld(); ClearWorld();
m_world = std::unique_ptr< NODE >( new NODE ); m_world = std::unique_ptr<NODE>( new NODE );
m_iface->SyncWorld( m_world.get() ); m_iface->SyncWorld( m_world.get() );
} }
@ -126,11 +126,10 @@ const ITEM_SET ROUTER::QueryHoverItems( const VECTOR2I& aP )
if( m_state == IDLE ) if( m_state == IDLE )
return m_world->HitTest( aP ); return m_world->HitTest( aP );
else else
{
return m_placer->CurrentNode()->HitTest( aP ); return m_placer->CurrentNode()->HitTest( aP );
}
} }
bool ROUTER::StartDragging( const VECTOR2I& aP, ITEM* aStartItem ) bool ROUTER::StartDragging( const VECTOR2I& aP, ITEM* aStartItem )
{ {
if( !aStartItem || aStartItem->OfKind( ITEM::SOLID_T ) ) if( !aStartItem || aStartItem->OfKind( ITEM::SOLID_T ) )
@ -152,6 +151,7 @@ bool ROUTER::StartDragging( const VECTOR2I& aP, ITEM* aStartItem )
return true; return true;
} }
bool ROUTER::StartRouting( const VECTOR2I& aP, ITEM* aStartItem, int aLayer ) bool ROUTER::StartRouting( const VECTOR2I& aP, ITEM* aStartItem, int aLayer )
{ {
switch( m_mode ) switch( m_mode )
@ -197,6 +197,7 @@ void ROUTER::DisplayItems( const ITEM_SET& aItems )
m_iface->DisplayItem( item ); m_iface->DisplayItem( item );
} }
void ROUTER::Move( const VECTOR2I& aP, ITEM* endItem ) void ROUTER::Move( const VECTOR2I& aP, ITEM* endItem )
{ {
m_currentEnd = aP; m_currentEnd = aP;
@ -228,8 +229,7 @@ void ROUTER::moveDragging( const VECTOR2I& aP, ITEM* aEndItem )
} }
void ROUTER::markViolations( NODE* aNode, ITEM_SET& aCurrent, void ROUTER::markViolations( NODE* aNode, ITEM_SET& aCurrent, NODE::ITEM_VECTOR& aRemoved )
NODE::ITEM_VECTOR& aRemoved )
{ {
for( ITEM* item : aCurrent.Items() ) for( ITEM* item : aCurrent.Items() )
{ {
@ -273,7 +273,7 @@ void ROUTER::updateView( NODE* aNode, ITEM_SET& aCurrent )
aNode->GetUpdatedItems( removed, added ); aNode->GetUpdatedItems( removed, added );
for ( auto item : added ) for( auto item : added )
m_iface->DisplayItem( item ); m_iface->DisplayItem( item );
for( auto item : removed ) for( auto item : removed )
@ -281,7 +281,7 @@ void ROUTER::updateView( NODE* aNode, ITEM_SET& aCurrent )
} }
void ROUTER::UpdateSizes ( const SIZES_SETTINGS& aSizes ) void ROUTER::UpdateSizes( const SIZES_SETTINGS& aSizes )
{ {
m_sizes = aSizes; m_sizes = aSizes;
@ -483,6 +483,7 @@ void ROUTER::SetMode( ROUTER_MODE aMode )
m_mode = aMode; m_mode = aMode;
} }
void ROUTER::SetInterface( ROUTER_IFACE *aIface ) void ROUTER::SetInterface( ROUTER_IFACE *aIface )
{ {
m_iface = aIface; m_iface = aIface;