diff --git a/pcbnew/router/pns_line_placer.cpp b/pcbnew/router/pns_line_placer.cpp index 2c26df7c96..ba52d3544b 100644 --- a/pcbnew/router/pns_line_placer.cpp +++ b/pcbnew/router/pns_line_placer.cpp @@ -790,12 +790,12 @@ void PNS_LINE_PLACER::Start( const VECTOR2I& aP, PNS_ITEM* aStartItem ) m_currentEnd = p; m_currentNet = net; - PNS_NODE *rootNode = Router()->GetWorld()->Branch(); + PNS_NODE* rootNode = Router()->GetWorld()->Branch(); if( splitSeg ) splitAdjacentSegments( rootNode, aStartItem, p ); - setWorld ( rootNode ); + setWorld( rootNode ); setInitialDirection( Settings().InitialDirection() ); startPlacement( p, m_currentNet, m_currentWidth, m_currentLayer ); } @@ -848,7 +848,7 @@ bool PNS_LINE_PLACER::FixRoute( const VECTOR2I& aP, PNS_ITEM* aEndItem ) PNS_LINE pl = Trace(); - if (m_currentMode == RM_MarkObstacles && + if( m_currentMode == RM_MarkObstacles && !Settings().CanViolateDRC() && m_world->CheckColliding( &pl ) ) return false; @@ -889,9 +889,9 @@ bool PNS_LINE_PLACER::FixRoute( const VECTOR2I& aP, PNS_ITEM* aEndItem ) m_lastNode->Add( pl.Via().Clone() ); if( realEnd ) - simplifyNewLine ( m_lastNode, lastSeg ); + simplifyNewLine( m_lastNode, lastSeg ); - Router()->CommitRouting ( m_lastNode ); + Router()->CommitRouting( m_lastNode ); m_lastNode = NULL; diff --git a/pcbnew/router/pns_line_placer.h b/pcbnew/router/pns_line_placer.h index 1ae3b2d69c..e859180674 100644 --- a/pcbnew/router/pns_line_placer.h +++ b/pcbnew/router/pns_line_placer.h @@ -55,7 +55,7 @@ public: * Starts routing a single track at point aP, taking item aStartItem as anchor * (unless NULL). */ - void Start ( const VECTOR2I& aP, PNS_ITEM* aStartItem ); + void Start( const VECTOR2I& aP, PNS_ITEM* aStartItem ); /** * Function Move() diff --git a/pcbnew/router/pns_router.cpp b/pcbnew/router/pns_router.cpp index 8813a854f1..5e16d95993 100644 --- a/pcbnew/router/pns_router.cpp +++ b/pcbnew/router/pns_router.cpp @@ -612,7 +612,7 @@ void PNS_ROUTER::moveDragging( const VECTOR2I& aP, PNS_ITEM* aEndItem ) m_dragger->Drag( aP ); PNS_ITEMSET dragged = m_dragger->Traces(); - updateView ( m_dragger->CurrentNode(), dragged ); + updateView( m_dragger->CurrentNode(), dragged ); } diff --git a/pcbnew/router/pns_router.h b/pcbnew/router/pns_router.h index b5fc2a6daa..8a92794f16 100644 --- a/pcbnew/router/pns_router.h +++ b/pcbnew/router/pns_router.h @@ -234,7 +234,7 @@ private: PNS_NODE* m_world; PNS_NODE* m_lastNode; PNS_LINE_PLACER* m_placer; - PNS_DRAGGER *m_dragger; + PNS_DRAGGER* m_dragger; PNS_LINE* m_draggedLine; PNS_SHOVE* m_shove; int m_draggedSegmentIndex;