Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Fixes for Eagle importer. 

1) Make sure we set an absolute path on the sheet.
2) Don't mix RTree iterators; wires get skipped between buses.
3) Implement a real ERC error so we don't assert.

Fixes https://gitlab.com/kicad/code/kicad/issues/7042
6.0.7
Jeff Young 5 years ago
parent
decfe89091
commit
4b28bac89a
4 changed files with 404 additions and 445 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      eeschema/erc_item.cpp
  2. 1
      eeschema/erc_item.h
  3. 3
      eeschema/erc_settings.h
  4. 835
      eeschema/sch_plugins/eagle/sch_eagle_plugin.cpp

10
eeschema/erc_item.cpp
View File

@ -143,13 +143,17 @@ ERC_ITEM ERC_ITEM::extraUnits( ERCE_EXTRA_UNITS,
wxT( "extra_units" ) );
ERC_ITEM ERC_ITEM::differentUnitValue( ERCE_DIFFERENT_UNIT_VALUE,
_( "Units of same symbol have different values" ),
wxT( "unit_value_mismatch" ) );
_( "Units of same symbol have different values" ),
wxT( "unit_value_mismatch" ) );
ERC_ITEM ERC_ITEM::duplicateReference( ERCE_DUPLICATE_REFERENCE,
_( "Duplicate reference designators" ),
wxT( "duplicate_reference" ) );
ERC_ITEM ERC_ITEM::busEntryNeeded( ERCE_BUS_ENTRY_NEEDED,
_( "Bus Entry needed" ),
wxT( "bus_entry_needed" ) );
std::vector<std::reference_wrapper<RC_ITEM>> ERC_ITEM::allItemTypes( {
ERC_ITEM::heading_connections,
ERC_ITEM::pinNotConnected,
@ -160,6 +164,7 @@ std::vector<std::reference_wrapper<RC_ITEM>> ERC_ITEM::allItemTypes( {
ERC_ITEM::labelDangling,
ERC_ITEM::globalLabelDangling,
ERC_ITEM::wireDangling,
ERC_ITEM::busEntryNeeded,
ERC_ITEM::heading_conflicts,
ERC_ITEM::duplicateReference,
@ -217,6 +222,7 @@ std::shared_ptr<ERC_ITEM> ERC_ITEM::Create( int aErrorCode )
case ERCE_EXTRA_UNITS: return std::make_shared<ERC_ITEM>( extraUnits );
case ERCE_DIFFERENT_UNIT_VALUE: return std::make_shared<ERC_ITEM>( differentUnitValue );
case ERCE_DUPLICATE_REFERENCE: return std::make_shared<ERC_ITEM>( duplicateReference );
case ERCE_BUS_ENTRY_NEEDED: return std::make_shared<ERC_ITEM>( busEntryNeeded );
case ERCE_UNSPECIFIED:
default:
wxFAIL_MSG( "Unknown ERC error code" );

1
eeschema/erc_item.h
View File

@ -98,6 +98,7 @@ private:
static ERC_ITEM extraUnits;
static ERC_ITEM differentUnitValue;
static ERC_ITEM duplicateReference;
static ERC_ITEM busEntryNeeded;
/// True if this item is specific to a sheet instance (as opposed to applying to all instances)
bool m_sheetSpecific;

3
eeschema/erc_settings.h
View File

@ -69,8 +69,9 @@ enum ERCE_T
ERCE_EXTRA_UNITS, ///< Symbol has more units than are defined.
ERCE_DIFFERENT_UNIT_VALUE, ///< Units of same symbol have different values.
ERCE_DUPLICATE_REFERENCE, ///< More than one symbol with the same reference.
ERCE_BUS_ENTRY_NEEDED, ///< Importer failed to auto-place a bus entry.
ERCE_LAST = ERCE_DUPLICATE_REFERENCE,
ERCE_LAST = ERCE_BUS_ENTRY_NEEDED,
// Errors after this point will not automatically appear in the Severities Panel

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

@ -718,10 +718,12 @@ void SCH_EAGLE_PLUGIN::loadSheet( wxXmlNode* aSheetNode, int aSheetIndex )
ReplaceIllegalFileNameChars( &filename );
replace( filename.begin(), filename.end(), ' ', '_' );
wxString fn = wxString( filename + "." + KiCadSchematicFileExtension );
filenameField.SetText( fn );
wxFileName fileName( fn );
m_currentSheet->GetScreen()->SetFileName( fileName.GetFullPath() );
wxFileName fn( m_filename );
fn.SetName( filename );
fn.SetExt( KiCadSchematicFileExtension );
filenameField.SetText( fn.GetFullName() );
m_currentSheet->GetScreen()->SetFileName( fn.GetFullPath() );
m_currentSheet->AutoplaceFields( m_currentSheet->GetScreen(), true );
@ -2249,17 +2251,15 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
// for each wire segment, compare each end with all busses.
// If the wire end is found to end on a bus segment, place a bus entry symbol.
for( auto it1 = m_currentSheet->GetScreen()->Items().OfType( SCH_LINE_T ).begin();
it1 != m_currentSheet->GetScreen()->Items().end(); ++it1 )
for( SCH_ITEM* ii : m_currentSheet->GetScreen()->Items().OfType( SCH_LINE_T ) )
{
SCH_LINE* bus = static_cast<SCH_LINE*>( *it1 );
SCH_LINE* bus = static_cast<SCH_LINE*>( ii );
// Check line type for wire
if( bus->GetLayer() != LAYER_BUS )
if( !bus->IsBus() )
continue;
wxPoint busstart = bus->GetStartPoint();
wxPoint busend = bus->GetEndPoint();
wxPoint busStart = bus->GetStartPoint();
wxPoint busEnd = bus->GetEndPoint();
auto entrySize =
[]( int signX, int signY ) -> wxPoint
@ -2271,531 +2271,482 @@ void SCH_EAGLE_PLUGIN::addBusEntries()
auto testBusHit =
[&]( const wxPoint& aPt ) -> bool
{
return TestSegmentHit( aPt, busstart, busend, 0 );
return TestSegmentHit( aPt, busStart, busEnd, 0 );
};
auto it2 = it1;
++it2;
for( ; it2 != m_currentSheet->GetScreen()->Items().end(); ++it2 )
for( SCH_ITEM* jj : m_currentSheet->GetScreen()->Items().OfType( SCH_LINE_T ) )
{
SCH_LINE* line = static_cast<SCH_LINE*>( *it2 );
SCH_LINE* wire = static_cast<SCH_LINE*>( jj );
// Check line type for bus
if( ( (SCH_LINE*) *it2 )->GetLayer() == LAYER_WIRE )
{
// Get points of both segments.
wxPoint linestart = line->GetStartPoint();
wxPoint lineend = line->GetEndPoint();
if( !wire->IsWire() )
continue;
// Test for horizontal wire and vertical bus
if( linestart.y == lineend.y && busstart.x == busend.x )
wxPoint wireStart = wire->GetStartPoint();
wxPoint wireEnd = wire->GetEndPoint();
// Test for horizontal wire and vertical bus
if( wireStart.y == wireEnd.y && busStart.x == busEnd.x )
{
if( testBusHit( wireStart ) )
{
if( testBusHit( linestart ) )
// Wire start is on the vertical bus
if( wireEnd.x < busStart.x )
{
// Wire start is on the vertical bus
// the end of the wire is to the left of the bus
// |
// ----|
// |
wxPoint p = wireStart + entrySize( -1, 0 );
if( lineend.x < busstart.x )
if( testBusHit( wireStart + entrySize( 0, -1 ) ) )
{
// the end of the wire is to the left of the bus
// there is room above the wire for the bus entry
// |
// ----|
// ___/|
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else if( testBusHit( wireStart + entrySize( 0, 1 ) ) )
{
// there is room below the wire for the bus entry
// ___ |
// \|
// |
wxPoint p = linestart + entrySize( -1, 0 );
if( testBusHit( linestart + entrySize( 0, -1 ) ) )
{
// there is room above the wire for the bus entry
// |
// ___/|
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else if( testBusHit( linestart + entrySize( 0, 1 ) ) )
{
// there is room below the wire for the bus entry
// ___ |
// \|
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
m_currentSheet->GetScreen()->Append( marker );
}
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
// the wire end is to the right of the bus
// |
// |----
// |
wxPoint p = linestart + entrySize( 1, 0 );
if( testBusHit( linestart + entrySize( 0, -1 ) ) )
{
// There is room above the wire for the bus entry
// |
// |\___
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p , 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else if( testBusHit( linestart + entrySize( 0, 1 ) ) )
{
// There is room below the wire for the bus entry
// | ___
// |/
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
m_currentSheet->GetScreen()->Append( marker );
}
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
m_currentSheet->GetScreen()->Append( marker );
}
}
// Same thing but test end of the wire instead.
if( testBusHit( lineend ) )
else
{
// Wire end is on the vertical bus
// the wire end is to the right of the bus
// |
// |----
// |
wxPoint p = wireStart + entrySize( 1, 0 );
if( linestart.x < busstart.x )
if( testBusHit( wireStart + entrySize( 0, -1 ) ) )
{
// start of the wire is to the left of the bus
// |
// ----|
// |
wxPoint p = lineend + entrySize( -1, 0 );
if( testBusHit( lineend + entrySize( 0, -1 ) ) )
{
// there is room above the wire for the bus entry
// |
// ___/|
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetEndPoint( p );
}
else if( testBusHit( lineend + entrySize( 0, -1 ) ) )
{
// there is room below the wire for the bus entry
// ___ |
// \|
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, lineend + entrySize( -1, 0 ) );
line->SetEndPoint( lineend + entrySize( -1, 0 ) );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
m_currentSheet->GetScreen()->Append( marker );
}
// There is room above the wire for the bus entry
// |
// |\___
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p , 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
else if( testBusHit( wireStart + entrySize( 0, 1 ) ) )
{
// the start of the wire is to the right of the bus
// |
// |----
// There is room below the wire for the bus entry
// | ___
// |/
// |
wxPoint p = lineend + entrySize( 1, 0 );
if( testBusHit( lineend + entrySize( 0, -1 ) ) )
{
// There is room above the wire for the bus entry
// |
// |\___
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetEndPoint( p );
}
else if( testBusHit( lineend + entrySize( 0, 1 ) ) )
{
// There is room below the wire for the bus entry
// | ___
// |/
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetEndPoint( p );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
m_currentSheet->GetScreen()->Append( marker );
}
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
m_currentSheet->GetScreen()->Append( marker );
}
}
} // if( linestart.y == lineend.y && busstart.x == busend.x)
}
// Test for vertical wire and horizontal bus
if( linestart.x == lineend.x && busstart.y == busend.y )
// Same thing but test end of the wire instead.
if( testBusHit( wireEnd ) )
{
if( testBusHit( linestart ) )
// Wire end is on the vertical bus
if( wireStart.x < busStart.x )
{
// Wire start is on the bus
// start of the wire is to the left of the bus
// |
// ----|
// |
wxPoint p = wireEnd + entrySize( -1, 0 );
if( lineend.y < busstart.y )
if( testBusHit( wireEnd + entrySize( 0, -1 ) ) )
{
// the end of the wire is above the bus
// |
// |
// -----
wxPoint p = linestart + entrySize( 0, -1 );
if( testBusHit( linestart + entrySize( -1, 0 ) ) )
{
// there is room to the left of the wire for the bus entry
// |
// |
// /
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else if( testBusHit( linestart + entrySize( 1, 0 ) ) )
{
// there is room to the right of the wire for the bus entry
// |
// |
// \
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
m_currentSheet->GetScreen()->Append( marker );
}
// there is room above the wire for the bus entry
// |
// ___/|
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else if( testBusHit( wireEnd + entrySize( 0, -1 ) ) )
{
// there is room below the wire for the bus entry
// ___ |
// \|
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, wireEnd + entrySize( -1, 0 ) );
wire->SetEndPoint( wireEnd + entrySize( -1, 0 ) );
}
else
{
// wire end is below the bus
// -----
// |
// |
wxPoint p = linestart + entrySize( 0, 1 );
if( testBusHit( linestart + entrySize( -1, 0 ) ) )
{
// there is room to the left of the wire for the bus entry
// -----
// \
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else if( testBusHit( linestart + entrySize( 1, 0 ) ) )
{
// there is room to the right of the wire for the bus entry
// -----
// /
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetStartPoint( p );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, linestart );
m_currentSheet->GetScreen()->Append( marker );
}
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
m_currentSheet->GetScreen()->Append( marker );
}
}
if( testBusHit( lineend ) )
else
{
// Wire end is on the bus
// the start of the wire is to the right of the bus
// |
// |----
// |
wxPoint p = wireEnd + entrySize( 1, 0 );
if( linestart.y < busstart.y )
if( testBusHit( wireEnd + entrySize( 0, -1 ) ) )
{
// the start of the wire is above the bus
// |
// |
// -----
wxPoint p = lineend + entrySize( 0, -1 );
if( testBusHit( lineend + entrySize( -1, 0 ) ) )
{
// there is room to the left of the wire for the bus entry
// |
// |
// /
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetEndPoint( p );
}
else if( testBusHit( lineend + entrySize( 1, 0 ) ) )
{
// there is room to the right of the wire for the bus entry
// |
// |
// \
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetEndPoint( p );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
m_currentSheet->GetScreen()->Append( marker );
}
// There is room above the wire for the bus entry
// |
// |\___
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else if( testBusHit( wireEnd + entrySize( 0, 1 ) ) )
{
// There is room below the wire for the bus entry
// | ___
// |/
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
// wire start is below the bus
// -----
// |
// |
wxPoint p = lineend + entrySize( 0, 1 );
if( testBusHit( lineend + entrySize( -1, 0 ) ) )
{
// there is room to the left of the wire for the bus entry
// -----
// \
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetEndPoint( p );
}
else if( testBusHit( lineend + entrySize( 1, 0 ) ) )
{
// there is room to the right of the wire for the bus entry
// -----
// /
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
line->SetEndPoint( p );
}
else
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( 0 );
ercItem->SetErrorMessage( _( "Bus Entry needed" ) );
SCH_MARKER* marker = new SCH_MARKER( ercItem, lineend );
m_currentSheet->GetScreen()->Append( marker );
}
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
m_currentSheet->GetScreen()->Append( marker );
}
}
}
} // if( wireStart.y == wireEnd.y && busStart.x == busEnd.x)
linestart = line->GetStartPoint();
lineend = line->GetEndPoint();
busstart = bus->GetStartPoint();
busend = bus->GetEndPoint();
// bus entry wire isn't horizontal or vertical
if( testBusHit( linestart ) )
// Test for vertical wire and horizontal bus
if( wireStart.x == wireEnd.x && busStart.y == busEnd.y )
{
if( testBusHit( wireStart ) )
{
wxPoint wirevector = linestart - lineend;
// Wire start is on the bus
if( wirevector.x > 0 )
if( wireEnd.y < busStart.y )
{
if( wirevector.y > 0 )
// the end of the wire is above the bus
// |
// |
// -----
wxPoint p = wireStart + entrySize( 0, -1 );
if( testBusHit( wireStart + entrySize( -1, 0 ) ) )
{
wxPoint p = linestart + entrySize( -1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
// there is room to the left of the wire for the bus entry
// |
// |
// /
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == lineend ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetStartPoint( p );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
else if( testBusHit( wireStart + entrySize( 1, 0 ) ) )
{
wxPoint p = linestart + entrySize( -1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
// there is room to the right of the wire for the bus entry
// |
// |
// \
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == lineend ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetStartPoint( p );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
m_currentSheet->GetScreen()->Append( marker );
}
}
else
{
if( wirevector.y > 0 )
// wire end is below the bus
// -----
// |
// |
wxPoint p = wireStart + entrySize( 0, 1 );
if( testBusHit( wireStart + entrySize( -1, 0 ) ) )
{
wxPoint p = linestart + entrySize( 1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
// there is room to the left of the wire for the bus entry
// -----
// \
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == lineend ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetStartPoint( p );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
else if( testBusHit( wireStart + entrySize( 1, 0 ) ) )
{
wxPoint p = linestart + entrySize( 1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
// there is room to the right of the wire for the bus entry
// -----
// /
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == lineend ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetStartPoint( p );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireStart );
m_currentSheet->GetScreen()->Append( marker );
}
}
}
else if( testBusHit( lineend ) )
if( testBusHit( wireEnd ) )
{
wxPoint wirevector = linestart - lineend;
// Wire end is on the bus
if( wirevector.x > 0 )
if( wireStart.y < busStart.y )
{
if( wirevector.y > 0 )
// the start of the wire is above the bus
// |
// |
// -----
wxPoint p = wireEnd + entrySize( 0, -1 );
if( testBusHit( wireEnd + entrySize( -1, 0 ) ) )
{
wxPoint p = lineend + entrySize( 1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
// there is room to the left of the wire for the bus entry
// |
// |
// /
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetEndPoint( p );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
else if( testBusHit( wireEnd + entrySize( 1, 0 ) ) )
{
wxPoint p = lineend + entrySize( 1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
// there is room to the right of the wire for the bus entry
// |
// |
// \
// -----
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetEndPoint( p );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
m_currentSheet->GetScreen()->Append( marker );
}
}
else
{
if( wirevector.y > 0 )
// wire start is below the bus
// -----
// |
// |
wxPoint p = wireEnd + entrySize( 0, 1 );
if( testBusHit( wireEnd + entrySize( -1, 0 ) ) )
{
wxPoint p = lineend + entrySize( -1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
// there is room to the left of the wire for the bus entry
// -----
// \
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetEndPoint( p );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
else if( testBusHit( wireEnd + entrySize( 1, 0 ) ) )
{
wxPoint p = lineend + entrySize( -1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
// there is room to the right of the wire for the bus entry
// -----
// /
// |
// |
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( line, p );
if( p == linestart ) // wire is overlapped by bus entry symbol
m_currentSheet->GetScreen()->DeleteItem( line );
else
line->SetEndPoint( p );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
auto ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_NEEDED );
SCH_MARKER* marker = new SCH_MARKER( ercItem, wireEnd );
m_currentSheet->GetScreen()->Append( marker );
}
}
}
}
wireStart = wire->GetStartPoint();
wireEnd = wire->GetEndPoint();
busStart = bus->GetStartPoint();
busEnd = bus->GetEndPoint();
// bus entry wire isn't horizontal or vertical
if( testBusHit( wireStart ) )
{
wxPoint wirevector = wireStart - wireEnd;
if( wirevector.x > 0 )
{
if( wirevector.y > 0 )
{
wxPoint p = wireStart + entrySize( -1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
wxPoint p = wireStart + entrySize( -1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
}
else
{
if( wirevector.y > 0 )
{
wxPoint p = wireStart + entrySize( 1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
else
{
wxPoint p = wireStart + entrySize( 1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetStartPoint( p );
}
}
}
else if( testBusHit( wireEnd ) )
{
wxPoint wirevector = wireStart - wireEnd;
if( wirevector.x > 0 )
{
if( wirevector.y > 0 )
{
wxPoint p = wireEnd + entrySize( 1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 4 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
wxPoint p = wireEnd + entrySize( 1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 3 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
}
else
{
if( wirevector.y > 0 )
{
wxPoint p = wireEnd + entrySize( -1, 1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 1 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
else
{
wxPoint p = wireEnd + entrySize( -1, -1 );
SCH_BUS_WIRE_ENTRY* busEntry = new SCH_BUS_WIRE_ENTRY( p, 2 );
busEntry->SetFlags( IS_NEW );
m_currentSheet->GetScreen()->Append( busEntry );
moveLabels( wire, p );
wire->SetEndPoint( p );
}
}
}
}
} // for ( bus ..
}
}

Write Preview
Loading…
Cancel
Save