dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 21 Wiki Activity

Change order of market group sorting for ammo picker

Browse Source
This commit is contained in:
DarkPhoenix
2019-10-18 12:10:02 +03:00
parent 33cb332978
commit e4df215e47
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/builtinContextMenus/graphFitAmmoPicker.py
View File

@@ -102,10 +102,10 @@ class AmmoPicker(AuxiliaryFrame):
for charges, itemCounts in modsPrelim.items(): for charges, itemCounts in modsPrelim.items():
modsFinal.append(( modsFinal.append((
# Sort items within group # Sort items within group
sorted(itemCounts.items(), key=lambda i: sMkt.itemSort(i[0]), reverse=True), sorted(itemCounts.items(), key=lambda i: sMkt.itemSort(i[0], reverseMktGrp=True), reverse=True),
charges)) charges))
# Sort item groups # Sort item groups
modsFinal.sort(key=lambda i: sMkt.itemSort(i[0][0][0]), reverse=True) modsFinal.sort(key=lambda i: sMkt.itemSort(i[0][0][0], reverseMktGrp=True), reverse=True)
return modsFinal return modsFinal
def getDrones(self, fit): def getDrones(self, fit):

4
service/market.py
View File

@@ -842,13 +842,15 @@ class Market:
recentlyUsedModules.pop(-1) recentlyUsedModules.pop(-1)
recentlyUsedModules.insert(0, itemID) recentlyUsedModules.insert(0, itemID)
def itemSort(self, item): def itemSort(self, item, reverseMktGrp=False):
catname = self.getCategoryByItem(item).name catname = self.getCategoryByItem(item).name
try: try:
mktgrpid = self.getMarketGroupByItem(item).ID mktgrpid = self.getMarketGroupByItem(item).ID
except AttributeError: except AttributeError:
mktgrpid = -1 mktgrpid = -1
pyfalog.warning("unable to find market group for {}".format(item.name)) pyfalog.warning("unable to find market group for {}".format(item.name))
if reverseMktGrp:
mktgrpid = -mktgrpid
parentname = self.getParentItemByItem(item).name parentname = self.getParentItemByItem(item).name
# Get position of market group # Get position of market group
metagrpid = self.getMetaGroupIdByItem(item) metagrpid = self.getMetaGroupIdByItem(item)