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

Add terrible hack to get subgraph netname 

In certain cases, the subgraph does not receive the proper netname,
preventing us from checking for correct pin counts.  This is a backwards
iteration of the net name <-> subgraph map to extract the proper name
and sibling subgraphs

Fixes https://gitlab.com/kicad/code/kicad/issues/12165

Fixes https://gitlab.com/kicad/code/kicad/issues/12814
This commit is contained in:
Seth Hillbrand 2022-11-21 15:16:44 -08:00
parent 50ecb5b498
commit 938645b29d
1 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
eeschema/connection_graph.cpp
View File

@ -1133,7 +1133,7 @@ void CONNECTION_GRAPH::processSubGraphs()
wxLogTrace( ConnTrace, "%ld (%s) is weakly driven and not unique. Changing to %s.",
subgraph->m_code, name, new_name );
alg::delete_matching( *vec, subgraph );
// alg::delete_matching( *vec, subgraph );
m_net_name_to_subgraphs_map[new_name].emplace_back( subgraph );
@ -2200,16 +2200,16 @@ SCH_CONNECTION* CONNECTION_GRAPH::matchBusMember( SCH_CONNECTION* aBusConnection
void CONNECTION_GRAPH::recacheSubgraphName( CONNECTION_SUBGRAPH* aSubgraph,
const wxString& aOldName )
{
auto it = m_net_name_to_subgraphs_map.find( aOldName );
if( it != m_net_name_to_subgraphs_map.end() )
{
std::vector<CONNECTION_SUBGRAPH*>& vec = it->second;
alg::delete_matching( vec, aSubgraph );
}
wxLogTrace( ConnTrace, "recacheSubgraphName: %s => %s", aOldName,
aSubgraph->m_driver_connection->Name() );
// auto it = m_net_name_to_subgraphs_map.find( aOldName );
//
// if( it != m_net_name_to_subgraphs_map.end() )
// {
// std::vector<CONNECTION_SUBGRAPH*>& vec = it->second;
// alg::delete_matching( vec, aSubgraph );
// }
//
// wxLogTrace( ConnTrace, "recacheSubgraphName: %s => %s", aOldName,
// aSubgraph->m_driver_connection->Name() );
m_net_name_to_subgraphs_map[aSubgraph->m_driver_connection->Name()].push_back( aSubgraph );
}
@ -3080,6 +3080,21 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
if( label_map.empty() )
return true;
// This is a hacky way to find the true subgraph net name (why do we not store it?)
// TODO: Remove once the actual netname of the subgraph is stored with the subgraph
wxString netName = aSubgraph->GetNetName();
for( auto it = m_net_name_to_subgraphs_map.begin(); it != m_net_name_to_subgraphs_map.end(); ++it )
{
for( CONNECTION_SUBGRAPH* graph : it->second )
{
if( graph == aSubgraph )
{
netName = it->first;
}
}
}
wxCHECK_MSG( m_schematic, true, "Null m_schematic in CONNECTION_GRAPH::ercCheckLabels" );
// Labels that have multiple pins connected are not dangling (may be used for naming segments)
@ -3108,23 +3123,7 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
{
int allPins = pinCount;
// Labels are connected if there are at least 2 pins on their net
const CONNECTION_SUBGRAPH* subgraph = aSubgraph;
// If there is a hierarchical connection, walk up the hierarchy
// to get the top-most subgraph
while( subgraph->m_hier_parent )
subgraph = subgraph->m_hier_parent;
wxString name = subgraph->m_driver_connection->Name();
// If there are local bus connections (a label with the same name as a bus element)
// Then get the name from the SCH_CONNECTION element used to map the bus connection
// as this is the "true" connection name
if( !subgraph->m_bus_parents.empty() )
name = subgraph->m_bus_parents.begin()->first->Name();
auto it = m_net_name_to_subgraphs_map.find( name );
auto it = m_net_name_to_subgraphs_map.find( netName );
if( it != m_net_name_to_subgraphs_map.end() )
{