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

Flag all dangling labels, not just isolated ones 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/1788
This commit is contained in:
Jon Evans 2020-10-04 17:13:42 -04:00
parent 0eaf7bfd1f
commit bdb18022c0
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/connection_graph.cpp
View File

@ -2490,6 +2490,7 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
if( aSubgraph->m_no_connect ) if( aSubgraph->m_no_connect )
return true; return true;
bool ok = true;
SCH_TEXT* text = nullptr; SCH_TEXT* text = nullptr;
bool has_other_connections = false; bool has_other_connections = false;
@ -2500,8 +2501,25 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
case SCH_LABEL_T: case SCH_LABEL_T:
case SCH_GLOBAL_LABEL_T: case SCH_GLOBAL_LABEL_T:
case SCH_HIER_LABEL_T: case SCH_HIER_LABEL_T:
{
text = static_cast<SCH_TEXT*>( item ); text = static_cast<SCH_TEXT*>( item );
// Below, we'll create an ERC if the whole subgraph is unconnected. But, additionally,
// we want to error if an individual label in the subgraph is floating, even if it's
// connected to other valid things by way of another label on the same sheet.
if( text->IsDangling() )
{
std::shared_ptr<ERC_ITEM> ercItem = ERC_ITEM::Create( ERCE_LABEL_NOT_CONNECTED );
ercItem->SetItems( text );
SCH_MARKER* marker = new SCH_MARKER( ercItem, text->GetPosition() );
aSubgraph->m_sheet.LastScreen()->Append( marker );
ok = false;
}
break; break;
}
case SCH_PIN_T: case SCH_PIN_T:
case SCH_SHEET_PIN_T: case SCH_SHEET_PIN_T:
@ -2573,7 +2591,7 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
return false; return false;
} }
return true; return ok;
} }

2
eeschema/erc_item.cpp
View File

@ -69,7 +69,7 @@ ERC_ITEM ERC_ITEM::noConnectDangling( ERCE_NOCONNECT_NOT_CONNECTED,
wxT( "no_connect_dangling" ) ); wxT( "no_connect_dangling" ) );
ERC_ITEM ERC_ITEM::labelDangling( ERCE_LABEL_NOT_CONNECTED, ERC_ITEM ERC_ITEM::labelDangling( ERCE_LABEL_NOT_CONNECTED,
_( "Label not connected anywhere else in the schematic" ), _( "Label not connected to anything" ),
wxT( "label_dangling" ) ); wxT( "label_dangling" ) );
ERC_ITEM ERC_ITEM::globalLabelDangling( ERCE_GLOBLABEL, ERC_ITEM ERC_ITEM::globalLabelDangling( ERCE_GLOBLABEL,