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

Escape netnames with illegal characters in them. 

Fixes https://gitlab.com/kicad/code/kicad/issues/12194
This commit is contained in:
Jeff Young 2022-08-09 13:43:54 +01:00
parent da1691770d
commit ba7a06f52e
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
eeschema/netlist_exporters/netlist_exporter_xml.cpp
View File

@ -31,7 +31,7 @@
#include <symbol_library.h> #include <symbol_library.h>
#include <string_utils.h> #include <string_utils.h>
#include <connection_graph.h> #include <connection_graph.h>
#include <string_utils.h> #include <core/kicad_algo.h>
#include <wx/wfstream.h> #include <wx/wfstream.h>
#include <xnode.h> // also nests: <wx/xml/xml.h> #include <xnode.h> // also nests: <wx/xml/xml.h>
@ -586,13 +586,13 @@ XNODE* NETLIST_EXPORTER_XML::makeLibParts()
pinList.clear(); pinList.clear();
lcomp->GetPins( pinList, 0, 0 ); lcomp->GetPins( pinList, 0, 0 );
/* we must erase redundant Pins references in pinList /*
* These redundant pins exist because some pins * We must erase redundant Pins references in pinList
* are found more than one time when a symbol has * These redundant pins exist because some pins are found more than one time when a
* multiple parts per package or has 2 representations (DeMorgan conversion) * symbol has multiple parts per package or has 2 representations (DeMorgan conversion).
* For instance, a 74ls00 has DeMorgan conversion, with different pin shapes, * For instance, a 74ls00 has DeMorgan conversion, with different pin shapes, and
* and therefore each pin appears 2 times in the list. * therefore each pin appears 2 times in the list. Common pins (VCC, GND) can also be
* Common pins (VCC, GND) can also be found more than once. * found more than once.
*/ */
sort( pinList.begin(), pinList.end(), sortPinsByNumber ); sort( pinList.begin(), pinList.end(), sortPinsByNumber );
for( int ii = 0; ii < (int)pinList.size()-1; ii++ ) for( int ii = 0; ii < (int)pinList.size()-1; ii++ )
@ -720,31 +720,28 @@ XNODE* NETLIST_EXPORTER_XML::makeListOfNets( unsigned aCtl )
// Netlist ordering: Net name, then ref des, then pin name // Netlist ordering: Net name, then ref des, then pin name
std::sort( net_record->m_Nodes.begin(), net_record->m_Nodes.end(), std::sort( net_record->m_Nodes.begin(), net_record->m_Nodes.end(),
[]( const NET_NODE& a, const NET_NODE& b ) []( const NET_NODE& a, const NET_NODE& b )
{ {
wxString refA = a.m_Pin->GetParentSymbol()->GetRef( &a.m_Sheet ); wxString refA = a.m_Pin->GetParentSymbol()->GetRef( &a.m_Sheet );
wxString refB = b.m_Pin->GetParentSymbol()->GetRef( &b.m_Sheet ); wxString refB = b.m_Pin->GetParentSymbol()->GetRef( &b.m_Sheet );
if( refA == refB ) if( refA == refB )
return a.m_Pin->GetShownNumber() < b.m_Pin->GetShownNumber(); return a.m_Pin->GetShownNumber() < b.m_Pin->GetShownNumber();
return refA < refB; return refA < refB;
} ); } );
// Some duplicates can exist, for example on multi-unit parts with duplicated // Some duplicates can exist, for example on multi-unit parts with duplicated pins across
// pins across units. If the user connects the pins on each unit, they will // units. If the user connects the pins on each unit, they will appear on separate
// appear on separate subgraphs. Remove those here: // subgraphs. Remove those here:
net_record->m_Nodes.erase( alg::remove_duplicates( net_record->m_Nodes,
std::unique( net_record->m_Nodes.begin(), net_record->m_Nodes.end(), []( const NET_NODE& a, const NET_NODE& b )
[]( const NET_NODE& a, const NET_NODE& b ) {
{ wxString refA = a.m_Pin->GetParentSymbol()->GetRef( &a.m_Sheet );
wxString refA = a.m_Pin->GetParentSymbol()->GetRef( &a.m_Sheet ); wxString refB = b.m_Pin->GetParentSymbol()->GetRef( &b.m_Sheet );
wxString refB = b.m_Pin->GetParentSymbol()->GetRef( &b.m_Sheet );
return refA == refB return refA == refB && a.m_Pin->GetShownNumber() == b.m_Pin->GetShownNumber();
&& a.m_Pin->GetShownNumber() == b.m_Pin->GetShownNumber(); } );
} ),
net_record->m_Nodes.end() );
for( const NET_NODE& netNode : net_record->m_Nodes ) for( const NET_NODE& netNode : net_record->m_Nodes )
{ {
@ -761,7 +758,7 @@ XNODE* NETLIST_EXPORTER_XML::makeListOfNets( unsigned aCtl )
xnets->AddChild( xnet = node( wxT( "net" ) ) ); xnets->AddChild( xnet = node( wxT( "net" ) ) );
xnet->AddAttribute( wxT( "code" ), netCodeTxt ); xnet->AddAttribute( wxT( "code" ), netCodeTxt );
xnet->AddAttribute( wxT( "name" ), net_record->m_Name ); xnet->AddAttribute( wxT( "name" ), EscapeString( net_record->m_Name, CTX_NETNAME ) );
added = true; added = true;
} }

6
include/core/kicad_algo.h
View File

@ -184,6 +184,12 @@ void remove_duplicates( _Container& __c )
__c.erase( std::unique( __c.begin(), __c.end() ), __c.end() ); __c.erase( std::unique( __c.begin(), __c.end() ), __c.end() );
} }
template <class _Container, class _Function>
void remove_duplicates( _Container& __c, _Function&& __f )
{
__c.erase( std::unique( __c.begin(), __c.end(), std::forward<_Function>( __f ) ), __c.end() );
}
/** /**
* @brief Integral version of std::signbit that works all compilers. * @brief Integral version of std::signbit that works all compilers.
*/ */