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

CADSTAR: Improve loading performance (cache symdef name/alternates)

This commit is contained in:
Roberto Fernandez Bautista 2023-03-12 20:15:04 +01:00
parent 59d88e1871
commit 7534c56723
2 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.cpp
View File

@ -2683,19 +2683,49 @@ CADSTAR_SCH_ARCHIVE_LOADER::SYMDEF_ID
CADSTAR_SCH_ARCHIVE_LOADER::getSymDefFromName( const wxString& aSymdefName,
const wxString& aSymDefAlternate )
{
// Do a case-insensitive comparison
for( std::pair<SYMDEF_ID, SYMDEF_SCM> symPair : Library.SymbolDefinitions )
if( m_SymDefNamesCache.size() != Library.SymbolDefinitions.size() )
{
SYMDEF_ID id = symPair.first;
SYMDEF_SCM symdef = symPair.second;
// Re-initialise
m_SymDefNamesCache.clear();
m_DefaultSymDefNamesCache.clear();
if( symdef.ReferenceName.Lower() == aSymdefName.Lower()
&& symdef.Alternate.Lower() == aSymDefAlternate.Lower() )
// Create a lower case cache to avoid searching each time
for( auto& [id, symdef] : Library.SymbolDefinitions )
{
return id;
wxString refKey = symdef.ReferenceName.Lower();
wxString altKey = symdef.Alternate.Lower();
m_SymDefNamesCache[{ refKey, altKey }] = id;
// Secondary cache to find symbols just by the Name (e.g. if the alternate
// does not exist, we still want to return a symbo - the same behaviour
// as CADSTAR
if( !m_DefaultSymDefNamesCache.count( refKey ) )
{
m_DefaultSymDefNamesCache.insert( { refKey, id } );
}
else if( altKey.IsEmpty() )
{
// Always use the empty alternate if it exists
m_DefaultSymDefNamesCache[refKey] = id;
}
}
}
wxString refKeyToFind = aSymdefName.Lower();
wxString altKeyToFind = aSymDefAlternate.Lower();
if( m_SymDefNamesCache.count( { refKeyToFind, altKeyToFind } ) )
{
return m_SymDefNamesCache[{ refKeyToFind, altKeyToFind }];
}
else if( m_DefaultSymDefNamesCache.count( refKeyToFind ) )
{
return m_DefaultSymDefNamesCache[refKeyToFind];
}
return SYMDEF_ID();
}

10
eeschema/sch_plugins/cadstar/cadstar_sch_archive_loader.h
View File

@ -130,6 +130,16 @@ private:
std::map<PART_ID, TERMINAL_TO_PINNUM_MAP> m_pinNumsMap; ///< Cadstar Part->KiCad Pin number map
std::map<SYMDEF_ID, PINNUM_TO_TERMINAL_MAP> m_symDefTerminalsMap;
/**
* Cache storing symbol names and alternates to symdef IDs
*/
std::map<std::pair<wxString, wxString>, SYMDEF_ID> m_SymDefNamesCache;
/**
* Cache storing symbol names (default alternate) to symdef IDs
*/
std::map<wxString, SYMDEF_ID> m_DefaultSymDefNamesCache;
/**
* Cadstar->KiCad Lib Symbols loaded so far. Note that in CADSTAR each symbol represents just a
* gate, so the LIB_SYMBOLs contained here are not imported directly - they are just an interim