From 6a3182d3973c4c7520521ae008d15ca3f837fa0f Mon Sep 17 00:00:00 2001 From: Weeknie Date: Mon, 25 Oct 2010 23:22:44 +0200 Subject: [PATCH 1/5] Added a proxy to get the Module object belonging to a certain Item object --- service/market.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/service/market.py b/service/market.py index dfacfadba..869940cad 100644 --- a/service/market.py +++ b/service/market.py @@ -19,6 +19,7 @@ import eos.db import eos.types +import eos.saveddata import wx import threading from sqlalchemy.orm.exc import NoResultFound @@ -175,6 +176,9 @@ class Market(): def getItem(self, itemId): return eos.db.getItem(itemId) + + def getModule(self, itemObject): + return eos.saveddata.Module(itemObject) def getGroup(self, groupId): return eos.db.getGroup(groupId) From 73ae427f656c0426847c154f1fa392c1a32e4de0 Mon Sep 17 00:00:00 2001 From: Weeknie Date: Mon, 25 Oct 2010 23:31:32 +0200 Subject: [PATCH 2/5] Fixed the Module proxy, now it actually returns the Module object --- service/market.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/market.py b/service/market.py index 869940cad..60918aa82 100644 --- a/service/market.py +++ b/service/market.py @@ -178,7 +178,7 @@ class Market(): return eos.db.getItem(itemId) def getModule(self, itemObject): - return eos.saveddata.Module(itemObject) + return eos.saveddata.module.Module(itemObject) def getGroup(self, groupId): return eos.db.getGroup(groupId) From 0876661dfa960cdb961b42ef2fb2dfa9e68becc6 Mon Sep 17 00:00:00 2001 From: Weeknie Date: Mon, 25 Oct 2010 23:54:38 +0200 Subject: [PATCH 3/5] Revert "Revert "Sort itemView of market browser by meta level, highest meta level on top, ticket 90"" This reverts commit efd3eb26a54f3915bc43712c5b635bbf3ed711c5. --- 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 0a44175290439ccea594f09c65c8326c009b8234 Mon Sep 17 00:00:00 2001 From: Weeknie Date: Mon, 25 Oct 2010 23:58:45 +0200 Subject: [PATCH 4/5] Reapply "Revert "Sort itemView of market browser by meta level, highest meta level on top, ticket 90"" This reverts commit 0876661dfa960cdb961b42ef2fb2dfa9e68becc6. --- 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) From f224d840e4ac8bce8ed3b09cb91318fd5dfc18f3 Mon Sep 17 00:00:00 2001 From: Weeknie Date: Tue, 26 Oct 2010 00:01:31 +0200 Subject: [PATCH 5/5] Revert "Added a proxy to get the Module object belonging to a certain Item object" This reverts commit 6a3182d3973c4c7520521ae008d15ca3f837fa0f. Conflicts: service/market.py --- service/market.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/service/market.py b/service/market.py index 60918aa82..5bdaadfc8 100644 --- a/service/market.py +++ b/service/market.py @@ -176,9 +176,6 @@ class Market(): def getItem(self, itemId): return eos.db.getItem(itemId) - - def getModule(self, itemObject): - return eos.saveddata.module.Module(itemObject) def getGroup(self, groupId): return eos.db.getGroup(groupId)