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

Fix multiple inheritance deletion bug in symbol library manager.

This commit is contained in:
Wayne Stambaugh 2023-08-21 11:13:50 -04:00
parent 1026596964
commit 0f621f9af9
1 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
eeschema/symbol_library_manager.cpp
View File

@ -1330,10 +1330,14 @@ size_t SYMBOL_LIBRARY_MANAGER::LIB_BUFFER::GetDerivedSymbolNames( const wxString
LIB_SYMBOL_SPTR parent = entry->GetSymbol()->GetParent().lock(); LIB_SYMBOL_SPTR parent = entry->GetSymbol()->GetParent().lock();
// Check for inherited symbol without a valid parent. // Check for inherited symbol without a valid parent.
wxCHECK( parent, false ); wxCHECK2( parent, continue );
if( parent->GetName() == aSymbolName ) if( parent->GetName() == aSymbolName )
{
aList.Add( entry->GetSymbol()->GetName() ); aList.Add( entry->GetSymbol()->GetName() );
GetDerivedSymbolNames( entry->GetSymbol()->GetName(), aList );
}
} }
} }
@ -1346,39 +1350,24 @@ int SYMBOL_LIBRARY_MANAGER::LIB_BUFFER::removeChildSymbols( std::shared_ptr<SYMB
wxCHECK( aSymbolBuf, 0 ); wxCHECK( aSymbolBuf, 0 );
int cnt = 0; int cnt = 0;
std::deque< std::shared_ptr<SYMBOL_BUFFER> >::iterator it = m_symbols.begin(); wxArrayString derivedSymbolNames;
std::deque< std::shared_ptr<SYMBOL_BUFFER> >::iterator it;
while( it != m_symbols.end() ) if( GetDerivedSymbolNames( aSymbolBuf->GetSymbol()->GetName(), derivedSymbolNames ) )
{ {
LIB_SYMBOL_SPTR parent = (*it)->GetSymbol()->GetParent().lock(); for( const wxString& symbolName : derivedSymbolNames )
if( !parent )
{ {
++it; it = std::find_if( m_symbols.begin(), m_symbols.end(),
} [symbolName]( std::shared_ptr<SYMBOL_BUFFER>& buf )
else {
{ return buf->GetSymbol()->GetName() == symbolName;
if( HasDerivedSymbols( parent->GetName() ) ) } );
{
std::shared_ptr<SYMBOL_BUFFER> symbolBuf = GetBuffer( parent->GetName() );
wxCHECK2( symbolBuf, ++it; continue ); wxCHECK2( it != m_symbols.end(), continue );
cnt += removeChildSymbols( symbolBuf ); m_deleted.emplace_back( *it );
it = m_symbols.begin(); m_symbols.erase( it );
} cnt += 1;
else if( parent->GetName() == aSymbolBuf->GetSymbol()->GetName() )
{
wxCHECK2( parent == aSymbolBuf->GetSymbol()->SharedPtr(), ++it; continue );
m_deleted.emplace_back( *it );
it = m_symbols.erase( it );
cnt++;
}
else
{
++it;
}
} }
} }