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

eeschema: One more sort case 

This fixes the same issue as f4a1fef3b requiring an absolute inversion
when sorting ascending vs descending
This commit is contained in:
Seth Hillbrand 2019-11-12 23:33:29 -08:00
parent 7a8f2a5623
commit 9f8eb350f7
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eeschema/dialogs/dialog_fields_editor_global.cpp
View File

@ -346,7 +346,15 @@ public:
else if( rhGroup.m_Refs.size() == 0 ) else if( rhGroup.m_Refs.size() == 0 )
return false; return false;
bool retVal; // N.B. To meet the iterator sort conditions, we cannot simply invert the truth
// to get the opposite sort. i.e. ~(a<b) != (a>b)
auto local_cmp = [ ascending ]( const auto a, const auto b )
{
if( ascending )
return a < b;
else
return a > b;
};
// Primary sort key is sortCol; secondary is always REFERENCE (column 0) // Primary sort key is sortCol; secondary is always REFERENCE (column 0)
@ -357,15 +365,10 @@ public:
{ {
wxString lhRef = lhGroup.m_Refs[ 0 ].GetRef() + lhGroup.m_Refs[ 0 ].GetRefNumber(); wxString lhRef = lhGroup.m_Refs[ 0 ].GetRef() + lhGroup.m_Refs[ 0 ].GetRefNumber();
wxString rhRef = rhGroup.m_Refs[ 0 ].GetRef() + rhGroup.m_Refs[ 0 ].GetRefNumber(); wxString rhRef = rhGroup.m_Refs[ 0 ].GetRef() + rhGroup.m_Refs[ 0 ].GetRefNumber();
retVal = UTIL::RefDesStringCompare( lhRef, rhRef ) < 0; return local_cmp( UTIL::RefDesStringCompare( lhRef, rhRef ), 0 );
} }
else else
retVal = ValueStringCompare( lhs, rhs ) < 0; return local_cmp( ValueStringCompare( lhs, rhs ), 0 );
if( ascending )
return retVal;
else
return !retVal;
} }
@ -997,6 +1000,7 @@ void DIALOG_FIELDS_EDITOR_GLOBAL::OnColSort( wxGridEvent& aEvent )
ascending = true; ascending = true;
m_dataModel->Sort( sortCol, ascending ); m_dataModel->Sort( sortCol, ascending );
m_grid->ForceRefresh();
} }