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

Don't assume a 1:1 map between Altium and Kicad nets. 

We've found at least one Altium board which has duplicate netcodes
for the same net.

Fixes https://gitlab.com/kicad/code/kicad/issues/12909
This commit is contained in:
Jeff Young 2022-11-19 11:50:54 +00:00
parent b82ec9595a
commit bab2b6c4b6
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,7 +341,6 @@ ALTIUM_PCB::ALTIUM_PCB( BOARD* aBoard, PROGRESS_REPORTER* aProgressReporter )
m_doneCount = 0;
m_lastProgressCount = 0;
m_totalCount = 0;
m_num_nets = 0;
m_highest_pour_index = 0;
}
@ -807,15 +806,15 @@ int ALTIUM_PCB::GetNetCode( uint16_t aId ) const
{
return NETINFO_LIST::UNCONNECTED;
}
else if( m_num_nets < aId )
else if( m_altiumToKicadNetcodes.size() < aId )
{
THROW_IO_ERROR( wxString::Format( wxT( "Netcode with id %d does not exist. Only %d nets "
"are known" ),
aId, m_num_nets ) );
aId, m_altiumToKicadNetcodes.size() ) );
}
else
{
return aId + 1;
return m_altiumToKicadNetcodes[ aId ];
}
}
@ -1695,13 +1694,16 @@ void ALTIUM_PCB::ParseNets6Data( const ALTIUM_COMPOUND_FILE& aAltiumPcbFile,
ALTIUM_PARSER reader( aAltiumPcbFile, aEntry );
wxASSERT( m_num_nets == 0 );
wxASSERT( m_altiumToKicadNetcodes.empty() );
while( reader.GetRemainingBytes() >= 4 /* TODO: use Header section of file */ )
{
checkpoint();
ANET6 elem( reader );
m_board->Add( new NETINFO_ITEM( m_board, elem.name, ++m_num_nets ), ADD_MODE::APPEND );
NETINFO_ITEM* netInfo = new NETINFO_ITEM( m_board, elem.name, 0 );
m_board->Add( netInfo, ADD_MODE::APPEND );
m_altiumToKicadNetcodes.push_back( netInfo->GetNetCode() );
}
if( reader.GetRemainingBytes() != 0 )

2
pcbnew/plugins/altium/altium_pcb.h
View File

@ -243,7 +243,7 @@ private:
std::vector<PCB_DIM_RADIAL*> m_radialDimensions;
std::map<wxString, wxString> m_models;
std::map<uint32_t, wxString> m_unicodeStrings;
size_t m_num_nets;
std::vector<int> m_altiumToKicadNetcodes;
std::map<ALTIUM_LAYER, PCB_LAYER_ID> m_layermap; // used to correctly map copper layers
std::map<ALTIUM_RULE_KIND, std::vector<ARULE6>> m_rules;
std::map<ALTIUM_RECORD, std::multimap<int, const AEXTENDED_PRIMITIVE_INFORMATION>>