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

Fix eeschema crashes when a library has a component where the name under "DEF" does not agree with the name under "F1" 

(now "F1" is forced to name given by "DEF", like in stable version)
Fix also an incorrect parsing of .dcm file, if  a component was not found in corresponding symbol lib.
(Can happen for not updated .dcm files)
This commit is contained in:
jean-pierre charras 2017-02-28 10:00:18 +01:00
parent a0df0f7f06
commit 94037f4d3d
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
eeschema/sch_legacy_plugin.cpp
View File

@ -2266,41 +2266,44 @@ void SCH_LEGACY_PLUGIN_CACHE::loadDocs()
else else
alias = it->second; alias = it->second;
if( alias ) // Read the curent alias associated doc.
// if the alias does not exist, just skip the description
// (Can happen if a .dcm is not synchronized with the corresponding .lib file)
while( reader.ReadLine() )
{ {
while( reader.ReadLine() ) line = reader.Line();
if( !line )
SCH_PARSE_ERROR( "unexpected end of file", reader, line );
if( strCompare( "$ENDCMP", line, &line ) )
break;
text = FROM_UTF8( line + 2 );
text = text.Trim();
switch( line[0] )
{ {
line = reader.Line(); case 'D':
if( alias )
if( !line )
SCH_PARSE_ERROR( "unexpected end of file", reader, line );
if( strCompare( "$ENDCMP", line, &line ) )
break;
text = FROM_UTF8( line + 2 );
text = text.Trim();
switch( line[0] )
{
case 'D':
alias->SetDescription( text ); alias->SetDescription( text );
break; break;
case 'K': case 'K':
if( alias )
alias->SetKeyWords( text ); alias->SetKeyWords( text );
break; break;
case 'F': case 'F':
if( alias )
alias->SetDocFileName( text ); alias->SetDocFileName( text );
break; break;
case '#': case '#':
break; break;
default: default:
SCH_PARSE_ERROR( "expected token in symbol definition", reader, line ); SCH_PARSE_ERROR( "expected token in symbol definition", reader, line );
}
} }
} }
} }
@ -2647,8 +2650,10 @@ void SCH_LEGACY_PLUGIN_CACHE::loadField( std::unique_ptr< LIB_PART >& aPart,
*fixedField = *field; *fixedField = *field;
if( field->GetId() == VALUE ) // Ensure the VALUE field = the part name (can be not the case
aPart->m_name = field->GetText(); // with malformed libraries: edited by hand, or converted from other tools)
if( fixedField->GetId() == VALUE )
fixedField->m_Text = aPart->m_name;
} }
else else
{ {