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

Transition from bus to wire tool when unfolding bus.

This commit is contained in:
Jeff Young 2019-05-05 17:00:59 +01:00
parent a42a4b0b52
commit c4fac81dbb
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/hotkeys.cpp
View File

@ -218,7 +218,7 @@ static EDA_HOTKEY HkSelectConnection( _HKI( "Select Connection" ), HK_SELECT_CON
static EDA_HOTKEY HkHighlightConnection( _HKI( "Highlight Connection" ), ID_HOTKEY_HIGHLIGHT, static EDA_HOTKEY HkHighlightConnection( _HKI( "Highlight Connection" ), ID_HOTKEY_HIGHLIGHT,
'B' + GR_KB_CTRL ); 'B' + GR_KB_CTRL );
static EDA_HOTKEY HkUnfoldBus( _HKI( "Unfold Bus" ), HK_UNFOLD_BUS, 'C', ID_SCH_UNFOLD_BUS ); static EDA_HOTKEY HkUnfoldBus( _HKI( "Unfold from Bus" ), HK_UNFOLD_BUS, 'C', ID_SCH_UNFOLD_BUS );
// Common: hotkeys_basic.h // Common: hotkeys_basic.h
static EDA_HOTKEY HkNew( _HKI( "New" ), HK_NEW, GR_KB_CTRL + 'N', (int) wxID_NEW ); static EDA_HOTKEY HkNew( _HKI( "New" ), HK_NEW, GR_KB_CTRL + 'N', (int) wxID_NEW );

5
eeschema/tools/sch_wire_bus_tool.cpp
View File

@ -65,7 +65,7 @@ TOOL_ACTION SCH_ACTIONS::drawBus( "eeschema.WireBusDrawing.drawBus",
TOOL_ACTION SCH_ACTIONS::unfoldBus( "eeschema.WireBusDrawing.unfoldBus", TOOL_ACTION SCH_ACTIONS::unfoldBus( "eeschema.WireBusDrawing.unfoldBus",
AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_UNFOLD_BUS ), AS_GLOBAL, TOOL_ACTION::LegacyHotKey( HK_UNFOLD_BUS ),
_( "Unfold Bus" ), _( "Break a wire out of a bus" ), _( "Unfold from Bus" ), _( "Break a wire out of a bus" ),
nullptr, AF_ACTIVATE ); nullptr, AF_ACTIVATE );
TOOL_ACTION SCH_ACTIONS::startLines( "eeschema.WireBusDrawing.startLines", TOOL_ACTION SCH_ACTIONS::startLines( "eeschema.WireBusDrawing.startLines",
@ -102,7 +102,7 @@ public:
m_showTitle( false ) m_showTitle( false )
{ {
SetIcon( add_line2bus_xpm ); SetIcon( add_line2bus_xpm );
SetTitle( _( "Unfold Bus" ) ); SetTitle( _( "Unfold from Bus" ) );
} }
void SetShowTitle() void SetShowTitle()
@ -766,6 +766,7 @@ int SCH_WIRE_BUS_TOOL::doDrawSegments( int aType, SCH_LINE* aSegment )
{ {
wxASSERT_MSG( !aSegment, "Bus unfold event recieved when already drawing!" ); wxASSERT_MSG( !aSegment, "Bus unfold event recieved when already drawing!" );
aType = LAYER_WIRE;
wxString net = *evt->Parameter<wxString*>(); wxString net = *evt->Parameter<wxString*>();
aSegment = doUnfoldBus( net ); aSegment = doUnfoldBus( net );
} }