Skip to content

Commit 735827a

Browse files
committed
proof of concept
1 parent d3fcdcb commit 735827a

File tree

3 files changed

+20
-8
lines changed

3 files changed

+20
-8
lines changed

gui/builtinMarketBrowser/events.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent()
66

77
RECENTLY_USED_MODULES = -2
8+
9+
CHARGES_FOR_FIT = -3

gui/builtinMarketBrowser/itemView.py

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
import gui.builtinMarketBrowser.pfSearchBox as SBox
55
from config import slotColourMap, slotColourMapDark
66
from eos.saveddata.module import Module
7-
from gui.builtinMarketBrowser.events import ItemSelected, RECENTLY_USED_MODULES
7+
from gui.builtinMarketBrowser.events import ItemSelected, RECENTLY_USED_MODULES, CHARGES_FOR_FIT
88
from gui.contextMenu import ContextMenu
99
from gui.display import Display
1010
from gui.utils.staticHelpers import DragDropHelper
1111
from gui.utils.dark import isDark
1212
from service.fit import Fit
1313
from service.market import Market
14+
from service.ammo import Ammo
1415

1516

1617
pyfalog = Logger(__name__)
@@ -91,7 +92,19 @@ def selectionMade(self, context):
9192
if sel.IsOk():
9293
# Get data field of the selected item (which is a marketGroup ID if anything was selected)
9394
seldata = self.marketView.GetItemData(sel)
94-
if seldata is not None and seldata != RECENTLY_USED_MODULES:
95+
if seldata == RECENTLY_USED_MODULES:
96+
items = self.sMkt.getRecentlyUsed()
97+
elif seldata == CHARGES_FOR_FIT:
98+
fitId = self.mainFrame.getActiveFit()
99+
items = set()
100+
if fitId is not None:
101+
fit = self.sFit.getFit(fitId)
102+
items = set()
103+
for mod in fit.modules:
104+
charges = Ammo.getInstance().getModuleFlatAmmo(mod)
105+
for charge in charges:
106+
items.add(charge)
107+
elif seldata is not None:
95108
# If market group treeview item doesn't have children (other market groups or dummies),
96109
# then it should have items in it and we want to request them
97110
if self.marketView.ItemHasChildren(sel) is False:
@@ -103,11 +116,7 @@ def selectionMade(self, context):
103116
else:
104117
items = set()
105118
else:
106-
# If method was called but selection wasn't actually made or we have a hit on recently used modules
107-
if seldata == RECENTLY_USED_MODULES:
108-
items = self.sMkt.getRecentlyUsed()
109-
else:
110-
items = set()
119+
items = set()
111120

112121
# Fill store
113122
self.updateItemStore(items)

gui/builtinMarketBrowser/marketTree.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import wx
22

33
from gui.cachingImageList import CachingImageList
4-
from gui.builtinMarketBrowser.events import RECENTLY_USED_MODULES
4+
from gui.builtinMarketBrowser.events import RECENTLY_USED_MODULES, CHARGES_FOR_FIT
55

66
from logbook import Logger
77

@@ -35,6 +35,7 @@ def __init__(self, parent, marketBrowser):
3535
# Add recently used modules node
3636
rumIconId = self.addImage("market_small", "gui")
3737
self.AppendItem(self.root, _t("Recently Used Items"), rumIconId, data=RECENTLY_USED_MODULES)
38+
self.AppendItem(self.root, "Charges For Active Fit", rumIconId, data=CHARGES_FOR_FIT)
3839

3940
# Bind our lookup method to when the tree gets expanded
4041
self.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.expandLookup)

0 commit comments

Comments
 (0)