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

eeschema: Add directly connected items to block 

Allow components to connect to both components and junctions

Fixes: lp:1798968
* https://bugs.launchpad.net/kicad/+bug/1798968
This commit is contained in:
Seth Hillbrand 2019-01-10 17:28:29 -08:00
parent 6b75f589e9
commit 353bda6792
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
eeschema/sch_component.h
View File

@ -599,7 +599,8 @@ public:
{ {
return ( aItem->Type() == SCH_LINE_T && aItem->GetLayer() == LAYER_WIRE ) || return ( aItem->Type() == SCH_LINE_T && aItem->GetLayer() == LAYER_WIRE ) ||
( aItem->Type() == SCH_NO_CONNECT_T ) || ( aItem->Type() == SCH_NO_CONNECT_T ) ||
( aItem->Type() == SCH_JUNCTION_T ); ( aItem->Type() == SCH_JUNCTION_T ) ||
( aItem->Type() == SCH_COMPONENT_T ) ;
} }
/** /**

5
eeschema/sch_junction.h
View File

@ -87,8 +87,9 @@ public:
bool CanConnect( const SCH_ITEM* aItem ) const override bool CanConnect( const SCH_ITEM* aItem ) const override
{ {
return aItem->Type() == SCH_LINE_T && return ( aItem->Type() == SCH_LINE_T &&
( aItem->GetLayer() == LAYER_WIRE || aItem->GetLayer() == LAYER_BUS ); ( aItem->GetLayer() == LAYER_WIRE || aItem->GetLayer() == LAYER_BUS ) ) ||
aItem->Type() == SCH_COMPONENT_T;
} }
wxString GetSelectMenuText( EDA_UNITS_T aUnits ) const override wxString GetSelectMenuText( EDA_UNITS_T aUnits ) const override