amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-12 13:37:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

some provisions for sorting card list by multiple columns

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1037 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
twanvl
2008-08-02 20:34:47 +00:00
parent 2f5666ac5b
commit de0817099a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/control/card_list.cpp
+8 -2
View File
@@ -187,8 +187,13 @@ bool CardListBase::compareItems(void* a, void* b) const {
FieldP sort_field = column_fields[sort_by_column]; FieldP sort_field = column_fields[sort_by_column];
ValueP va = reinterpret_cast<Card*>(a)->data[sort_field]; ValueP va = reinterpret_cast<Card*>(a)->data[sort_field];
ValueP vb = reinterpret_cast<Card*>(b)->data[sort_field]; ValueP vb = reinterpret_cast<Card*>(b)->data[sort_field];
if (!va || !vb) return va < vb; // got to do something, compare pointers if (!va || !vb) return va < vb; // got to do something, compare pointers
return smart_less( va->getSortKey(), vb->getSortKey() ); // compare sort keys
int cmp = smart_compare( va->getSortKey(), vb->getSortKey() );
if (cmp != 0) return cmp < 0;
// equal values, compare alternate sort key
// TODO: sort by a second column
return false;
} }
void CardListBase::rebuild() { void CardListBase::rebuild() {
@@ -265,6 +270,7 @@ void CardListBase::selectColumns() {
CardListColumnSelectDialog wnd(this, set->game); CardListColumnSelectDialog wnd(this, set->game);
if (wnd.ShowModal() == wxID_OK) { if (wnd.ShowModal() == wxID_OK) {
// rebuild all card lists for this game // rebuild all card lists for this game
storeColumns();
FOR_EACH(card_list, card_lists) { FOR_EACH(card_list, card_lists) {
if (card_list->set && card_list->set->game == set->game) { if (card_list->set && card_list->set->game == set->game) {
card_list->rebuild(); card_list->rebuild();