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

pcbnew: Finalize previous snapping preferences 

Snap/Grid modifier follow preferences from 05483a06c6.  Brings Shift/Alt
modifiers into alignment with drawing tools.  Shift modifier still
conflicts when choosing end item with the complete track click-modifier.
This will be addressed in v6 with a larger preference setting.
This commit is contained in:
Seth Hillbrand 2019-01-29 07:16:11 -08:00
parent 7d544d1ffe
commit f1fed08fa7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pcbnew/router/pns_tool_base.cpp
View File

@ -264,6 +264,8 @@ void TOOL_BASE::updateStartItem( const TOOL_EVENT& aEvent, bool aIgnorePads )
VECTOR2I p; VECTOR2I p;
controls()->ForceCursorPosition( false ); controls()->ForceCursorPosition( false );
m_gridHelper->SetUseGrid( !aEvent.Modifier( MD_ALT ) );
m_gridHelper->SetSnap( !aEvent.Modifier( MD_SHIFT ) );
bool snapEnabled = true; bool snapEnabled = true;
@ -284,7 +286,7 @@ void TOOL_BASE::updateStartItem( const TOOL_EVENT& aEvent, bool aIgnorePads )
m_startSnapPoint = snapToItem( snapEnabled, m_startItem, p ); m_startSnapPoint = snapToItem( snapEnabled, m_startItem, p );
if( checkSnap ( m_startItem )) if( checkSnap ( m_startItem ) )
{ {
controls()->ForceCursorPosition( true, m_startSnapPoint ); controls()->ForceCursorPosition( true, m_startSnapPoint );
} }
@ -293,13 +295,13 @@ void TOOL_BASE::updateStartItem( const TOOL_EVENT& aEvent, bool aIgnorePads )
void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent ) void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
{ {
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 );
m_gridHelper->SetUseGrid( !aEvent.Modifier( MD_ALT ) );
m_gridHelper->SetSnap( snapEnabled );
controls()->ForceCursorPosition( false );
VECTOR2I mousePos = controls()->GetMousePosition();
if( m_router->Settings().Mode() != RM_MarkObstacles && if( m_router->Settings().Mode() != RM_MarkObstacles &&
( m_router->GetCurrentNets().empty() || m_router->GetCurrentNets().front() < 0 ) ) ( m_router->GetCurrentNets().empty() || m_router->GetCurrentNets().front() < 0 ) )
@ -330,15 +332,15 @@ void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
if( checkSnap( endItem ) ) if( checkSnap( endItem ) )
{ {
VECTOR2I p = snapToItem( snapEnabled, endItem, mousePos );
controls()->ForceCursorPosition( true, p );
m_endItem = endItem; m_endItem = endItem;
m_endSnapPoint = p; m_endSnapPoint = snapToItem( snapEnabled, endItem, mousePos );
} else { } else {
m_endItem = nullptr; m_endItem = nullptr;
m_endSnapPoint = cursorPos; m_endSnapPoint = m_gridHelper->Align( mousePos );
} }
controls()->ForceCursorPosition( true, m_endSnapPoint );
if( m_endItem ) if( m_endItem )
{ {
wxLogTrace( "PNS", "%s, layer : %d", m_endItem->KindStr().c_str(), m_endItem->Layers().Start() ); wxLogTrace( "PNS", "%s, layer : %d", m_endItem->KindStr().c_str(), m_endItem->Layers().Start() );