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

router: don't create incorrect non-45 degree connections when routing a track that doesn't have a net assigned 

Fixes: lp:1814433
* https://bugs.launchpad.net/kicad/+bug/1814433
This commit is contained in:
Tomasz Włostowski 2019-02-03 12:37:17 +01:00
parent 08c944a467
commit 5d712716e6
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcbnew/router/pns_item.h
View File

@ -181,6 +181,11 @@ public:
return m_net; return m_net;
} }
bool InAnyNet() const
{
return m_net != UnusedNet;
}
/** /**
* Function SetLayers() * Function SetLayers()
* *

14
pcbnew/router/pns_line_placer.cpp
View File

@ -780,7 +780,15 @@ void LINE_PLACER::routeStep( const VECTOR2I& aP )
bool LINE_PLACER::route( const VECTOR2I& aP ) bool LINE_PLACER::route( const VECTOR2I& aP )
{ {
routeStep( aP ); routeStep( aP );
return CurrentEnd() == aP;
if (!m_head.PointCount() )
{
return false;
}
else
{
return m_head.CPoint(-1) == aP;
}
} }
@ -946,7 +954,7 @@ bool LINE_PLACER::Move( const VECTOR2I& aP, ITEM* aEndItem )
m_lastNode = NULL; m_lastNode = NULL;
} }
route( p ); bool reachesEnd = route( p );
current = Trace(); current = Trace();
@ -958,7 +966,7 @@ bool LINE_PLACER::Move( const VECTOR2I& aP, ITEM* aEndItem )
NODE* latestNode = m_currentNode; NODE* latestNode = m_currentNode;
m_lastNode = latestNode->Branch(); m_lastNode = latestNode->Branch();
if( eiDepth >= 0 && aEndItem && latestNode->Depth() > eiDepth && current.SegmentCount() ) if( reachesEnd && eiDepth >= 0 && aEndItem && latestNode->Depth() > eiDepth && current.SegmentCount() )
{ {
SplitAdjacentSegments( m_lastNode, aEndItem, current.CPoint( -1 ) ); SplitAdjacentSegments( m_lastNode, aEndItem, current.CPoint( -1 ) );