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

Force deletion of junctions which were selected. 

Fixes: lp:1841456
* https://bugs.launchpad.net/kicad/+bug/1841456
This commit is contained in:
Jeff Young 2019-08-27 11:03:49 +01:00
parent 548dbb7c29
commit 49a0907c55
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eeschema/tools/sch_edit_tool.cpp
View File

@ -895,34 +895,46 @@ int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
for( EDA_ITEM* item : items ) for( EDA_ITEM* item : items )
{ {
if( item->Type() == SCH_JUNCTION_T ) SCH_ITEM* sch_item = dynamic_cast<SCH_ITEM*>( item );
if( sch_item->Type() == SCH_JUNCTION_T )
{ {
sch_item->SetFlags( STRUCT_DELETED );
sch_item->GetConnectionPoints( pts );
// clean up junctions at the end // clean up junctions at the end
} }
else else
{ {
item->SetFlags( STRUCT_DELETED ); sch_item->SetFlags( STRUCT_DELETED );
saveCopyInUndoList( item, UR_DELETED, appendToUndo ); saveCopyInUndoList( item, UR_DELETED, appendToUndo );
appendToUndo = true; appendToUndo = true;
SCH_ITEM* sch_item = dynamic_cast<SCH_ITEM*>( item );
if( sch_item && sch_item->IsConnectable() ) if( sch_item && sch_item->IsConnectable() )
sch_item->GetConnectionPoints( pts ); sch_item->GetConnectionPoints( pts );
updateView( item ); updateView( sch_item );
if( item->Type() == SCH_SHEET_PIN_T ) if( sch_item->Type() == SCH_SHEET_PIN_T )
static_cast<SCH_SHEET*>( item->GetParent() )->RemovePin( (SCH_SHEET_PIN*) item ); {
SCH_SHEET_PIN* pin = (SCH_SHEET_PIN*) sch_item;
SCH_SHEET* sheet = pin->GetParent();
sheet->RemovePin( pin );
}
else else
m_frame->RemoveFromScreen( item ); m_frame->RemoveFromScreen( sch_item );
} }
} }
for( auto point : pts ) for( auto point : pts )
{ {
SCH_ITEM* junction = screen->GetItem( point, 0, SCH_JUNCTION_T ); SCH_ITEM* junction = screen->GetItem( point, 0, SCH_JUNCTION_T );
if( junction && !screen->IsJunctionNeeded( point ) )
if( !junction )
continue;
if( ( junction->GetFlags() & STRUCT_DELETED ) > 0 || !screen->IsJunctionNeeded( point ) )
m_frame->DeleteJunction( junction, appendToUndo ); m_frame->DeleteJunction( junction, appendToUndo );
} }