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

router: fixed no-snapping issue

This commit is contained in:
Tomasz Włostowski 2017-08-16 14:11:07 +02:00
parent f12b19dd89
commit d5bdcd3032
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pcbnew/router/pns_tool_base.cpp
View File

@ -232,6 +232,8 @@ void TOOL_BASE::updateStartItem( TOOL_EVENT& aEvent )
VECTOR2I cp = controls()->GetCursorPosition(); VECTOR2I cp = controls()->GetCursorPosition();
VECTOR2I p; VECTOR2I p;
controls()->ForceCursorPosition( false );
bool snapEnabled = true; bool snapEnabled = true;
if( aEvent.IsMotion() || aEvent.IsClick() ) if( aEvent.IsMotion() || aEvent.IsClick() )
@ -251,19 +253,26 @@ void TOOL_BASE::updateStartItem( TOOL_EVENT& aEvent )
m_startSnapPoint = snapToItem( snapEnabled, m_startItem, p ); m_startSnapPoint = snapToItem( snapEnabled, m_startItem, p );
controls()->ForceCursorPosition( true, checkSnap( m_startItem ) ? m_startSnapPoint : p ); if( checkSnap ( m_startItem ))
{
controls()->ForceCursorPosition( true, m_startSnapPoint );
}
} }
void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent ) void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
{ {
VECTOR2I p = controls()->GetMousePosition(); controls()->ForceCursorPosition( false );
VECTOR2I mousePos = controls()->GetMousePosition();
VECTOR2I cursorPos = controls()->GetCursorPosition();
int layer; int layer;
bool snapEnabled = !aEvent.Modifier( MD_SHIFT ); bool snapEnabled = !aEvent.Modifier( MD_SHIFT );
if( m_router->GetCurrentNets().empty() || m_router->GetCurrentNets().front() < 0 ) if( m_router->GetCurrentNets().empty() || m_router->GetCurrentNets().front() < 0 )
{ {
m_endSnapPoint = snapToItem( snapEnabled, nullptr, p ); m_endSnapPoint = snapToItem( snapEnabled, nullptr, mousePos );
controls()->ForceCursorPosition( true, m_endSnapPoint ); controls()->ForceCursorPosition( true, m_endSnapPoint );
m_endItem = nullptr; m_endItem = nullptr;
@ -281,7 +290,7 @@ void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
for( int net : nets ) for( int net : nets )
{ {
endItem = pickSingleItem( p, net, layer ); endItem = pickSingleItem( mousePos, net, layer );
if( endItem ) if( endItem )
break; break;
@ -289,13 +298,13 @@ void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
if( checkSnap( endItem ) ) if( checkSnap( endItem ) )
{ {
VECTOR2I cursorPos = snapToItem( snapEnabled, endItem, p ); VECTOR2I p = snapToItem( snapEnabled, endItem, mousePos );
controls()->ForceCursorPosition( true, checkSnap( endItem ) ? cursorPos : p ); controls()->ForceCursorPosition( true, p );
m_endItem = endItem; m_endItem = endItem;
m_endSnapPoint = cursorPos; m_endSnapPoint = cursorPos;
} else { } else {
m_endItem = nullptr; m_endItem = nullptr;
m_endSnapPoint = p; m_endSnapPoint = cursorPos;
} }
if( m_endItem ) if( m_endItem )