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

Make sure Check Pins works on a flattened copy of the part. 

Also improved the reporting slightly (in particular for pins with
no names or pins with the empty flag ("~").

Fixes https://gitlab.com/kicad/code/kicad/issues/7165
This commit is contained in:
Jeff Young 2021-01-18 15:08:19 +00:00
parent 26bc29808a
commit 2c9da4daa4
1 changed files with 94 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

175
eeschema/tools/ee_inspection_tool.cpp
View File

@ -185,31 +185,26 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent )
if( !part ) if( !part )
return 0; return 0;
wxString msg; LIB_PINS pinList;
const int min_grid_size = 25; std::unique_ptr<LIB_PART> flattenedPart = part->Flatten();
const int grid_size = KiROUND( getView()->GetGAL()->GetGridSize().x );
const int clamped_grid_size = ( grid_size < min_grid_size ) ? min_grid_size : grid_size;
LIB_PINS pinList;
part->GetPins( pinList ); flattenedPart->GetPins( pinList );
if( pinList.empty() )
{
DisplayInfoMessage( m_frame, _( "No pins!" ) );
return 0;
}
// Sort pins by pin num, so 2 duplicate pins // Sort pins by pin num, so 2 duplicate pins
// (pins with the same number) will be consecutive in list // (pins with the same number) will be consecutive in list
sort( pinList.begin(), pinList.end(), sort_by_pin_number ); sort( pinList.begin(), pinList.end(), sort_by_pin_number );
// Test for duplicates: // Test for duplicates:
DIALOG_DISPLAY_HTML_TEXT_BASE error_display( m_frame, wxID_ANY, _( "Marker Information" ), DIALOG_DISPLAY_HTML_TEXT_BASE error_display( m_frame, wxID_ANY, _( "Symbol Warnings" ),
wxDefaultPosition, wxSize( 750, 600 ) ); wxDefaultPosition, wxSize( 750, 600 ) );
std::vector<wxString> messages; const int min_grid_size = 25;
const int grid_size = KiROUND( getView()->GetGAL()->GetGridSize().x );
const int clamped_grid_size = ( grid_size < min_grid_size ) ? min_grid_size : grid_size;
int dup_error = 0; std::vector<wxString> messages;
wxString msg;
int dup_error = 0;
for( unsigned ii = 1; ii < pinList.size(); ii++ ) for( unsigned ii = 1; ii < pinList.size(); ii++ )
{ {
@ -219,67 +214,76 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent )
if( pin->GetNumber() != next->GetNumber() || pin->GetConvert() != next->GetConvert() ) if( pin->GetNumber() != next->GetNumber() || pin->GetConvert() != next->GetConvert() )
continue; continue;
wxString pinName;
wxString nextName;
if( pin->GetName() != "~" && !pin->GetName().IsEmpty() )
pinName = " '" + pin->GetName() + "'";
if( next->GetName() != "~" && !next->GetName().IsEmpty() )
nextName = " '" + next->GetName() + "'";
dup_error++; dup_error++;
if( part->HasConversion() && next->GetConvert() ) if( part->HasConversion() && next->GetConvert() )
{ {
if( part->GetUnitCount() <= 1 ) if( part->GetUnitCount() <= 1 )
{ {
msg = wxString::Format( _( "<b>Duplicate pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b>" msg.Printf( _( "<b>Duplicate pin %s</b>%s at location <b>(%.3f, %.3f)</b>"
" conflicts with pin %s \"%s\" at location <b>(%.3f, %.3f)</b> of converted" ), " conflicts with pin %s%s at location <b>(%.3f, %.3f)</b>"
next->GetNumber(), " of converted" ),
next->GetName(), next->GetNumber(),
next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0, nextName,
pin->GetNumber(), next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0,
pin->GetName(), pin->GetNumber(),
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 ); pin->GetName(),
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 );
} }
else else
{ {
msg = wxString::Format( _( "<b>Duplicate pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b>" msg.Printf( _( "<b>Duplicate pin %s</b>%s at location <b>(%.3f, %.3f)</b>"
" conflicts with pin %s \"%s\" at location <b>(%.3f, %.3f)</b>" " conflicts with pin %s%s at location <b>(%.3f, %.3f)</b>"
" in units %c and %c of converted" ), " in units %c and %c of converted" ),
next->GetNumber(), next->GetNumber(),
next->GetName(), nextName,
next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0, next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0,
pin->GetNumber(), pin->GetNumber(),
pin->GetName(), pinName,
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0, pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0,
'A' + next->GetUnit() - 1, 'A' + next->GetUnit() - 1,
'A' + pin->GetUnit() - 1 ); 'A' + pin->GetUnit() - 1 );
} }
} }
else else
{ {
if( part->GetUnitCount() <= 1 ) if( part->GetUnitCount() <= 1 )
{ {
msg = wxString::Format( _( "<b>Duplicate pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b>" msg.Printf( _( "<b>Duplicate pin %s</b>%s at location <b>(%.3f, %.3f)</b>"
" conflicts with pin %s \"%s\" at location <b>(%.3f, %.3f)</b>" ), " conflicts with pin %s%s at location <b>(%.3f, %.3f)</b>" ),
next->GetNumber(), next->GetNumber(),
next->GetName(), nextName,
next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0, next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0,
pin->GetNumber(), pin->GetNumber(),
pin->GetName(), pinName,
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 ); pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 );
} }
else else
{ {
msg = wxString::Format( _( "<b>Duplicate pin %s</b> \"%s\" at location <b>(%.3f, %.3f)</b>" msg.Printf( _( "<b>Duplicate pin %s</b>%s at location <b>(%.3f, %.3f)</b>"
" conflicts with pin %s \"%s\" at location <b>(%.3f, %.3f)</b>" " conflicts with pin %s%s at location <b>(%.3f, %.3f)</b>"
" in units %c and %c" ), " in units %c and %c" ),
next->GetNumber(), next->GetNumber(),
next->GetName(), nextName,
next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0, next->GetPosition().x / 1000.0, -next->GetPosition().y / 1000.0,
pin->GetNumber(), pin->GetNumber(),
pin->GetName(), pinName,
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0, pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0,
'A' + next->GetUnit() - 1, 'A' + next->GetUnit() - 1,
'A' + pin->GetUnit() - 1 ); 'A' + pin->GetUnit() - 1 );
} }
} }
msg += wxT( ".<br>" ); msg += wxT( ".<br><br>" );
messages.push_back( msg ); messages.push_back( msg );
} }
@ -288,54 +292,63 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent )
for( LIB_PIN* pin : pinList ) for( LIB_PIN* pin : pinList )
{ {
if( ( (pin->GetPosition().x % clamped_grid_size) == 0 ) && if( ( (pin->GetPosition().x % clamped_grid_size) == 0 )
( (pin->GetPosition().y % clamped_grid_size) == 0 ) ) && ( (pin->GetPosition().y % clamped_grid_size) == 0 ) )
{
continue; continue;
}
// "pin" is off grid here. // "pin" is off grid here.
offgrid_error++; offgrid_error++;
wxString pinName = pin->GetName();
if( pinName.IsEmpty() || pinName == "~" )
pinName = "";
else
pinName = "'" + pinName + "'";
if( part->HasConversion() && pin->GetConvert() ) if( part->HasConversion() && pin->GetConvert() )
{ {
if( part->GetUnitCount() <= 1 ) if( part->GetUnitCount() <= 1 )
{ {
msg = wxString::Format( _( "<b>Off grid pin %s</b> \"%s\" at location " msg.Printf( _( "<b>Off grid pin %s</b>%s at location <b>(%.3f, %.3f)</b>"
"<b>(%.3f, %.3f)</b> of converted.<br>" ), " of converted" ),
pin->GetNumber(), pin->GetNumber(),
pin->GetName(), pinName,
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 ); pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 );
} }
else else
{ {
msg = wxString::Format( _( "<b>Off grid pin %s</b> \"%s\" at location " msg.Printf( _( "<b>Off grid pin %s</b>%s at location <b>(%.3f, %.3f)</b>"
"<b>(%.3f, %.3f)</b> in symbol %c of converted.<br>" ), " in symbol %c of converted" ),
pin->GetNumber(), pin->GetNumber(),
pin->GetName(), pinName,
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0, pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0,
'A' + pin->GetUnit() - 1 ); 'A' + pin->GetUnit() - 1 );
} }
} }
else else
{ {
if( part->GetUnitCount() <= 1 ) if( part->GetUnitCount() <= 1 )
{ {
msg = wxString::Format( _( "<b>Off grid pin %s</b> \"%s\" at location " msg.Printf( _( "<b>Off grid pin %s</b>%s at location <b>(%.3f, %.3f)</b>" ),
"<b>(%.3f, %.3f)</b>.<br>" ), pin->GetNumber(),
pin->GetNumber(), pinName,
pin->GetName(), pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 );
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0 );
} }
else else
{ {
msg = wxString::Format( _( "<b>Off grid pin %s</b> \"%s\" at location " msg.Printf( _( "<b>Off grid pin %s</b>%s at location <b>(%.3f, %.3f)</b>"
"<b>(%.3f, %.3f)</b> in symbol %c.<br>" ), " in symbol %c" ),
pin->GetNumber(), pin->GetNumber(),
pin->GetName(), pinName,
pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0, pin->GetPosition().x / 1000.0, -pin->GetPosition().y / 1000.0,
'A' + pin->GetUnit() - 1 ); 'A' + pin->GetUnit() - 1 );
} }
} }
msg += wxT( ".<br><br>" );
messages.push_back( msg ); messages.push_back( msg );
} }
@ -346,8 +359,8 @@ int EE_INSPECTION_TOOL::CheckSymbol( const TOOL_EVENT& aEvent )
wxColour bgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ); wxColour bgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW );
wxColour fgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT ); wxColour fgcolor = wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOWTEXT );
wxString outmsg = wxString::Format( "<html><body bgcolor='%s' text='%s'>", wxString outmsg = wxString::Format( "<html><body bgcolor='%s' text='%s'>",
bgcolor.GetAsString( wxC2S_HTML_SYNTAX ), bgcolor.GetAsString( wxC2S_HTML_SYNTAX ),
fgcolor.GetAsString( wxC2S_HTML_SYNTAX ) ); fgcolor.GetAsString( wxC2S_HTML_SYNTAX ) );
for( auto& msgPart : messages ) for( auto& msgPart : messages )
outmsg += msgPart; outmsg += msgPart;