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

Snap Eeschema moves to nearest anchor 

Fixes https://gitlab.com/kicad/code/kicad/issues/3803
This commit is contained in:
Seth Hillbrand 2020-09-09 10:08:24 -07:00
parent 4026904cc4
commit 62433736bc
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
eeschema/tools/sch_move_tool.cpp
View File

@ -23,6 +23,7 @@
*/ */
#include <tool/tool_manager.h> #include <tool/tool_manager.h>
#include <tools/ee_grid_helper.h>
#include <tools/ee_selection_tool.h> #include <tools/ee_selection_tool.h>
#include <tools/sch_line_wire_bus_tool.h> #include <tools/sch_line_wire_bus_tool.h>
#include <ee_actions.h> #include <ee_actions.h>
@ -110,6 +111,7 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
EESCHEMA_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>(); EESCHEMA_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>();
KIGFX::VIEW_CONTROLS* controls = getViewControls(); KIGFX::VIEW_CONTROLS* controls = getViewControls();
controls->SetGridSnapping( m_frame->IsGridVisible() ); controls->SetGridSnapping( m_frame->IsGridVisible() );
EE_GRID_HELPER grid( m_toolMgr );
m_anchorPos.reset(); m_anchorPos.reset();
@ -191,7 +193,6 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
m_specialCaseLabels.clear(); m_specialCaseLabels.clear();
internalPoints.clear(); internalPoints.clear();
for( auto it : m_frame->GetScreen()->Items() ) for( auto it : m_frame->GetScreen()->Items() )
{ {
it->ClearFlags( TEMP_SELECTED ); it->ClearFlags( TEMP_SELECTED );
@ -298,23 +299,21 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
} }
// For some items, moving the cursor to anchor is not good (for instance large // For some items, moving the cursor to anchor is not good (for instance large
// hierarchical sheets or components can have the anchor outside the view) // hierarchical sheets or components can have the anchor outside the view)
else if( selection.Size() == 1 && sch_item->IsMovableFromAnchorPoint() else if( selection.Size() == 1 && !sch_item->IsMovableFromAnchorPoint() )
&& m_frame->GetMoveWarpsCursor() )
{
if( sch_item->Type() == SCH_LINE_T && !sch_item->HasFlag( STARTPOINT ) )
m_anchorPos = static_cast<SCH_LINE*>( sch_item )->GetEndPoint();
else
m_anchorPos = sch_item->GetPosition();
getViewControls()->WarpCursor( *m_anchorPos, true, true );
m_cursor = *m_anchorPos;
}
// ...otherwise modify items with regard to the grid-snapped cursor position
else
{ {
m_cursor = getViewControls()->GetCursorPosition( true ); m_cursor = getViewControls()->GetCursorPosition( true );
m_anchorPos = m_cursor; m_anchorPos = m_cursor;
} }
else
{
std::vector<SCH_ITEM*> items;
for( EDA_ITEM* item : selection )
items.push_back( static_cast<SCH_ITEM*>( item ) );
m_cursor = grid.BestDragOrigin( m_cursor, items );
}
controls->SetCursorPosition( m_cursor, false ); controls->SetCursorPosition( m_cursor, false );
m_toolMgr->PostEvent( EVENTS::SelectedItemsModified ); m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );