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

Ensure global labels get flagged as lonely in all circumstances 

Fixes: lp:1827214
* https://bugs.launchpad.net/kicad/+bug/1827214
This commit is contained in:
Jon Evans 2019-05-01 20:15:08 -04:00
parent 9f189ca71a
commit 4efed8a4dd
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
eeschema/connection_graph.cpp
View File

@ -2077,32 +2077,37 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph,
}
}
bool is_global = text && ( text->Type() == SCH_GLOBAL_LABEL_T );
if( !text )
return true;
bool is_global = text->Type() == SCH_GLOBAL_LABEL_T;
// Global label check can be disabled independently
if( !aCheckGlobalLabels && is_global )
return true;
if( text )
wxString name = text->GetShownText();
if( is_global)
{
wxString name = text->GetShownText();
// This will be set to true if the global is connected to a pin above, but we
// want to reset this to false so that globals get flagged if they only have a
// single instance
has_other_connections = false;
if( is_global)
{
if( m_net_name_to_subgraphs_map.count( name )
&& m_net_name_to_subgraphs_map.at( name ).size() > 1 )
has_other_connections = true;
}
else
{
auto pair = std::make_pair( aSubgraph->m_sheet, name );
if( m_net_name_to_subgraphs_map.count( name )
&& m_net_name_to_subgraphs_map.at( name ).size() > 1 )
has_other_connections = true;
}
else
{
auto pair = std::make_pair( aSubgraph->m_sheet, name );
if( m_local_label_cache.count( pair ) && m_local_label_cache.at( pair ).size() > 1 )
has_other_connections = true;
}
if( m_local_label_cache.count( pair ) && m_local_label_cache.at( pair ).size() > 1 )
has_other_connections = true;
}
if( text && !has_other_connections )
if( !has_other_connections )
{
if( aCreateMarkers )
{