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

Better messages for bus entry conflict ERC

This commit is contained in:
Jon Evans 2020-10-27 21:53:21 -04:00
parent 04697c5fe8
commit 31d502735c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/connection_graph.cpp
View File

@ -2259,6 +2259,7 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
SCH_BUS_WIRE_ENTRY* bus_entry = nullptr; SCH_BUS_WIRE_ENTRY* bus_entry = nullptr;
SCH_ITEM* bus_wire = nullptr; SCH_ITEM* bus_wire = nullptr;
wxString bus_name;
for( auto item : aSubgraph->m_items ) for( auto item : aSubgraph->m_items )
{ {
@ -2288,6 +2289,7 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
&& bus_wire->Connection( &sheet ) ) && bus_wire->Connection( &sheet ) )
{ {
conflict = true; conflict = true;
bus_name = bus_wire->Connection( &sheet )->Name( true );
auto test_name = bus_entry->Connection( &sheet )->Name( true ); auto test_name = bus_entry->Connection( &sheet )->Name( true );
@ -2317,8 +2319,13 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
if( conflict ) if( conflict )
{ {
wxString msg = wxString::Format( _( "Net %s is graphically connected to bus %s but is not a"
" member of that bus" ),
aSubgraph->m_driver_connection->Name( true ),
bus_name );
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_CONFLICT ); std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_BUS_ENTRY_CONFLICT );
ercItem->SetItems( bus_entry, bus_wire ); ercItem->SetItems( bus_entry, bus_wire );
ercItem->SetErrorMessage( msg );
SCH_MARKER* marker = new SCH_MARKER( ercItem, bus_entry->GetPosition() ); SCH_MARKER* marker = new SCH_MARKER( ercItem, bus_entry->GetPosition() );
screen->Append( marker ); screen->Append( marker );