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

Implement align-to-grid for sheets. 

Fixes https://gitlab.com/kicad/code/kicad/issues/11201
This commit is contained in:
Jeff Young 2022-03-29 19:30:10 +01:00
parent b78a260326
commit 8dc680adbb
1 changed files with 60 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
eeschema/tools/sch_move_tool.cpp
View File

@ -1301,8 +1301,8 @@ void SCH_MOVE_TOOL::moveItem( EDA_ITEM* aItem, const VECTOR2I& aDelta )
if( aItem->HasFlag( ENDPOINT ) ) if( aItem->HasFlag( ENDPOINT ) )
line->MoveEnd( aDelta ); line->MoveEnd( aDelta );
}
break; break;
}
case SCH_PIN_T: case SCH_PIN_T:
case SCH_FIELD_T: case SCH_FIELD_T:
@ -1326,13 +1326,16 @@ void SCH_MOVE_TOOL::moveItem( EDA_ITEM* aItem, const VECTOR2I& aDelta )
break; break;
} }
case SCH_SHEET_PIN_T: case SCH_SHEET_PIN_T:
{ {
SCH_SHEET_PIN* pin = (SCH_SHEET_PIN*) aItem; SCH_SHEET_PIN* pin = (SCH_SHEET_PIN*) aItem;
pin->SetStoredPos( pin->GetStoredPos() + aDelta ); pin->SetStoredPos( pin->GetStoredPos() + aDelta );
pin->ConstrainOnEdge( pin->GetStoredPos() ); pin->ConstrainOnEdge( pin->GetStoredPos() );
break; break;
} }
case SCH_LABEL_T: case SCH_LABEL_T:
case SCH_DIRECTIVE_LABEL_T: case SCH_DIRECTIVE_LABEL_T:
case SCH_GLOBAL_LABEL_T: case SCH_GLOBAL_LABEL_T:
@ -1353,6 +1356,7 @@ void SCH_MOVE_TOOL::moveItem( EDA_ITEM* aItem, const VECTOR2I& aDelta )
break; break;
} }
default: default:
static_cast<SCH_ITEM*>( aItem )->Move( aDelta ); static_cast<SCH_ITEM*>( aItem )->Move( aDelta );
break; break;
@ -1369,6 +1373,17 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
EE_SELECTION& selection = m_selectionTool->RequestSelection( EE_COLLECTOR::MovableItems ); EE_SELECTION& selection = m_selectionTool->RequestSelection( EE_COLLECTOR::MovableItems );
bool append_undo = false; bool append_undo = false;
auto doMoveItem =
[&]( EDA_ITEM* item, const VECTOR2I& delta )
{
saveCopyInUndoList( item, UNDO_REDO::CHANGED, append_undo );
append_undo = true;
moveItem( item, delta );
item->ClearFlags( IS_MOVING );
updateItem( item, true );
};
for( SCH_ITEM* it : m_frame->GetScreen()->Items() ) for( SCH_ITEM* it : m_frame->GetScreen()->Items() )
{ {
if( !it->IsSelected() ) if( !it->IsSelected() )
@ -1412,12 +1427,7 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
if( dragItem->GetParent() && dragItem->GetParent()->IsSelected() ) if( dragItem->GetParent() && dragItem->GetParent()->IsSelected() )
continue; continue;
saveCopyInUndoList( dragItem, UNDO_REDO::CHANGED, append_undo ); doMoveItem( dragItem, gridpt );
append_undo = true;
moveItem( dragItem, gridpt );
dragItem->ClearFlags( IS_MOVING );
updateItem( dragItem, true );
} }
} }
} }
@ -1427,13 +1437,49 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
VECTOR2I gridpt = grid.AlignGrid( item->GetPosition() ) - item->GetPosition(); VECTOR2I gridpt = grid.AlignGrid( item->GetPosition() ) - item->GetPosition();
if( gridpt != VECTOR2I( 0, 0 ) ) if( gridpt != VECTOR2I( 0, 0 ) )
{ doMoveItem( item, gridpt );
saveCopyInUndoList( item, UNDO_REDO::CHANGED, append_undo ); }
append_undo = true; else if( item->Type() == SCH_SHEET_T )
{
SCH_SHEET* sheet = static_cast<SCH_SHEET*>( item );
VECTOR2I topRight = sheet->GetPosition();
VECTOR2I bottomRight = topRight + sheet->GetSize();
VECTOR2I tl_gridpt = grid.AlignGrid( topRight ) - topRight;
VECTOR2I br_gridpt = grid.AlignGrid( bottomRight ) - bottomRight;
moveItem( item, gridpt ); if( tl_gridpt != VECTOR2I( 0, 0 ) || br_gridpt != VECTOR2I( 0, 0 ) )
updateItem( item, true ); {
item->ClearFlags( IS_MOVING ); doMoveItem( sheet, tl_gridpt );
VECTOR2I newSize = (VECTOR2I) sheet->GetSize() - tl_gridpt + br_gridpt;
sheet->SetSize( wxSize( newSize.x, newSize.y ) );
updateItem( sheet, true );
for( SCH_SHEET_PIN* pin : sheet->GetPins() )
{
VECTOR2I gridpt;
if( pin->GetSide() == SHEET_SIDE::TOP || pin->GetSide() == SHEET_SIDE::LEFT )
gridpt = tl_gridpt;
else
gridpt = br_gridpt;
if( gridpt != VECTOR2I( 0, 0 ) )
{
EDA_ITEMS drag_items;
getConnectedDragItems( pin, pin->GetConnectionPoints()[0], drag_items );
doMoveItem( pin, gridpt );
for( EDA_ITEM* dragItem : drag_items )
{
if( dragItem->GetParent() && dragItem->GetParent()->IsSelected() )
continue;
doMoveItem( dragItem, gridpt );
}
}
}
} }
} }
else else
@ -1469,12 +1515,7 @@ int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
if( dragItem->GetParent() && dragItem->GetParent()->IsSelected() ) if( dragItem->GetParent() && dragItem->GetParent()->IsSelected() )
continue; continue;
saveCopyInUndoList( dragItem, UNDO_REDO::CHANGED, append_undo ); doMoveItem( dragItem, most_common );
append_undo = true;
moveItem( dragItem, most_common );
dragItem->ClearFlags( IS_MOVING );
updateItem( dragItem, true );
} }
} }
} }