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

altium: trim property string to avoid things like spurious newline characters

This commit is contained in:
Thomas Pointhuber 2020-04-15 15:20:23 +02:00 committed by Ian McInerney
parent a29e55fe7e
commit ff5a0f61b2
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/altium2kicadpcb_plugin/altium_parser.cpp
View File

@ -109,7 +109,7 @@ std::map<wxString, wxString> ALTIUM_PARSER::ReadProperties()
wxString key( keyS.c_str(), wxConvISO8859_1 ); wxString key( keyS.c_str(), wxConvISO8859_1 );
wxString value( valueS.c_str(), wxConvISO8859_1 ); wxString value( valueS.c_str(), wxConvISO8859_1 );
kv.insert( { key, value } ); kv.insert( { key.Trim(), value.Trim() } );
} }
return kv; return kv;

3
pcbnew/altium2kicadpcb_plugin/altium_parser_pcb.cpp
View File

@ -203,8 +203,7 @@ ABOARD6::ABOARD6( ALTIUM_PARSER& aReader )
ABOARD6_LAYER_STACKUP curlayer; ABOARD6_LAYER_STACKUP curlayer;
curlayer.name = ALTIUM_PARSER::PropertiesReadString( curlayer.name = ALTIUM_PARSER::PropertiesReadString( properties, layername, "" );
properties, layername, "" ); // TODO: trim string
curlayer.nextId = ALTIUM_PARSER::PropertiesReadInt( properties, layeri + "NEXT", 0 ); curlayer.nextId = ALTIUM_PARSER::PropertiesReadInt( properties, layeri + "NEXT", 0 );
curlayer.prevId = ALTIUM_PARSER::PropertiesReadInt( properties, layeri + "PREV", 0 ); curlayer.prevId = ALTIUM_PARSER::PropertiesReadInt( properties, layeri + "PREV", 0 );
curlayer.copperthick = curlayer.copperthick =