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

pcbnew: Prevent aux axis after-image 

Grid helper in the router tool is persistent, so remember to turn off
the aux axes after setting.

Fixes: lp:1822577
* https://bugs.launchpad.net/kicad/+bug/1822577
This commit is contained in:
Seth Hillbrand 2019-04-01 06:22:51 -07:00
parent 6f4d1345f3
commit 428e7a900b
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pcbnew/router/router_tool.cpp
View File

@ -1026,7 +1026,6 @@ void ROUTER_TOOL::performDragging( int aMode )
return; return;
} }
m_gridHelper->SetAuxAxes( true, m_startSnapPoint, true );
bool dragStarted = m_router->StartDragging( m_startSnapPoint, m_startItem, aMode ); bool dragStarted = m_router->StartDragging( m_startSnapPoint, m_startItem, aMode );
if( !dragStarted ) if( !dragStarted )
@ -1036,7 +1035,7 @@ void ROUTER_TOOL::performDragging( int aMode )
highlightNet( true, m_startItem->Net() ); highlightNet( true, m_startItem->Net() );
ctls->SetAutoPan( true ); ctls->SetAutoPan( true );
m_gridHelper->SetAuxAxes( true, m_startSnapPoint, true );
frame()->UndoRedoBlock( true ); frame()->UndoRedoBlock( true );
while( OPT_TOOL_EVENT evt = Wait() ) while( OPT_TOOL_EVENT evt = Wait() )
@ -1066,6 +1065,7 @@ void ROUTER_TOOL::performDragging( int aMode )
m_startItem = nullptr; m_startItem = nullptr;
m_gridHelper->SetAuxAxes( false );
frame()->UndoRedoBlock( false ); frame()->UndoRedoBlock( false );
ctls->SetAutoPan( false ); ctls->SetAutoPan( false );
ctls->ForceCursorPosition( false ); ctls->ForceCursorPosition( false );
@ -1178,7 +1178,6 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
VECTOR2I p0 = controls()->GetCursorPosition( false ); VECTOR2I p0 = controls()->GetCursorPosition( false );
auto p = snapToItem( true, m_startItem, p0 ); auto p = snapToItem( true, m_startItem, p0 );
m_gridHelper->SetAuxAxes( true, p, true );
int dragMode = aEvent.Parameter<int64_t> (); int dragMode = aEvent.Parameter<int64_t> ();
bool dragStarted = m_router->StartDragging( p, m_startItem, dragMode ); bool dragStarted = m_router->StartDragging( p, m_startItem, dragMode );
@ -1186,6 +1185,7 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
if( !dragStarted ) if( !dragStarted )
return 0; return 0;
m_gridHelper->SetAuxAxes( true, p, true );
controls()->ShowCursor( true ); controls()->ShowCursor( true );
controls()->ForceCursorPosition( false ); controls()->ForceCursorPosition( false );
controls()->SetAutoPan( true ); controls()->SetAutoPan( true );
@ -1213,6 +1213,7 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
if( m_router->RoutingInProgress() ) if( m_router->RoutingInProgress() )
m_router->StopRouting(); m_router->StopRouting();
m_gridHelper->SetAuxAxes( false );
controls()->SetAutoPan( false ); controls()->SetAutoPan( false );
controls()->ForceCursorPosition( false ); controls()->ForceCursorPosition( false );
frame()->UndoRedoBlock( false ); frame()->UndoRedoBlock( false );