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

Eeschema, DIALOG_CHANGE_SYMBOLS: fix incorrect initial lib link name when 

changing symbols: the "old" displayed link was in fact the new link because
the link was updated before the report is created.
Fixes #17162
https://gitlab.com/kicad/code/kicad/-/issues/17162
This commit is contained in:
jean-pierre charras 2024-02-28 11:21:17 +01:00
parent 97e3139505
commit fe349be48b
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
eeschema/dialogs/dialog_change_symbols.cpp
View File

@ -540,7 +540,8 @@ int DIALOG_CHANGE_SYMBOLS::processMatchingSymbols( SCH_COMMIT* aCommit )
int DIALOG_CHANGE_SYMBOLS::processSymbols( SCH_COMMIT* aCommit, int DIALOG_CHANGE_SYMBOLS::processSymbols( SCH_COMMIT* aCommit,
const std::map<SCH_SYMBOL*, SYMBOL_CHANGE_INFO>& aSymbols ) const std::map<SCH_SYMBOL*,
SYMBOL_CHANGE_INFO>& aSymbols )
{ {
wxCHECK( !aSymbols.empty(), 0 ); wxCHECK( !aSymbols.empty(), 0 );
@ -603,6 +604,9 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( SCH_COMMIT* aCommit,
for( const auto& [ symbol, symbol_change_info ] : symbols ) for( const auto& [ symbol, symbol_change_info ] : symbols )
{ {
// Remember initial link before changing for diags purpose
wxString initialLibLinkName = UnescapeString( symbol->GetLibId().Format() );
if( symbol_change_info.m_LibId != symbol->GetLibId() ) if( symbol_change_info.m_LibId != symbol->GetLibId() )
symbol->SetLibId( symbol_change_info.m_LibId ); symbol->SetLibId( symbol_change_info.m_LibId );
@ -741,7 +745,7 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( SCH_COMMIT* aCommit,
frame->GetCanvas()->GetView()->Update( symbol ); frame->GetCanvas()->GetView()->Update( symbol );
msg = getSymbolReferences( *symbol, symbol_change_info.m_LibId ); msg = getSymbolReferences( *symbol, symbol_change_info.m_LibId, &initialLibLinkName );
msg += wxS( ": OK" ); msg += wxS( ": OK" );
m_messagePanel->Report( msg, RPT_SEVERITY_ACTION ); m_messagePanel->Report( msg, RPT_SEVERITY_ACTION );
matchesProcessed +=1; matchesProcessed +=1;
@ -751,12 +755,21 @@ int DIALOG_CHANGE_SYMBOLS::processSymbols( SCH_COMMIT* aCommit,
} }
wxString DIALOG_CHANGE_SYMBOLS::getSymbolReferences( SCH_SYMBOL& aSymbol, const LIB_ID& aNewId ) wxString DIALOG_CHANGE_SYMBOLS::getSymbolReferences( SCH_SYMBOL& aSymbol,
const LIB_ID& aNewId,
const wxString* aOldLibLinkName )
{ {
wxString msg; wxString msg;
wxString references; wxString references;
LIB_ID oldId = aSymbol.GetLibId(); LIB_ID oldId = aSymbol.GetLibId();
wxString oldLibLinkName; // For report
if( aOldLibLinkName )
oldLibLinkName = *aOldLibLinkName;
else
oldLibLinkName = UnescapeString( oldId.Format() );
SCH_EDIT_FRAME* parent = dynamic_cast< SCH_EDIT_FRAME* >( GetParent() ); SCH_EDIT_FRAME* parent = dynamic_cast< SCH_EDIT_FRAME* >( GetParent() );
wxCHECK( parent, msg ); wxCHECK( parent, msg );
@ -781,31 +794,31 @@ wxString DIALOG_CHANGE_SYMBOLS::getSymbolReferences( SCH_SYMBOL& aSymbol, const
{ {
msg.Printf( _( "Update symbol %s from '%s' to '%s'" ), msg.Printf( _( "Update symbol %s from '%s' to '%s'" ),
references, references,
UnescapeString( oldId.Format() ), oldLibLinkName,
UnescapeString( aNewId.Format() ) ); UnescapeString( aNewId.Format() ) );
} }
else else
{ {
msg.Printf( _( "Update symbols %s from '%s' to '%s'" ), msg.Printf( _( "Update symbols %s from '%s' to '%s'" ),
references, references,
UnescapeString( oldId.Format() ), oldLibLinkName,
UnescapeString( aNewId.Format() ) ); UnescapeString( aNewId.Format() ) );
} }
} }
else else // mode is MODE::CHANGE
{ {
if( aSymbol.GetInstances().size() == 1 ) if( aSymbol.GetInstances().size() == 1 )
{ {
msg.Printf( _( "Change symbol %s from '%s' to '%s'" ), msg.Printf( _( "Change symbol %s from '%s' to '%s'" ),
references, references,
UnescapeString( oldId.Format() ), oldLibLinkName,
UnescapeString( aNewId.Format() ) ); UnescapeString( aNewId.Format() ) );
} }
else else
{ {
msg.Printf( _( "Change symbols %s from '%s' to '%s'" ), msg.Printf( _( "Change symbols %s from '%s' to '%s'" ),
references, references,
UnescapeString( oldId.Format() ), oldLibLinkName,
UnescapeString( aNewId.Format() ) ); UnescapeString( aNewId.Format() ) );
} }
} }

3
eeschema/dialogs/dialog_change_symbols.h
View File

@ -87,7 +87,8 @@ private:
int processMatchingSymbols( SCH_COMMIT* aCommit ); int processMatchingSymbols( SCH_COMMIT* aCommit );
int processSymbols( SCH_COMMIT* aCommit, int processSymbols( SCH_COMMIT* aCommit,
const std::map<SCH_SYMBOL*, SYMBOL_CHANGE_INFO>& aSymbols ); const std::map<SCH_SYMBOL*, SYMBOL_CHANGE_INFO>& aSymbols );
wxString getSymbolReferences( SCH_SYMBOL& aSymbol, const LIB_ID& aNewId ); wxString getSymbolReferences( SCH_SYMBOL& aSymbol, const LIB_ID& aNewId,
const wxString* aOldLibLinkName = nullptr );
SCH_SYMBOL* m_symbol; SCH_SYMBOL* m_symbol;
MODE m_mode; MODE m_mode;