AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 22:13:44 +00:00
Files Issues Releases Activity

Elide common prefixes of displayed netnames.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/18438
This commit is contained in:
Jeff Young 2024-08-08 16:52:41 +01:00
parent 3b6a33c59a
commit 0e536663a6
1 changed files with 44 additions and 4 deletions

48
pcbnew/netinfo_list.cpp
View File

@ -186,17 +186,57 @@ void NETINFO_LIST::buildListOfNets()
void NETINFO_LIST::RebuildDisplayNetnames() const
{
std::map<wxString, int> shortNames;
std::map<wxString, std::vector<wxString>> shortNameMap;
for( NETINFO_ITEM* net : *this )
shortNames[net->m_shortNetname]++;
shortNameMap[net->m_shortNetname].push_back( net->m_netname );
for( NETINFO_ITEM* net : *this )
{
if( shortNames[net->m_shortNetname] == 1 )
if( shortNameMap[net->m_shortNetname].size() == 1 )
{
net->m_displayNetname = UnescapeString( net->m_shortNetname );
}
else
net->m_displayNetname = UnescapeString( net->m_netname );
{
wxArrayString parts = wxSplit( net->m_netname, '/' );
std::vector<wxArrayString> aggregateParts;
std::optional<size_t> firstNonCommon;
for( const wxString& longName : shortNameMap[net->m_shortNetname] )
aggregateParts.push_back( wxSplit( longName, '/' ) );
for( size_t ii = 0; ii < parts.size() && !firstNonCommon; ++ii )
{
for( const wxArrayString& otherParts : aggregateParts )
{
if( ii < otherParts.size() && otherParts[ii] == parts[ii] )
continue;
firstNonCommon = ii;
break;
}
}
if( firstNonCommon.value_or( 0 ) > 0 && firstNonCommon.value() < parts.size() )
{
wxString disambiguatedName;
for( size_t ii = firstNonCommon.value(); ii < parts.size(); ++ii )
{
if( !disambiguatedName.IsEmpty() )
disambiguatedName += wxS( "/" );
disambiguatedName += parts[ii];
}
net->m_displayNetname = UnescapeString( disambiguatedName );
}
else
{
net->m_displayNetname = UnescapeString( net->m_netname );
}
}
}
m_DisplayNetnamesDirty = false;