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

Don't try an intertwine deletion and junction fixup. 

Fixes: lp:1833224
* https://bugs.launchpad.net/kicad/+bug/1833224
This commit is contained in:
Jeff Young 2019-06-19 19:30:11 +01:00
parent bacb8c26cc
commit 4054d7ddf7
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
eeschema/tools/sch_edit_tool.cpp
View File

@ -878,9 +878,10 @@ static KICAD_T deletableItems[] =
int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
{
SCH_SCREEN* screen = m_frame->GetScreen();
auto items = m_selectionTool->RequestSelection( deletableItems ).GetItems();
bool appendToUndo = false;
SCH_SCREEN* screen = m_frame->GetScreen();
auto items = m_selectionTool->RequestSelection( deletableItems ).GetItems();
bool appendToUndo = false;
std::vector<wxPoint> pts;
if( items.empty() )
return 0;
@ -889,16 +890,13 @@ int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true );
for( EDA_ITEM* item : items )
{
// Junctions, in particular, may have already been deleted if deleting wires made
// them redundant
if( item->GetEditFlags() & STRUCT_DELETED )
continue;
item->ClearFlags( STRUCT_DELETED );
for( EDA_ITEM* item : items )
{
if( item->Type() == SCH_JUNCTION_T )
{
m_frame->DeleteJunction( (SCH_ITEM*) item, appendToUndo );
appendToUndo = true;
// clean up junctions at the end
}
else
{
@ -906,22 +904,12 @@ int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
saveCopyInUndoList( item, UR_DELETED, appendToUndo );
appendToUndo = true;
updateView( item );
SCH_ITEM* sch_item = dynamic_cast<SCH_ITEM*>( item );
if( sch_item && sch_item->IsConnectable() )
{
std::vector< wxPoint > pts;
sch_item->GetConnectionPoints( pts );
for( auto point : pts )
{
SCH_ITEM* junction = screen->GetItem( point, 0, SCH_JUNCTION_T );
if( junction && !screen->IsJunctionNeeded( point ) )
m_frame->DeleteJunction( junction, appendToUndo );
}
}
updateView( item );
if( item->Type() == SCH_SHEET_PIN_T )
static_cast<SCH_SHEET*>( item->GetParent() )->RemovePin( (SCH_SHEET_PIN*) item );
@ -930,6 +918,13 @@ int SCH_EDIT_TOOL::DoDelete( const TOOL_EVENT& aEvent )
}
}
for( auto point : pts )
{
SCH_ITEM* junction = screen->GetItem( point, 0, SCH_JUNCTION_T );
if( junction && !screen->IsJunctionNeeded( point ) )
m_frame->DeleteJunction( junction, appendToUndo );
}
m_frame->TestDanglingEnds();
m_frame->GetCanvas()->Refresh();