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

Fix bugs in bus unfold logic. 

The worst of which left you in the bus unfold popup menu event loop
if you cancelled the menu by clicking outside it.
This commit is contained in:
Jeff Young 2019-05-05 19:48:11 +01:00
parent 0b2e1d00ea
commit b7e67073ef
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
eeschema/tools/sch_wire_bus_tool.cpp
View File

@ -380,6 +380,8 @@ int SCH_WIRE_BUS_TOOL::UnfoldBus( const TOOL_EVENT& aEvent )
wxString net;
SCH_LINE* segment = nullptr;
m_toolMgr->RunAction( SCH_ACTIONS::clearSelection, true );
Activate();
if( netPtr )
@ -392,7 +394,6 @@ int SCH_WIRE_BUS_TOOL::UnfoldBus( const TOOL_EVENT& aEvent )
BUS_UNFOLD_MENU unfoldMenu;
unfoldMenu.SetTool( this );
unfoldMenu.SetShowTitle();
unfoldMenu.UpdateAll();
SetContextMenu( &unfoldMenu, CMENU_NOW );
@ -403,10 +404,9 @@ int SCH_WIRE_BUS_TOOL::UnfoldBus( const TOOL_EVENT& aEvent )
OPT<int> id = evt->GetCommandId();
if( id && ( *id > 0 ) )
{
net = *evt->Parameter<wxString*>();
break;
}
break;
}
}
}
@ -417,12 +417,17 @@ int SCH_WIRE_BUS_TOOL::UnfoldBus( const TOOL_EVENT& aEvent )
segment = doUnfoldBus( net );
}
// If we have an unfolded wire to draw, then draw it
if( segment )
{
// Continue drawing with the unfolded wire
doDrawSegments( LAYER_WIRE, segment );
}
return doDrawSegments( LAYER_WIRE, segment );
// If we came from one of our tools then re-enter it in the idle state
if( m_frame->GetToolId() == ID_WIRE_BUTT )
return doDrawSegments( LAYER_WIRE, nullptr );
else if( m_frame->GetToolId() == ID_BUS_BUTT )
return doDrawSegments( LAYER_BUS, nullptr );
m_frame->SetNoToolSelected();
return 0;
}
@ -610,12 +615,17 @@ int SCH_WIRE_BUS_TOOL::doDrawSegments( int aType, SCH_LINE* aSegment )
continue;
}
if( evt->IsAction( &SCH_ACTIONS::drawWire ) && aType == LAYER_WIRE )
; // don't cancel tool; we're going to re-enter
else if( evt->IsAction( &SCH_ACTIONS::drawBus ) && aType == LAYER_BUS )
; // don't cancel tool; we're going to re-enter
if( ( evt->IsAction( &SCH_ACTIONS::drawWire ) && aType == LAYER_WIRE )
|| ( evt->IsAction( &SCH_ACTIONS::drawBus ) && aType == LAYER_BUS )
|| ( evt->IsAction( &SCH_ACTIONS::unfoldBus ) && aType == LAYER_WIRE ) )
{
// Don't reset tool. If we do the next command will think it needs to
// re-select the tool rather than start a wire or bus.
}
else
{
m_frame->SetNoToolSelected();
}
break;
}