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

Schematic: fix inconsistent selected-by-drag behavior of mid-line labels 

Two issues here:

Selected labels would half of the time add junctions splitting lines
when the lines would have been selected-by-drag (removing the need for a
junction).

Split lines aren't selected by drag by default, and we need to test
labels against lines that are selected by drag.

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/13224
This commit is contained in:
Mike Williams 2022-12-27 11:23:34 -05:00
parent 7e778c9856
commit 33b774685b
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
eeschema/tools/sch_move_tool.cpp
View File

@ -486,21 +486,41 @@ int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
EDA_ITEMS connectedDragItems; EDA_ITEMS connectedDragItems;
// Add connections to the selection for a drag. // Add connections to the selection for a drag.
// // Do all non-labels/entries first so we don't add junctions to drag
// when the line will eventually be drag selected.
std::vector<SCH_ITEM*> stageTwo;
for( EDA_ITEM* edaItem : selection ) for( EDA_ITEM* edaItem : selection )
{ {
SCH_ITEM* item = static_cast<SCH_ITEM*>( edaItem ); SCH_ITEM* item = static_cast<SCH_ITEM*>( edaItem );
std::vector<VECTOR2I> connections; std::vector<VECTOR2I> connections;
if( item->Type() == SCH_LINE_T ) switch( item->Type() )
{
case SCH_LABEL_T:
case SCH_HIER_LABEL_T:
case SCH_GLOBAL_LABEL_T:
case SCH_DIRECTIVE_LABEL_T:
stageTwo.emplace_back(item);
break;
case SCH_LINE_T:
static_cast<SCH_LINE*>( item )->GetSelectedPoints( connections ); static_cast<SCH_LINE*>( item )->GetSelectedPoints( connections );
else break;
default:
connections = item->GetConnectionPoints(); connections = item->GetConnectionPoints();
}
for( VECTOR2I point : connections ) for( VECTOR2I point : connections )
getConnectedDragItems( item, point, connectedDragItems, appendUndo ); getConnectedDragItems( item, point, connectedDragItems, appendUndo );
} }
// Go back and get all label connections now that we can test for drag-selected
// lines the labels might be on
for( SCH_ITEM* item : stageTwo )
for( VECTOR2I point : item->GetConnectionPoints() )
getConnectedDragItems( item, point, connectedDragItems, appendUndo );
for( EDA_ITEM* item : connectedDragItems ) for( EDA_ITEM* item : connectedDragItems )
{ {
m_dragAdditions.push_back( item->m_Uuid ); m_dragAdditions.push_back( item->m_Uuid );
@ -1219,7 +1239,8 @@ void SCH_MOVE_TOOL::getConnectedDragItems( SCH_ITEM* aSelectedItem, const VECTOR
case SCH_DIRECTIVE_LABEL_T: case SCH_DIRECTIVE_LABEL_T:
// Only add a line if this line is unselected; if the label and line are both // Only add a line if this line is unselected; if the label and line are both
// selected they'll move together // selected they'll move together
if( line->HitTest( aPoint, 1 ) && !line->HasFlag( SELECTED ) ) if( line->HitTest( aPoint, 1 ) && !line->HasFlag( SELECTED )
&& !line->HasFlag( SELECTED_BY_DRAG ) )
{ {
newWire = makeNewWire( line, aSelectedItem, aPoint, aPoint ); newWire = makeNewWire( line, aSelectedItem, aPoint, aPoint );
newWire->SetFlags( SELECTED_BY_DRAG | STARTPOINT ); newWire->SetFlags( SELECTED_BY_DRAG | STARTPOINT );
@ -1234,7 +1255,6 @@ void SCH_MOVE_TOOL::getConnectedDragItems( SCH_ITEM* aSelectedItem, const VECTOR
// Split line in half // Split line in half
if( !line->IsNew() ) if( !line->IsNew() )
{ {
line->SetFlags( SELECTED_BY_DRAG );
saveCopyInUndoList( line, UNDO_REDO::CHANGED, aAppendUndo ); saveCopyInUndoList( line, UNDO_REDO::CHANGED, aAppendUndo );
aAppendUndo = true; aAppendUndo = true;
} }
@ -1245,11 +1265,9 @@ void SCH_MOVE_TOOL::getConnectedDragItems( SCH_ITEM* aSelectedItem, const VECTOR
SCH_LINE* secondHalf = makeNewWire( line, line, aPoint, oldEnd ); SCH_LINE* secondHalf = makeNewWire( line, line, aPoint, oldEnd );
SCH_JUNCTION* junction = makeNewJunction( line, aPoint ); SCH_JUNCTION* junction = makeNewJunction( line, aPoint );
secondHalf->SetFlags( SELECTED_BY_DRAG );
saveCopyInUndoList( secondHalf, UNDO_REDO::NEWITEM, aAppendUndo ); saveCopyInUndoList( secondHalf, UNDO_REDO::NEWITEM, aAppendUndo );
aAppendUndo = true; aAppendUndo = true;
junction->SetFlags( SELECTED_BY_DRAG );
saveCopyInUndoList( junction, UNDO_REDO::NEWITEM, aAppendUndo ); saveCopyInUndoList( junction, UNDO_REDO::NEWITEM, aAppendUndo );
aAppendUndo = true; aAppendUndo = true;
} }