From f5e83f04155f76f255f7ec520de496b40b194c8e Mon Sep 17 00:00:00 2001 From: Weeknie Date: Mon, 25 Oct 2010 16:25:35 +0200 Subject: [PATCH 1/6] Sort itemView of the marketbrowser by meta level, highest meta level on top, ticket 90 --- gui/marketBrowser.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 02f55970c..68bcb8915 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -23,8 +23,10 @@ import wx.lib.newevent import service import bitmapLoader import gui.mainFrame +import eos.db from gui.cachingImageList import CachingImageList from gui.contextMenu import ContextMenu +from eos.saveddata import module ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent() @@ -333,11 +335,15 @@ class MarketBrowser(wx.Panel): self.toggleButtons(usedMetas) def sort(id1, id2): - grp = cmp(idGroupMap[id1], idGroupMap[id2]) - if grp != 0: - return grp - - return cmp(idNameMap[id1], idNameMap[id2]) + item1 = eos.db.getItem(id1) + item2 = eos.db.getItem(id2) + + if item1.getAttribute("metaLevel") > item2.getAttribute("metaLevel"): + return -1 + elif item1.getAttribute("metaLevel") == item2.getAttribute("metaLevel"): + return 0 + else: + return 1 self.itemView.SortItems(sort) self.itemView.SetColumnWidth(0, wx.LIST_AUTOSIZE) From 212ef42af276df8c62515b61e9b96347aa3201c3 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 25 Oct 2010 16:31:59 +0200 Subject: [PATCH 2/6] Revert "Sort itemView of the marketbrowser by meta level, highest meta level on top, ticket 90" This reverts commit f5e83f04155f76f255f7ec520de496b40b194c8e. --- gui/marketBrowser.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 68bcb8915..02f55970c 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -23,10 +23,8 @@ import wx.lib.newevent import service import bitmapLoader import gui.mainFrame -import eos.db from gui.cachingImageList import CachingImageList from gui.contextMenu import ContextMenu -from eos.saveddata import module ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent() @@ -335,15 +333,11 @@ class MarketBrowser(wx.Panel): self.toggleButtons(usedMetas) def sort(id1, id2): - item1 = eos.db.getItem(id1) - item2 = eos.db.getItem(id2) - - if item1.getAttribute("metaLevel") > item2.getAttribute("metaLevel"): - return -1 - elif item1.getAttribute("metaLevel") == item2.getAttribute("metaLevel"): - return 0 - else: - return 1 + grp = cmp(idGroupMap[id1], idGroupMap[id2]) + if grp != 0: + return grp + + return cmp(idNameMap[id1], idNameMap[id2]) self.itemView.SortItems(sort) self.itemView.SetColumnWidth(0, wx.LIST_AUTOSIZE) From 7bc70617dc2f4157154df02aab9a01c59d720ca2 Mon Sep 17 00:00:00 2001 From: Weeknie Date: Mon, 25 Oct 2010 16:36:26 +0200 Subject: [PATCH 3/6] Sort itemView of market browser by meta level, highest meta level on top, ticket 90 --- gui/marketBrowser.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 02f55970c..90ff0e990 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -333,11 +333,16 @@ class MarketBrowser(wx.Panel): self.toggleButtons(usedMetas) def sort(id1, id2): - grp = cmp(idGroupMap[id1], idGroupMap[id2]) - if grp != 0: - return grp - - return cmp(idNameMap[id1], idNameMap[id2]) + sMarket = service.Market.getInstance() + item1 = sMarket.getItem(id1) + item2 = sMarket.getItem(id2) + + if item1.getAttribute("metaLevel") > item2.getAttribute("metaLevel"): + return -1 + elif item1.getAttribute("metaLevel") == item2.getAttribute("metaLevel"): + return 0 + else: + return 1 self.itemView.SortItems(sort) self.itemView.SetColumnWidth(0, wx.LIST_AUTOSIZE) From b286bba0c94f635351109faa48c9111064b0e3bd Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 25 Oct 2010 16:41:41 +0200 Subject: [PATCH 4/6] Replace trippleconditional by cmp --- gui/marketBrowser.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 90ff0e990..5c79ac561 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -336,13 +336,8 @@ class MarketBrowser(wx.Panel): sMarket = service.Market.getInstance() item1 = sMarket.getItem(id1) item2 = sMarket.getItem(id2) - - if item1.getAttribute("metaLevel") > item2.getAttribute("metaLevel"): - return -1 - elif item1.getAttribute("metaLevel") == item2.getAttribute("metaLevel"): - return 0 - else: - return 1 + + return cmp(item1.getAttribute("metaLevel"), item2.getAttribute("metaLevel")) self.itemView.SortItems(sort) self.itemView.SetColumnWidth(0, wx.LIST_AUTOSIZE) From e2b42a8131c283a9efd26df7200a03235e5aa01a Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 25 Oct 2010 16:43:38 +0200 Subject: [PATCH 5/6] Revert "Replace trippleconditional by cmp" This reverts commit b286bba0c94f635351109faa48c9111064b0e3bd. --- gui/marketBrowser.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 5c79ac561..90ff0e990 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -336,8 +336,13 @@ class MarketBrowser(wx.Panel): sMarket = service.Market.getInstance() item1 = sMarket.getItem(id1) item2 = sMarket.getItem(id2) - - return cmp(item1.getAttribute("metaLevel"), item2.getAttribute("metaLevel")) + + if item1.getAttribute("metaLevel") > item2.getAttribute("metaLevel"): + return -1 + elif item1.getAttribute("metaLevel") == item2.getAttribute("metaLevel"): + return 0 + else: + return 1 self.itemView.SortItems(sort) self.itemView.SetColumnWidth(0, wx.LIST_AUTOSIZE) From efd3eb26a54f3915bc43712c5b635bbf3ed711c5 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Mon, 25 Oct 2010 16:43:50 +0200 Subject: [PATCH 6/6] Revert "Sort itemView of market browser by meta level, highest meta level on top, ticket 90" This reverts commit 7bc70617dc2f4157154df02aab9a01c59d720ca2. --- gui/marketBrowser.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py index 90ff0e990..02f55970c 100644 --- a/gui/marketBrowser.py +++ b/gui/marketBrowser.py @@ -333,16 +333,11 @@ class MarketBrowser(wx.Panel): self.toggleButtons(usedMetas) def sort(id1, id2): - sMarket = service.Market.getInstance() - item1 = sMarket.getItem(id1) - item2 = sMarket.getItem(id2) - - if item1.getAttribute("metaLevel") > item2.getAttribute("metaLevel"): - return -1 - elif item1.getAttribute("metaLevel") == item2.getAttribute("metaLevel"): - return 0 - else: - return 1 + grp = cmp(idGroupMap[id1], idGroupMap[id2]) + if grp != 0: + return grp + + return cmp(idNameMap[id1], idNameMap[id2]) self.itemView.SortItems(sort) self.itemView.SetColumnWidth(0, wx.LIST_AUTOSIZE)