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

Eeschema Eagle Import: Check if alignment is defined before parsing

This commit is contained in:
Maciej Suminski 2017-07-17 12:17:23 +02:00
parent 7af2a21891
commit f5e7c2ee48
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/eagle_parser.cpp
View File

@ -41,6 +41,7 @@ using std::string;
// - bool
// - EROT
constexpr auto DEFAULT_ALIGNMENT = ETEXT::BOTTOM_LEFT;
template<>
string Convert<string>( wxString aValue )
@ -215,7 +216,7 @@ int parseAlignment(wxString alignment)
else if( alignment == "center-left" )
return ETEXT::CENTER_LEFT;
return ETEXT::BOTTOM_LEFT;
return DEFAULT_ALIGNMENT;
}
@ -424,9 +425,7 @@ EATTR::EATTR( wxXmlNode* aTree )
stemp = parseOptionalAttribute<string>( aTree, "align" );
align = parseAlignment(*stemp);
align = stemp ? parseAlignment( *stemp ) : DEFAULT_ALIGNMENT;
}
@ -491,8 +490,7 @@ ETEXT::ETEXT( wxXmlNode* aText )
opt_string stemp = parseOptionalAttribute<string>( aText, "align" );
align = parseAlignment(*stemp);
align = stemp ? parseAlignment( *stemp ) : DEFAULT_ALIGNMENT;
}