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

Honour alt-means-disable-grid-snapping in router. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6679
This commit is contained in:
Jeff Young 2020-12-11 13:11:20 +00:00
parent d304f12284
commit 7cb2d19814
3 changed files with 41 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
pcbnew/router/pns_tool_base.cpp
View File

@ -270,46 +270,39 @@ bool TOOL_BASE::checkSnap( ITEM *aItem )
void TOOL_BASE::updateStartItem( const TOOL_EVENT& aEvent, bool aIgnorePads )
{
int tl = getView()->GetTopLayer();
int tl = getView()->GetTopLayer();
VECTOR2I cp = controls()->GetCursorPosition( !aEvent.Modifier( MD_SHIFT ) );
VECTOR2I p;
GAL* gal = m_toolMgr->GetView()->GetGAL();
controls()->ForceCursorPosition( false );
m_gridHelper->SetUseGrid( m_toolMgr->GetView()->GetGAL()->GetGridSnapping() );
m_gridHelper->SetUseGrid( gal->GetGridSnapping() && !aEvent.Modifier( MD_ALT ) );
m_gridHelper->SetSnap( !aEvent.Modifier( MD_SHIFT ) );
bool snapEnabled = true;
if( aEvent.IsMotion() || aEvent.IsClick() )
{
snapEnabled = !aEvent.Modifier( MD_SHIFT );
p = aEvent.Position();
}
else
{
p = cp;
}
m_startItem = pickSingleItem( p, -1, -1, aIgnorePads );
if( !snapEnabled && m_startItem && !m_startItem->Layers().Overlaps( tl ) )
if( m_startItem && !m_startItem->Layers().Overlaps( tl ) )
m_startItem = nullptr;
m_startSnapPoint = snapToItem( snapEnabled, m_startItem, p );
m_startSnapPoint = snapToItem( m_startItem, p );
if( checkSnap( m_startItem ) )
{
controls()->ForceCursorPosition( true, m_startSnapPoint );
}
}
void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
{
int layer;
bool snapEnabled = !aEvent.Modifier( MD_SHIFT );
m_gridHelper->SetUseGrid( m_toolMgr->GetView()->GetGAL()->GetGridSnapping() );
m_gridHelper->SetSnap( snapEnabled );
int layer;
GAL* gal = m_toolMgr->GetView()->GetGAL();
m_gridHelper->SetUseGrid( gal->GetGridSnapping() && !aEvent.Modifier( MD_ALT ) );
m_gridHelper->SetSnap( !aEvent.Modifier( MD_SHIFT ) );
controls()->ForceCursorPosition( false );
VECTOR2I mousePos = controls()->GetMousePosition();
@ -317,7 +310,7 @@ void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
if( m_router->Settings().Mode() != RM_MarkObstacles &&
( m_router->GetCurrentNets().empty() || m_router->GetCurrentNets().front() < 0 ) )
{
m_endSnapPoint = snapToItem( snapEnabled, nullptr, mousePos );
m_endSnapPoint = snapToItem( nullptr, mousePos );
controls()->ForceCursorPosition( true, m_endSnapPoint );
m_endItem = nullptr;
@ -344,7 +337,7 @@ void TOOL_BASE::updateEndItem( const TOOL_EVENT& aEvent )
if( checkSnap( endItem ) )
{
m_endItem = endItem;
m_endSnapPoint = snapToItem( snapEnabled, endItem, mousePos );
m_endSnapPoint = snapToItem( endItem, mousePos );
}
else
{
@ -369,11 +362,9 @@ ROUTER *TOOL_BASE::Router() const
}
const VECTOR2I TOOL_BASE::snapToItem( bool aEnabled, ITEM* aItem, VECTOR2I aP)
const VECTOR2I TOOL_BASE::snapToItem( ITEM* aItem, VECTOR2I aP )
{
VECTOR2I anchor;
if( !aItem || !aEnabled || !m_iface->IsItemVisible( aItem ) )
if( !aItem || !m_iface->IsItemVisible( aItem ) )
{
return m_gridHelper->Align( aP );
}
@ -381,12 +372,10 @@ const VECTOR2I TOOL_BASE::snapToItem( bool aEnabled, ITEM* aItem, VECTOR2I aP)
switch( aItem->Kind() )
{
case ITEM::SOLID_T:
anchor = static_cast<SOLID*>( aItem )->Pos();
break;
return static_cast<SOLID*>( aItem )->Pos();
case ITEM::VIA_T:
anchor = static_cast<VIA*>( aItem )->Pos();
break;
return static_cast<VIA*>( aItem )->Pos();
case ITEM::SEGMENT_T:
case ITEM::ARC_T:
@ -400,30 +389,27 @@ const VECTOR2I TOOL_BASE::snapToItem( bool aEnabled, ITEM* aItem, VECTOR2I aP)
if( distA_sq < w_sq || distB_sq < w_sq )
{
anchor = distA_sq < distB_sq ? A : B;
return ( distA_sq < distB_sq ) ? A : B;
}
else // TODO(snh): Clean this up
// TODO(snh): Clean this up
else if( aItem->Kind() == ITEM::SEGMENT_T )
{
if( aItem->Kind() == ITEM::SEGMENT_T )
{
SEGMENT* seg = static_cast<SEGMENT*>( li );
anchor = m_gridHelper->AlignToSegment( aP, seg->Seg() );
}
else if( aItem->Kind() == ITEM::ARC_T )
{
ARC* arc = static_cast<ARC*>( li );
anchor = m_gridHelper->AlignToArc( aP, *static_cast<const SHAPE_ARC*>( arc->Shape() ) );
}
SEGMENT* seg = static_cast<SEGMENT*>( li );
return m_gridHelper->AlignToSegment( aP, seg->Seg() );
}
else if( aItem->Kind() == ITEM::ARC_T )
{
ARC* arc = static_cast<ARC*>( li );
return m_gridHelper->AlignToArc( aP, *static_cast<const SHAPE_ARC*>( arc->Shape() ) );
}
break;
}
break;
default:
break;
}
return anchor;
return m_gridHelper->Align( aP );
}
}

2
pcbnew/router/pns_tool_base.h
View File

@ -54,7 +54,7 @@ public:
protected:
bool checkSnap( ITEM* aItem );
const VECTOR2I snapToItem( bool aEnabled, ITEM* aItem, VECTOR2I aP);
const VECTOR2I snapToItem( ITEM* aSnapToItem, VECTOR2I aP);
virtual ITEM* pickSingleItem( const VECTOR2I& aWhere, int aNet = -1, int aLayer = -1,
bool aIgnorePads = false,

17
pcbnew/router/router_tool.cpp
View File

@ -1509,11 +1509,15 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
return 0;
}
GAL* gal = m_toolMgr->GetView()->GetGAL();
VECTOR2I p0 = controls()->GetCursorPosition( false );
VECTOR2I p = p0;
m_gridHelper->SetUseGrid( gal->GetGridSnapping() && !aEvent.Modifier( MD_ALT ) );
m_gridHelper->SetSnap( !aEvent.Modifier( MD_SHIFT ) );
if( startItem )
p = snapToItem( true, startItem, p0 );
p = snapToItem( startItem, p0 );
int dragMode = aEvent.Parameter<int64_t> ();
@ -1653,7 +1657,7 @@ int ROUTER_TOOL::InlineDrag( const TOOL_EVENT& aEvent )
int ROUTER_TOOL::InlineBreakTrack( const TOOL_EVENT& aEvent )
{
const auto& selection = m_toolMgr->GetTool<SELECTION_TOOL>()->GetSelection();
const SELECTION& selection = m_toolMgr->GetTool<SELECTION_TOOL>()->GetSelection();
if( selection.Size() != 1 )
return 0;
@ -1670,20 +1674,23 @@ int ROUTER_TOOL::InlineBreakTrack( const TOOL_EVENT& aEvent )
m_startItem = m_router->GetWorld()->FindItemByParent( item );
TOOL_MANAGER* toolManager = frame()->GetToolManager();
GAL* gal = toolManager->GetView()->GetGAL();
m_gridHelper->SetUseGrid( gal->GetGridSnapping() && !aEvent.Modifier( MD_ALT ) );
m_gridHelper->SetSnap( !aEvent.Modifier( MD_SHIFT ) );
if( toolManager->IsContextMenuActive() )
{
// If we're here from a context menu then we need to get the position of the
// cursor when the context menu was invoked. This is used to figure out the
// break point on the track.
VECTOR2I CurrPos = toolManager->GetMenuCursorPos();
m_startSnapPoint = snapToItem( true, m_startItem, toolManager->GetMenuCursorPos() );
m_startSnapPoint = snapToItem( m_startItem, toolManager->GetMenuCursorPos() );
}
else
{
// If we're here from a hotkey, then get the current mouse position so we know
// where to break the track.
m_startSnapPoint = snapToItem( true, m_startItem, controls()->GetCursorPosition() );
m_startSnapPoint = snapToItem( m_startItem, controls()->GetCursorPosition() );
}
if( m_startItem && m_startItem->IsLocked() )