From 82631db1bbb567987c42a3e4243b7baaa347ff75 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Tue, 3 May 2022 09:20:46 +0200 Subject: [PATCH] Eeschema, backannotate: fix minor issues in displayed messages. From Master branch Fixes #11530 https://gitlab.com/kicad/code/kicad/issues/11530 --- eeschema/tools/backannotate.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp index 699a3e459b..cfb84d5554 100644 --- a/eeschema/tools/backannotate.cpp +++ b/eeschema/tools/backannotate.cpp @@ -2,7 +2,7 @@ * This program source code file is part of KiCad, a free EDA CAD application. * * Copyright (C) 2019 Alexander Shuklin - * Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2004-2022 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -290,7 +290,7 @@ void BACK_ANNOTATE::checkForUnusedSymbols() wxString msg = wxString::Format( _( "Footprint '%s' is not present on PCB. " "Corresponding symbols in schematic must be " "manually deleted (if desired)." ), - m_refs[i].GetFullRef() ); + m_refs[i].GetRef() ); m_reporter.ReportTail( msg, RPT_SEVERITY_WARNING ); } @@ -327,7 +327,7 @@ void BACK_ANNOTATE::applyChangelist() { ++m_changesCount; msg.Printf( _( "Change '%s' reference designator to '%s'." ), - ref.GetFullRef(), + ref.GetRef(), fpData.m_ref ); if( !m_dryRun ) @@ -344,7 +344,7 @@ void BACK_ANNOTATE::applyChangelist() { ++m_changesCount; msg.Printf( _( "Change %s footprint assignment from '%s' to '%s'." ), - ref.GetFullRef(), + ref.GetRef(), oldFootprint, fpData.m_footprint ); @@ -362,7 +362,7 @@ void BACK_ANNOTATE::applyChangelist() { ++m_changesCount; msg.Printf( _( "Change %s value from '%s' to '%s'." ), - ref.GetFullRef(), + ref.GetRef(), oldValue, fpData.m_value ); @@ -387,7 +387,7 @@ void BACK_ANNOTATE::applyChangelist() if( !pin ) { msg.Printf( _( "Cannot find %s pin '%s'." ), - ref.GetFullRef(), + ref.GetRef(), pinNumber ); m_reporter.ReportHead( msg, RPT_SEVERITY_ERROR ); @@ -398,7 +398,7 @@ void BACK_ANNOTATE::applyChangelist() if( connection && connection->Name( true ) != shortNetName ) { - processNetNameChange( ref.GetFullRef(), pin, connection, + processNetNameChange( ref.GetRef(), pin, connection, connection->Name( true ), shortNetName ); } } @@ -410,8 +410,6 @@ void BACK_ANNOTATE::applyChangelist() m_frame->RecalculateConnections( NO_CLEANUP ); m_frame->UpdateNetHighlightStatus(); } - - m_reporter.ReportHead( msg, RPT_SEVERITY_INFO ); }