realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-15 10:43:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo in net label orientation calculation.

Browse Source 
Fixes https://gitlab.com/kicad/code/kicad/issues/6333
This commit is contained in:
Jeff Young 2020-11-09 12:06:03 +00:00
parent 701e404838
commit 4889f9bb7c
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
eeschema/tools/backannotate.cpp
View File

@ -38,8 +38,7 @@
BACK_ANNOTATE::BACK_ANNOTATE( SCH_EDIT_FRAME* aFrame, REPORTER& aReporter, bool aRelinkFootprints, BACK_ANNOTATE::BACK_ANNOTATE( SCH_EDIT_FRAME* aFrame, REPORTER& aReporter, bool aRelinkFootprints,
bool aProcessFootprints, bool aProcessValues, bool aProcessFootprints, bool aProcessValues,
bool aProcessReferences, bool aProcessNetNames, bool aProcessReferences, bool aProcessNetNames, bool aDryRun ) :
bool aDryRun ) :
m_reporter( aReporter ), m_reporter( aReporter ),
m_matchByReference( aRelinkFootprints ), m_matchByReference( aRelinkFootprints ),
m_processFootprints( aProcessFootprints ), m_processFootprints( aProcessFootprints ),
@ -157,7 +156,8 @@ void BACK_ANNOTATE::getPcbModulesFromString( const std::string& aPayload )
if( path == "" ) if( path == "" )
{ {
msg.Printf( _( "Footprint \"%s\" has no symbol associated." ), ref ); msg.Printf( _( "Footprint '%s' has no associated symbol." ),
ref );
m_reporter.ReportHead( msg, RPT_SEVERITY_WARNING ); m_reporter.ReportHead( msg, RPT_SEVERITY_WARNING );
continue; continue;
} }
@ -180,7 +180,7 @@ void BACK_ANNOTATE::getPcbModulesFromString( const std::string& aPayload )
} }
catch( ... ) catch( ... )
{ {
wxLogWarning( "Cannot parse PCB netlist for back-annotation" ); wxLogWarning( "Cannot parse PCB netlist for back-annotation." );
} }
// Use lower_bound for not to iterate over map twice // Use lower_bound for not to iterate over map twice
@ -189,8 +189,9 @@ void BACK_ANNOTATE::getPcbModulesFromString( const std::string& aPayload )
if( nearestItem != m_pcbModules.end() && nearestItem->first == path ) if( nearestItem != m_pcbModules.end() && nearestItem->first == path )
{ {
// Module with this path already exists - generate error // Module with this path already exists - generate error
msg.Printf( _( "Pcb footprints \"%s\" and \"%s\" linked to same symbol" ), msg.Printf( _( "Pcb footprints '%s' and '%s' linked to same symbol." ),
nearestItem->second->m_ref, ref ); nearestItem->second->m_ref,
ref );
m_reporter.ReportHead( msg, RPT_SEVERITY_ERROR ); m_reporter.ReportHead( msg, RPT_SEVERITY_ERROR );
} }
else else
@ -253,8 +254,8 @@ void BACK_ANNOTATE::getChangeList()
else else
{ {
// Haven't found linked symbol in multiunits or common refs. Generate error // Haven't found linked symbol in multiunits or common refs. Generate error
wxString msg; wxString msg = wxString::Format( _( "Cannot find symbol for footprint '%s'." ),
msg.Printf( _( "Cannot find symbol for \"%s\" footprint" ), pcbData->m_ref ); pcbData->m_ref );
m_reporter.ReportTail( msg, RPT_SEVERITY_ERROR ); m_reporter.ReportTail( msg, RPT_SEVERITY_ERROR );
} }
} }
@ -272,14 +273,14 @@ void BACK_ANNOTATE::checkForUnusedSymbols()
size_t i = 0; size_t i = 0;
for( auto& item : m_changelist ) for( const std::pair<SCH_REFERENCE, std::shared_ptr<PCB_MODULE_DATA>>& item : m_changelist )
{ {
// Refs and changelist are both sorted by paths, so we just go over m_refs and // Refs and changelist are both sorted by paths, so we just go over m_refs and
// generate errors before we will find m_refs member to which item linked // generate errors before we will find m_refs member to which item linked
while( i < m_refs.GetCount() && m_refs[i].GetPath() != item.first.GetPath() ) while( i < m_refs.GetCount() && m_refs[i].GetPath() != item.first.GetPath() )
{ {
wxString msg; wxString msg = wxString::Format( _( "Cannot find footprint for symbol '%s'." ),
msg.Printf( _( "Cannot find footprint for \"%s\" symbol" ), m_refs[i++].GetFullRef() ); m_refs[i++].GetFullRef() );
m_reporter.ReportTail( msg, RPT_SEVERITY_ERROR ); m_reporter.ReportTail( msg, RPT_SEVERITY_ERROR );
} }
@ -288,7 +289,8 @@ void BACK_ANNOTATE::checkForUnusedSymbols()
if( m_matchByReference && !m_frame->ReadyToNetlist() ) if( m_matchByReference && !m_frame->ReadyToNetlist() )
{ {
m_reporter.ReportTail( _( "Cannot relink footprints because schematic is not fully annotated" ), m_reporter.ReportTail( _( "Cannot relink footprints because schematic is not fully "
"annotated." ),
RPT_SEVERITY_ERROR ); RPT_SEVERITY_ERROR );
} }
} }
@ -415,8 +417,8 @@ static LABEL_SPIN_STYLE orientLabel( SCH_PIN* aPin )
{ {
case PIN_UP: spin = LABEL_SPIN_STYLE::BOTTOM; break; case PIN_UP: spin = LABEL_SPIN_STYLE::BOTTOM; break;
case PIN_DOWN: spin = LABEL_SPIN_STYLE::UP; break; case PIN_DOWN: spin = LABEL_SPIN_STYLE::UP; break;
case PIN_LEFT: spin = LABEL_SPIN_STYLE::LEFT; break; case PIN_LEFT: spin = LABEL_SPIN_STYLE::RIGHT; break;
case PIN_RIGHT: spin = LABEL_SPIN_STYLE::RIGHT; break; case PIN_RIGHT: spin = LABEL_SPIN_STYLE::LEFT; break;
} }
// Reorient based on the actual component orientation now // Reorient based on the actual component orientation now
@ -473,6 +475,7 @@ static LABEL_SPIN_STYLE orientLabel( SCH_PIN* aPin )
return spin; return spin;
} }
void BACK_ANNOTATE::processNetNameChange( SCH_CONNECTION* aConn, const wxString& aOldName, void BACK_ANNOTATE::processNetNameChange( SCH_CONNECTION* aConn, const wxString& aOldName,
const wxString& aNewName ) const wxString& aNewName )
{ {
@ -489,7 +492,8 @@ void BACK_ANNOTATE::processNetNameChange( SCH_CONNECTION* aConn, const wxString&
if( EscapeString( label->GetShownText(), CTX_NETNAME ) == oldName ) if( EscapeString( label->GetShownText(), CTX_NETNAME ) == oldName )
{ {
m_frame->SaveCopyInUndoList( aScreen, label, UNDO_REDO::CHANGED, m_appendUndo ); m_frame->SaveCopyInUndoList( aScreen, label, UNDO_REDO::CHANGED,
m_appendUndo );
m_appendUndo = true; m_appendUndo = true;
static_cast<SCH_TEXT*>( label )->SetText( newName ); static_cast<SCH_TEXT*>( label )->SetText( newName );
} }