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

Remove drone splitting / merging, and introduce drone change qty

Browse Source
This commit is contained in:
blitzmann
2018-08-18 00:39:05 -04:00
parent a37fdf48c8
commit fd83a4b709
9 changed files with 91 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gui/builtinAdditionPanes/droneView.py
View File

@@ -144,10 +144,12 @@ class DroneView(Display):
data[1] is typeID or index of data we want to manipulate
"""
if data[0] == "drone": # we want to merge drones
srcRow = int(data[1])
dstRow, _ = self.HitTest((x, y))
if srcRow != -1 and dstRow != -1:
self._merge(srcRow, dstRow)
pass
# remove merge functionality, if people complain in the next while, can add it back
# srcRow = int(data[1])
# dstRow, _ = self.HitTest((x, y))
# if srcRow != -1 and dstRow != -1:
# self._merge(srcRow, dstRow)
elif data[0] == "market":
wx.PostEvent(self.mainFrame, ItemSelected(itemID=int(data[1])))

4
gui/builtinAdditionPanes/projectedView.py
View File

@@ -106,7 +106,9 @@ class ProjectedView(d.Display):
if data[0] == "projected":
# if source is coming from projected, we are trying to combine drones.
self.mergeDrones(x, y, int(data[1]))
pass
# removing merge functionality - if people complain about it, can add it back as a command
# self.mergeDrones(x, y, int(data[1]))
elif data[0] == "fitting":
dstRow, _ = self.HitTest((x, y))
# Gather module information to get position