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

Print original netnames properly when reconnecting zones/vias. 

Using GetNetname() after SetNet() isn't a good idea to get the original
name when updating PCB from Schematic.
This commit is contained in:
Alex 2023-02-23 22:09:53 +03:00
parent f31e5ea783
commit 9d96edc44f
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pcbnew/netlist_reader/board_netlist_updater.cpp
View File

@ -650,8 +650,10 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
{ {
if( m_isDryRun ) if( m_isDryRun )
{ {
wxString originalNetname = via->GetNetname();
msg.Printf( _( "Reconnect via from %s to %s." ), msg.Printf( _( "Reconnect via from %s to %s." ),
UnescapeString( via->GetNetname() ), UnescapeString( originalNetname ),
UnescapeString( updatedNetname ) ); UnescapeString( updatedNetname ) );
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
@ -665,11 +667,13 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
if( netinfo ) if( netinfo )
{ {
wxString originalNetname = via->GetNetname();
m_commit.Modify( via ); m_commit.Modify( via );
via->SetNet( netinfo ); via->SetNet( netinfo );
msg.Printf( _( "Reconnected via from %s to %s." ), msg.Printf( _( "Reconnected via from %s to %s." ),
UnescapeString( via->GetNetname() ), UnescapeString( originalNetname ),
UnescapeString( updatedNetname ) ); UnescapeString( updatedNetname ) );
m_reporter->Report( msg, RPT_SEVERITY_ACTION ); m_reporter->Report( msg, RPT_SEVERITY_ACTION );
@ -719,17 +723,19 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
{ {
if( m_isDryRun ) if( m_isDryRun )
{ {
wxString originalNetname = zone->GetNetname();
if( !zone->GetZoneName().IsEmpty() ) if( !zone->GetZoneName().IsEmpty() )
{ {
msg.Printf( _( "Reconnect copper zone '%s' from %s to %s." ), msg.Printf( _( "Reconnect copper zone '%s' from %s to %s." ),
zone->GetZoneName(), zone->GetZoneName(),
UnescapeString( zone->GetNetname() ), UnescapeString( originalNetname ),
UnescapeString( updatedNetname ) ); UnescapeString( updatedNetname ) );
} }
else else
{ {
msg.Printf( _( "Reconnect copper zone from %s to %s." ), msg.Printf( _( "Reconnect copper zone from %s to %s." ),
UnescapeString( zone->GetNetname() ), UnescapeString( originalNetname ),
UnescapeString( updatedNetname ) ); UnescapeString( updatedNetname ) );
} }
@ -744,6 +750,8 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
if( netinfo ) if( netinfo )
{ {
wxString originalNetname = zone->GetNetname();
m_commit.Modify( zone ); m_commit.Modify( zone );
zone->SetNet( netinfo ); zone->SetNet( netinfo );
@ -751,13 +759,13 @@ bool BOARD_NETLIST_UPDATER::updateCopperZoneNets( NETLIST& aNetlist )
{ {
msg.Printf( _( "Reconnected copper zone '%s' from %s to %s." ), msg.Printf( _( "Reconnected copper zone '%s' from %s to %s." ),
zone->GetZoneName(), zone->GetZoneName(),
UnescapeString( zone->GetNetname() ), UnescapeString( originalNetname ),
UnescapeString( updatedNetname ) ); UnescapeString( updatedNetname ) );
} }
else else
{ {
msg.Printf( _( "Reconnected copper zone from %s to %s." ), msg.Printf( _( "Reconnected copper zone from %s to %s." ),
UnescapeString( zone->GetNetname() ), UnescapeString( originalNetname ),
UnescapeString( updatedNetname ) ); UnescapeString( updatedNetname ) );
} }