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

Make sure move machinery gets initialized if we're going to use it. 

Fixes https://gitlab.com/kicad/code/kicad/issues/6293
This commit is contained in:
Jeff Young 2020-11-06 12:20:52 +00:00
parent 69c1171320
commit 91ba002da7
1 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
eeschema/tools/sch_move_tool.cpp
View File

@ -756,6 +756,23 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
EE_SELECTION& selection = m_selectionTool->RequestSelection( movableItems ); EE_SELECTION& selection = m_selectionTool->RequestSelection( movableItems );
bool append_undo = false; bool append_undo = false;
for( SCH_ITEM* it : m_frame->GetScreen()->Items() )
{
if( !it->IsSelected() )
it->ClearFlags( STARTPOINT | ENDPOINT );
if( !selection.IsHover() && it->IsSelected() )
it->SetFlags( STARTPOINT | ENDPOINT );
it->SetStoredPos( it->GetPosition() );
if( it->Type() == SCH_SHEET_T )
{
for( SCH_SHEET_PIN* pin : static_cast<SCH_SHEET*>( it )->GetPins() )
pin->SetStoredPos( pin->GetPosition() );
}
}
for( EDA_ITEM* item : selection ) for( EDA_ITEM* item : selection )
{ {
if( item->Type() == SCH_LINE_T ) if( item->Type() == SCH_LINE_T )
@ -788,7 +805,6 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
updateItem( dritem, true ); updateItem( dritem, true );
} }
} }
} }
} }
else else
@ -797,14 +813,14 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
EDA_ITEMS drag_items{ item }; EDA_ITEMS drag_items{ item };
connections = static_cast<SCH_ITEM*>( item )->GetConnectionPoints(); connections = static_cast<SCH_ITEM*>( item )->GetConnectionPoints();
for( wxPoint point : connections ) for( const wxPoint& point : connections )
getConnectedDragItems( static_cast<SCH_ITEM*>( item ), point, drag_items ); getConnectedDragItems( static_cast<SCH_ITEM*>( item ), point, drag_items );
std::map<VECTOR2I, int> shifts; std::map<VECTOR2I, int> shifts;
VECTOR2I most_common( 0, 0 ); VECTOR2I most_common( 0, 0 );
int max_count = 0; int max_count = 0;
for( auto& conn : connections ) for( const wxPoint& conn : connections )
{ {
VECTOR2I gridpt = grid.AlignGrid( conn ) - conn; VECTOR2I gridpt = grid.AlignGrid( conn ) - conn;
@ -819,7 +835,7 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
if( most_common != VECTOR2I( 0, 0 ) ) if( most_common != VECTOR2I( 0, 0 ) )
{ {
for( auto dritem : drag_items ) for( EDA_ITEM* dritem : drag_items )
{ {
if( dritem->GetParent() && dritem->GetParent()->IsSelected() ) if( dritem->GetParent() && dritem->GetParent()->IsSelected() )
continue; continue;
@ -834,7 +850,6 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
} }
} }
m_toolMgr->PostEvent( EVENTS::SelectedItemsMoved ); m_toolMgr->PostEvent( EVENTS::SelectedItemsMoved );
m_toolMgr->RunAction( EE_ACTIONS::addNeededJunctions, true, &selection ); m_toolMgr->RunAction( EE_ACTIONS::addNeededJunctions, true, &selection );