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

Promote field selection to field-owner for Autoplace. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11529
This commit is contained in:
Jeff Young 2022-05-02 20:10:40 +01:00
parent d2610736ff
commit f6f316bd8c
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
eeschema/tools/sch_edit_tool.cpp
View File

@ -1302,21 +1302,34 @@ int SCH_EDIT_TOOL::EditField( const TOOL_EVENT& aEvent )
int SCH_EDIT_TOOL::AutoplaceFields( const TOOL_EVENT& aEvent ) int SCH_EDIT_TOOL::AutoplaceFields( const TOOL_EVENT& aEvent )
{ {
EE_SELECTION& selection = m_selectionTool->RequestSelection( rotatableItems ); EE_SELECTION& selection = m_selectionTool->RequestSelection( rotatableItems );
SCH_ITEM* head = static_cast<SCH_ITEM*>( selection.Front() );
bool moving = head && head->IsMoving();
if( selection.Empty() ) if( selection.Empty() )
return 0; return 0;
SCH_ITEM* head = static_cast<SCH_ITEM*>( selection.Front() ); std::vector<SCH_ITEM*> autoplaceItems;
bool moving = head && head->IsMoving();
for( unsigned ii = 0; ii < selection.GetSize(); ii++ ) for( unsigned ii = 0; ii < selection.GetSize(); ii++ )
{ {
SCH_ITEM* sch_item = static_cast<SCH_ITEM*>( selection.GetItem( ii ) ); SCH_ITEM* item = static_cast<SCH_ITEM*>( selection.GetItem( ii ) );
if( item->IsType( EE_COLLECTOR::FieldOwners ) )
autoplaceItems.push_back( item );
else if( item->GetParent() && item->GetParent()->IsType( EE_COLLECTOR::FieldOwners ) )
autoplaceItems.push_back( static_cast<SCH_ITEM*>( item->GetParent() ) );
}
bool appendUndo = false;
for( SCH_ITEM* sch_item : autoplaceItems )
{
if( !moving && !sch_item->IsNew() ) if( !moving && !sch_item->IsNew() )
saveCopyInUndoList( sch_item, UNDO_REDO::CHANGED, ii > 0, false ); {
saveCopyInUndoList( sch_item, UNDO_REDO::CHANGED, appendUndo, false );
appendUndo = true;
}
if( sch_item->IsType( EE_COLLECTOR::FieldOwners ) )
sch_item->AutoplaceFields( m_frame->GetScreen(), /* aManual */ true ); sch_item->AutoplaceFields( m_frame->GetScreen(), /* aManual */ true );
updateItem( sch_item, true ); updateItem( sch_item, true );