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

Fix a few cases missed in the last merge. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7042
This commit is contained in:
Jeff Young 2021-06-16 00:01:02 +01:00
parent 3a84ee27fd
commit 21b869bd1f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp
View File

@ -2356,7 +2356,7 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
moveLabels( line, p ); moveLabels( line, p );
line->SetStartPoint( p ); line->SetStartPoint( p );
} }
else if( testBusHit( linestart + entrySize( 0, 100 ) ) ) else if( testBusHit( linestart + entrySize( 0, 1 ) ) )
{ {
// There is room below the wire for the bus entry // There is room below the wire for the bus entry
// | ___ // | ___
@ -2504,12 +2504,11 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
// | // |
// \ // \
// ----- // -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
linestart + wxPoint( 0, 100 ), false );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 0, -100 ) ); moveLabels( line, p );
line->SetStartPoint( linestart + wxPoint( 0, -100 ) ); line->SetStartPoint( p );
} }
else else
{ {
@ -2575,7 +2574,7 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
// | // |
// | // |
// ----- // -----
wxPoint p = linestart + entrySize( 0, -1 ); wxPoint p = lineend + entrySize( 0, -1 );
if( testBusHit( lineend + entrySize( -1, 0 ) ) ) if( testBusHit( lineend + entrySize( -1, 0 ) ) )
{ {
@ -2587,8 +2586,8 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 ); SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, lineend + wxPoint( 0, -100 ) ); moveLabels( line, p );
line->SetEndPoint( lineend + wxPoint( 0, -100 ) ); line->SetEndPoint( p );
} }
else if( testBusHit( lineend + entrySize( 1, 0 ) ) ) else if( testBusHit( lineend + entrySize( 1, 0 ) ) )
{ {
@ -2707,7 +2706,7 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
busEntry->SetFlags( IS_NEW ); busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry ); m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, linestart + wxPoint( 100, -100 ) ); moveLabels( line, p );
if( p == lineend ) // wire is overlapped by bus entry symbol if( p == lineend ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line ); m_currentSheet->GetScreen()->DeleteItem( line );