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

netlist exporter xml: fix missing space between UUIDs for multi-units symbols. 

(similar to the .net netlist)
kicad_netlist_reader.py: fix compatibility with V6 xml netlist :
"tstamp" keyword is now "tstamps" keyword.
Fixes #8509
https://gitlab.com/kicad/code/kicad/issues/8509
This commit is contained in:
jean-pierre charras 2021-05-29 18:29:02 +02:00
parent 81c7fb61f8
commit acb024f622
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/netlist_exporters/netlist_exporter_xml.cpp
View File

@ -347,8 +347,10 @@ XNODE* NETLIST_EXPORTER_XML::makeSymbols( unsigned aCtl )
// Output a series of children with all UUIDs associated with the REFDES // Output a series of children with all UUIDs associated with the REFDES
for( auto it = range.first; it != range.second; ++it ) for( auto it = range.first; it != range.second; ++it )
xunits->AddChild( {
new XNODE( wxXML_TEXT_NODE, wxEmptyString, ( *it )->m_Uuid.AsString() ) ); wxString uuid = ( *it )->m_Uuid.AsString() + " ";
xunits->AddChild( new XNODE( wxXML_TEXT_NODE, wxEmptyString, uuid ) );
}
// Output the primary UUID // Output the primary UUID
xunits->AddChild( xunits->AddChild(

10
eeschema/plugins/python_scripts/kicad_netlist_reader.py
View File

@ -407,7 +407,15 @@ class comp():
return ret return ret
def getTimestamp(self): def getTimestamp(self):
return self.element.get("tstamp") """
Kicad 5 uses tstamp keyword for time stamp (8 digits) as UUID
Kicad 6 uses tstamps keyword for UUID and a multi unit symbol has more than one UUID
(UUIDs are separed by spaces)
"""
ret = self.element.get("tstamp")
if ret == "":
ret = self.element.get("tstamps")
return ret
def getDescription(self): def getDescription(self):
return self.element.get("libsource", "description") return self.element.get("libsource", "description")