From e9a4faee45ceffd366e361faefc08228b30c042a Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Wed, 19 Jan 2011 11:40:39 +0200 Subject: [PATCH 1/2] Fixed #397 , take in account forced market groups --- gui/droneView.py | 10 ++++------ service/market.py | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/gui/droneView.py b/gui/droneView.py index b16e2e451..7fd7497ab 100644 --- a/gui/droneView.py +++ b/gui/droneView.py @@ -93,13 +93,11 @@ class DroneView(d.Display): 'Fighter Bombers', 'Combat Utility Drones', 'Electronic Warfare Drones', 'Logistic Drones', 'Mining Drones') def droneKey(self, drone): - item = drone.item - if item.name == "Shadow": - return (self.DRONE_ORDER.index('Fighter Bombers'), drone.item.name) - if item.marketGroup is None: - item = item.metaGroup.parent + cMarket = service.Market.getInstance() - return (self.DRONE_ORDER.index(item.marketGroup.name), + groupName = cMarket.getMarketGroupName(drone.item) + + return (self.DRONE_ORDER.index(groupName), drone.item.name) def fitChanged(self, event): diff --git a/service/market.py b/service/market.py index 2204ca3fa..ecb26cae5 100644 --- a/service/market.py +++ b/service/market.py @@ -236,6 +236,22 @@ class Market(): def getMarketGroup(self, marketGroupId): return eos.db.getMarketGroup(marketGroupId) + + def getForcedMarketGroupID(self,itemID): + if itemID in self.FORCED_ITEM_MKTGRPS: + grpID,meta = self.FORCED_ITEM_MKTGRPS[itemID] + return grpID + return None + + def getMarketGroupName(self, item): + if item.marketGroup == None: + marketGroupID = self.getForcedMarketGroupID(item.ID) + marketGroup = self.getMarketGroup(marketGroupID) + groupName = marketGroup.name + else: + groupName = item.marketGroup.name + + return groupName MARKET_GROUPS = (9, #Modules 1111, #Rigs From c4cf8539928d6e5a9e5a2c6ccf26d03157ad0e33 Mon Sep 17 00:00:00 2001 From: HomeWorld Date: Wed, 19 Jan 2011 13:15:39 +0200 Subject: [PATCH 2/2] Updated license info (missing v3) in aboutData.py --- gui/aboutData.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/aboutData.py b/gui/aboutData.py index 162bf41d0..037016db4 100644 --- a/gui/aboutData.py +++ b/gui/aboutData.py @@ -19,7 +19,7 @@ import config versionString = "{0} {1} - {2} {3}".format(config.version, config.tag, config.expansionName, config.expansionVersion) -license = "pyfa is released under GNU GPL" +license = "pyfa is released under GNU GPLv3" licenseLocation = "gpl.txt" developers = ("\n cncfanatics \t(Sakari Orisi)\n" , " DarkPhoenix \t(Kadesh Priestess)\n", " Darriele \t(Darriele)") credits = (("EVE SERVICE CORP \twww.evsco.net - host of EVEFIT project ( pyfa / EOS/ Aurora)"), ("Entity (Entity) \t\tCapacitor calculations / EVEAPI python lib / Reverence"), ("Aurora \t\tMaths"), ("Corollax (Aamrr) \tVarious EOS/pyfa improvements"))