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

altium: fix netclass parsing

This commit is contained in:
Thomas Pointhuber 2020-10-20 11:48:27 +02:00
parent f06f4e7a13
commit d142075417
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pcbnew/plugins/altium/altium_pcb.cpp
View File

@ -668,21 +668,25 @@ void ALTIUM_PCB::ParseClasses6Data(
{ {
ALTIUM_PARSER reader( aReader, aEntry ); ALTIUM_PARSER reader( aReader, aEntry );
BOARD_DESIGN_SETTINGS& designSettings = m_board->GetDesignSettings();
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ ) while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{ {
ACLASS6 elem( reader ); ACLASS6 elem( reader );
if( elem.kind == ALTIUM_CLASS_KIND::NET_CLASS ) if( elem.kind == ALTIUM_CLASS_KIND::NET_CLASS )
{ {
const NETCLASSPTR& netclass = std::make_shared<NETCLASS>( elem.name ); NETCLASSPTR nc = std::make_shared<NETCLASS>( elem.name );
designSettings.GetNetClasses().Add( netclass );
for( const auto& name : elem.names ) for( const auto& name : elem.names )
{ {
netclass->Add( // TODO: it seems it can happen that we have names not attached to any net.
name ); // TODO: it seems it can happen that we have names not attached to any net. nc->Add( name );
}
if( !m_board->GetDesignSettings().GetNetClasses().Add( nc ) )
{
// Name conflict, this is likely a bad board file.
// unique_ptr will delete nc on this code path
THROW_IO_ERROR( wxString::Format( _( "Duplicated Netclass name \"%s\"" ), elem.name ) );
} }
} }
} }
@ -691,6 +695,8 @@ void ALTIUM_PCB::ParseClasses6Data(
{ {
THROW_IO_ERROR( "Classes6 stream is not fully parsed" ); THROW_IO_ERROR( "Classes6 stream is not fully parsed" );
} }
m_board->m_LegacyNetclassesLoaded = true;
} }
void ALTIUM_PCB::ParseComponents6Data( void ALTIUM_PCB::ParseComponents6Data(