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

Update all aliases of current node after Symbol Properties dialog. 

Fixes: lp:1840466
* https://bugs.launchpad.net/kicad/+bug/1840466
This commit is contained in:
Jeff Young 2019-08-19 10:47:28 +01:00
parent b25ffc0aa8
commit f8f5ffd560
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/libedit/libedit.cpp
View File

@ -506,7 +506,19 @@ void LIB_EDIT_FRAME::UpdateAfterSymbolProperties( wxString* aOldName, wxArrayStr
} }
if( aOldAliases && *aOldAliases != part->GetAliasNames( false ) ) if( aOldAliases && *aOldAliases != part->GetAliasNames( false ) )
{
// If the number of aliases (or their names) have changed, do a full re-sync
SyncLibraries( false ); SyncLibraries( false );
}
else
{
// Otherwise just update each alias
for( LIB_ALIAS* alias : part->GetAliases() )
{
wxDataViewItem item = m_libMgr->GetAdapter()->FindItem( alias->GetLibId() );
static_cast<LIB_TREE_NODE_LIB_ID*>( item.GetID() )->Update( alias );
}
}
// Reselect the renamed part // Reselect the renamed part
m_treePane->GetLibTree()->SelectLibId( LIB_ID( lib, part->GetName() ) ); m_treePane->GetLibTree()->SelectLibId( LIB_ID( lib, part->GetName() ) );

16
eeschema/symbol_tree_synchronizing_adapter.cpp
View File

@ -227,21 +227,7 @@ void SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetValue( wxVariant& aVariant, wxDataVie
break; break;
case 1: case 1:
if( node->LibId == m_libMgr->GetCurrentLibId() ) aVariant = node->Desc;
{
LIB_ALIAS* alias = nullptr;
// When the node parent name is empty, the node is a lib name, not a symbol name
if( !node->Parent->Name.IsEmpty() )
alias = m_libMgr->GetAlias( node->Name, node->Parent->Name );
if( alias )
aVariant = alias->GetDescription();
else
aVariant = node->Desc;
}
else
aVariant = node->Desc;
break; break;
default: // column == -1 is used for default Compare function default: // column == -1 is used for default Compare function