realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 18:23:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Eagle sheet descriptions are elements, not attributes.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/-/issues/20957

(cherry picked from commit aaa0e74311173506a4827b412dad9b1cd8d17e71)
This commit is contained in:
Jeff Young 2025-06-13 12:27:49 +01:00
parent fde3087324
commit 719512183d
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/io/eagle/eagle_parser.cpp
View File

@ -1917,11 +1917,13 @@ ESHEET::ESHEET( wxXmlNode* aSheet, IO_BASE* aIo ) :
/* /*
* <!ELEMENT sheet (description?, plain?, moduleinsts?, instances?, busses?, nets?)> * <!ELEMENT sheet (description?, plain?, moduleinsts?, instances?, busses?, nets?)>
*/ */
description = parseOptionalAttribute<wxString>( aSheet, "description" );
for( wxXmlNode* child = aSheet->GetChildren(); child; child = child->GetNext() ) for( wxXmlNode* child = aSheet->GetChildren(); child; child = child->GetNext() )
{ {
if( child->GetName() == "plain" ) if( child->GetName() == "description" )
{
description = std::make_optional<EDESCRIPTION>( child, aIo );
}
else if( child->GetName() == "plain" )
{ {
plain = std::make_unique<EPLAIN>( child, aIo ); plain = std::make_unique<EPLAIN>( child, aIo );
} }
@ -1932,8 +1934,7 @@ ESHEET::ESHEET( wxXmlNode* aSheet, IO_BASE* aIo ) :
{ {
if( moduleinst->GetName() == "moduleinst" ) if( moduleinst->GetName() == "moduleinst" )
{ {
std::unique_ptr<EMODULEINST> inst = std::make_unique<EMODULEINST>( moduleinst, std::unique_ptr<EMODULEINST> inst = std::make_unique<EMODULEINST>( moduleinst, aIo );
aIo );
moduleinsts[ inst->name ] = std::move( inst ); moduleinsts[ inst->name ] = std::move( inst );
} }
} }
@ -1942,8 +1943,7 @@ ESHEET::ESHEET( wxXmlNode* aSheet, IO_BASE* aIo ) :
} }
else if( child->GetName() == "instances" ) else if( child->GetName() == "instances" )
{ {
for( wxXmlNode* instance = child->GetChildren(); instance; for( wxXmlNode* instance = child->GetChildren(); instance; instance = instance->GetNext() )
instance = instance->GetNext() )
{ {
if( instance->GetName() == "instance" ) if( instance->GetName() == "instance" )
instances.emplace_back( std::make_unique<EINSTANCE>( instance, aIo ) ); instances.emplace_back( std::make_unique<EINSTANCE>( instance, aIo ) );

3
common/io/eagle/eagle_parser.h
View File

@ -1898,7 +1898,7 @@ struct ESHEET : public EAGLE_BASE
* <!ELEMENT sheet (description?, plain?, moduleinsts?, instances?, busses?, nets?)> * <!ELEMENT sheet (description?, plain?, moduleinsts?, instances?, busses?, nets?)>
*/ */
opt_wxString description; std::optional<EDESCRIPTION> description;
std::unique_ptr<EPLAIN> plain; std::unique_ptr<EPLAIN> plain;
std::map<wxString, std::unique_ptr<EMODULEINST>> moduleinsts; std::map<wxString, std::unique_ptr<EMODULEINST>> moduleinsts;
std::vector<std::unique_ptr<EINSTANCE>> instances; std::vector<std::unique_ptr<EINSTANCE>> instances;
@ -1926,7 +1926,6 @@ struct EMODULE : public EAGLE_BASE
ECOORD dy; ECOORD dy;
std::optional<EDESCRIPTION> description; std::optional<EDESCRIPTION> description;
std::map<wxString, std::unique_ptr<EPORT>> ports; std::map<wxString, std::unique_ptr<EPORT>> ports;
std::map<wxString, std::unique_ptr<EVARIANTDEF>> variantdefs; std::map<wxString, std::unique_ptr<EVARIANTDEF>> variantdefs;
std::map<wxString, std::unique_ptr<ESCHEMATIC_GROUP>> groups; std::map<wxString, std::unique_ptr<ESCHEMATIC_GROUP>> groups;

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

@ -825,6 +825,10 @@ void SCH_IO_EAGLE::loadSheet( const std::unique_ptr<ESHEET>& aSheet )
fn.SetExt( FILEEXT::KiCadSchematicFileExtension ); fn.SetExt( FILEEXT::KiCadSchematicFileExtension );
filename = wxString::Format( wxT( "%s_%d" ), m_filename.GetName(), m_sheetIndex ); filename = wxString::Format( wxT( "%s_%d" ), m_filename.GetName(), m_sheetIndex );
if( aSheet->description )
sheet->SetName( aSheet->description.value().text );
else
sheet->SetName( filename ); sheet->SetName( filename );
ReplaceIllegalFileNameChars( &filename ); ReplaceIllegalFileNameChars( &filename );