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

Fix Eagle schematic importer incorrect symbol value field and visibility. 

Also fix a crash if an XML_PARSER_ERROR exception is thrown when importing
Eagle symbol libraries.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18232

(cherry picked from commit 566fefafc5)
This commit is contained in:
Wayne Stambaugh 2024-06-22 12:22:03 -04:00
parent 4e3488c2e0
commit 4ee1415164
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/sch_io/eagle/sch_io_eagle.cpp
View File

@ -1951,11 +1951,8 @@ void SCH_IO_EAGLE::loadInstance( const std::unique_ptr<EINSTANCE>& aInstance,
// Use the instance attribute to determine the reference and value field visibility. // Use the instance attribute to determine the reference and value field visibility.
if( aInstance->smashed && aInstance->smashed.Get() ) if( aInstance->smashed && aInstance->smashed.Get() )
{ {
if( !valueAttributeFound ) symbol->GetField( VALUE_FIELD )->SetVisible( valueAttributeFound );
symbol->GetField( VALUE_FIELD )->SetVisible( false ); symbol->GetField( REFERENCE_FIELD )->SetVisible( nameAttributeFound );
if( !nameAttributeFound )
symbol->GetField( REFERENCE_FIELD )->SetVisible( false );
} }
symbol->AddHierarchicalReference( m_sheetPath.Path(), reference, unit ); symbol->AddHierarchicalReference( m_sheetPath.Path(), reference, unit );

1
eeschema/symbol_editor/symbol_editor_import_export.cpp
View File

@ -35,6 +35,7 @@
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/filedlg.h> #include <wx/filedlg.h>
#include <string_utils.h> #include <string_utils.h>
#include <io/eagle/eagle_parser.h>
void SYMBOL_EDIT_FRAME::ImportSymbol() void SYMBOL_EDIT_FRAME::ImportSymbol()