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

Symbol editor: fix symbol renaming bug. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7616
This commit is contained in:
Wayne Stambaugh 2021-03-02 19:19:08 -05:00
parent 2c289b3f35
commit 0ce8bce753
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
eeschema/symbol_editor/symbol_library_manager.cpp
View File

@ -133,6 +133,9 @@ bool SYMBOL_LIBRARY_MANAGER::SaveLibrary( const wxString& aLibrary, const wxStri
SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( aFileType ) ); SCH_PLUGIN::SCH_PLUGIN_RELEASER pi( SCH_IO_MGR::FindPlugin( aFileType ) );
bool res = true; // assume all libraries are successfully saved bool res = true; // assume all libraries are successfully saved
PROPERTIES properties;
properties.emplace( SCH_LEGACY_PLUGIN::PropBuffering, "" );
auto it = m_libs.find( aLibrary ); auto it = m_libs.find( aLibrary );
if( it != m_libs.end() ) if( it != m_libs.end() )
@ -169,9 +172,6 @@ bool SYMBOL_LIBRARY_MANAGER::SaveLibrary( const wxString& aLibrary, const wxStri
else else
{ {
// Handle original library // Handle original library
PROPERTIES properties;
properties.emplace( SCH_LEGACY_PLUGIN::PropBuffering, "" );
for( LIB_PART* part : getOriginalParts( aLibrary ) ) for( LIB_PART* part : getOriginalParts( aLibrary ) )
{ {
LIB_PART* newSymbol; LIB_PART* newSymbol;
@ -888,12 +888,20 @@ bool SYMBOL_LIBRARY_MANAGER::LIB_BUFFER::SaveBuffer( SYMBOL_LIBRARY_MANAGER::PAR
{ {
wxCHECK( aPartBuf, false ); wxCHECK( aPartBuf, false );
LIB_PART* part = aPartBuf->GetPart(); LIB_PART* part = aPartBuf->GetPart();
wxCHECK( part, false ); LIB_PART* originalPart = aPartBuf->GetOriginal();
wxCHECK( part && originalPart, false );
SYMBOL_LIB_TABLE::SAVE_T result; SYMBOL_LIB_TABLE::SAVE_T result;
PROPERTIES properties;
properties.emplace( SCH_LEGACY_PLUGIN::PropBuffering, "" );
// Delete the original symbol if the symbol name has been changed.
if( part->GetName() != originalPart->GetName() )
{
aLibTable->DeleteSymbol( m_libName, originalPart->GetName() );
}
if( part->IsAlias() ) if( part->IsAlias() )
{ {
LIB_PART* originalPart;
LIB_PART* newCachedPart = new LIB_PART( *part ); LIB_PART* newCachedPart = new LIB_PART( *part );
std::shared_ptr< LIB_PART > bufferedParent = part->GetParent().lock(); std::shared_ptr< LIB_PART > bufferedParent = part->GetParent().lock();
@ -967,7 +975,8 @@ bool SYMBOL_LIBRARY_MANAGER::LIB_BUFFER::SaveBuffer( SYMBOL_LIBRARY_MANAGER::PAR
{ {
wxCHECK( aPartBuf, false ); wxCHECK( aPartBuf, false );
LIB_PART* part = aPartBuf->GetPart(); LIB_PART* part = aPartBuf->GetPart();
wxCHECK( part, false ); LIB_PART* originalPart = aPartBuf->GetOriginal();
wxCHECK( part && originalPart, false );
wxString errorMsg = _( "An error \"%s\" occurred saving symbol \"%s\" to library \"%s\"" ); wxString errorMsg = _( "An error \"%s\" occurred saving symbol \"%s\" to library \"%s\"" );
@ -975,9 +984,14 @@ bool SYMBOL_LIBRARY_MANAGER::LIB_BUFFER::SaveBuffer( SYMBOL_LIBRARY_MANAGER::PAR
PROPERTIES properties; PROPERTIES properties;
properties.emplace( SCH_LEGACY_PLUGIN::PropBuffering, "" ); properties.emplace( SCH_LEGACY_PLUGIN::PropBuffering, "" );
// Delete the original symbol if the symbol name has been changed.
if( part->GetName() != originalPart->GetName() )
{
aPlugin->DeleteSymbol( m_libName, originalPart->GetName(), &properties );
}
if( part->IsAlias() ) if( part->IsAlias() )
{ {
LIB_PART* originalPart;
LIB_PART* newCachedPart = new LIB_PART( *part ); LIB_PART* newCachedPart = new LIB_PART( *part );
std::shared_ptr< LIB_PART > bufferedParent = part->GetParent().lock(); std::shared_ptr< LIB_PART > bufferedParent = part->GetParent().lock();