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

Sort pins by number when grouping by name. 

Fixes: lp:1828648
* https://bugs.launchpad.net/kicad/+bug/1828648

(cherry picked from commit 97212acecb)
This commit is contained in:
Jeff Young 2019-08-21 20:16:21 +01:00
parent 86691dabbf
commit c879dcaf7d
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/dialogs/dialog_lib_edit_pin_table.cpp
View File

@ -309,6 +309,9 @@ public:
ascending = GetView()->IsSortOrderAscending();
}
for( LIB_PINS& row : m_rows )
SortPins( row );
SortRows( sortCol, ascending );
if ( GetView() )
@ -321,8 +324,19 @@ public:
void SortRows( int aSortCol, bool ascending )
{
std::sort( m_rows.begin(), m_rows.end(),
[ aSortCol, ascending, this ]( LIB_PINS lhs, LIB_PINS rhs ) -> bool
{ return compare( lhs, rhs, aSortCol, ascending, m_userUnits ); } );
[ aSortCol, ascending, this ]( LIB_PINS& lhs, LIB_PINS& rhs ) -> bool
{
return compare( lhs, rhs, aSortCol, ascending, m_userUnits );
} );
}
void SortPins( LIB_PINS& aRow )
{
std::sort( aRow.begin(), aRow.end(),
[]( LIB_PIN* lhs, LIB_PIN* rhs ) -> bool
{
return PinNumbers::Compare( lhs->GetNumber(), rhs->GetNumber() ) < 0;
} );
}
void AppendRow( LIB_PIN* aPin )