Start an early implant implementation
This commit is contained in:
2
eos
2
eos
Submodule eos updated: 6974c56c9a...598ecb4f26
@@ -32,6 +32,16 @@ class StuffName(ViewColumn):
|
|||||||
return stuff.item.name
|
return stuff.item.name
|
||||||
|
|
||||||
def getImageId(self, mod):
|
def getImageId(self, mod):
|
||||||
return -1
|
iconFile = mod.item.icon.iconFile if mod.item.icon else ""
|
||||||
|
if iconFile:
|
||||||
|
bitmap = bitmapLoader.getBitmap(iconFile, "pack")
|
||||||
|
if bitmap is None:
|
||||||
|
iconId = -1
|
||||||
|
else:
|
||||||
|
iconId = self.fittingView.imageList.Add(bitmap)
|
||||||
|
else:
|
||||||
|
iconId = -1
|
||||||
|
|
||||||
|
return iconId
|
||||||
|
|
||||||
builtinViewColumns.registerColumn(StuffName)
|
builtinViewColumns.registerColumn(StuffName)
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ class DroneView(d.Display):
|
|||||||
stuff = fit.drones if fit is not None else None
|
stuff = fit.drones if fit is not None else None
|
||||||
self.populate(stuff)
|
self.populate(stuff)
|
||||||
self.refresh(stuff)
|
self.refresh(stuff)
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
def addItem(self, event):
|
def addItem(self, event):
|
||||||
cFit = service.Fit.getInstance()
|
cFit = service.Fit.getInstance()
|
||||||
|
|||||||
@@ -18,8 +18,43 @@
|
|||||||
#===============================================================================
|
#===============================================================================
|
||||||
|
|
||||||
import wx
|
import wx
|
||||||
|
import service
|
||||||
|
from gui.builtinViewColumns import display as d
|
||||||
|
import gui.fittingView as fv
|
||||||
|
import gui.marketBrowser as mb
|
||||||
|
|
||||||
|
class ImplantView(d.Display):
|
||||||
|
DEFAULT_COLS = ["Name",
|
||||||
|
"attr:implantness"]
|
||||||
|
|
||||||
class ImplantView(wx.Panel):
|
|
||||||
def __init__(self, parent):
|
def __init__(self, parent):
|
||||||
wx.Panel.__init__(self, parent)
|
d.Display.__init__(self, parent)
|
||||||
self.SetBackgroundColour('red')
|
self.mainFrame.Bind(fv.FIT_CHANGED, self.fitChanged)
|
||||||
|
self.mainFrame.Bind(mb.ITEM_SELECTED, self.addItem)
|
||||||
|
self.Bind(wx.EVT_LEFT_DCLICK, self.removeItem)
|
||||||
|
|
||||||
|
def fitChanged(self, event):
|
||||||
|
cFit = service.Fit.getInstance()
|
||||||
|
fit = cFit.getFit(event.fitID)
|
||||||
|
|
||||||
|
stuff = fit.implants if fit is not None else None
|
||||||
|
self.populate(stuff)
|
||||||
|
self.refresh(stuff)
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
|
def addItem(self, event):
|
||||||
|
cFit = service.Fit.getInstance()
|
||||||
|
fitID = self.mainFrame.getActiveFit()
|
||||||
|
trigger = cFit.addImplant(fitID, event.itemID)
|
||||||
|
if trigger:
|
||||||
|
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
|
||||||
|
|
||||||
|
event.Skip()
|
||||||
|
|
||||||
|
def removeItem(self, event):
|
||||||
|
row, _ = self.HitTest(event.Position)
|
||||||
|
if row != -1:
|
||||||
|
fitID = self.mainFrame.getActiveFit()
|
||||||
|
cFit = service.Fit.getInstance()
|
||||||
|
cFit.removeImplant(fitID, self.GetItemData(row))
|
||||||
|
wx.PostEvent(self.mainFrame, fv.FitChanged(fitID=fitID))
|
||||||
@@ -72,10 +72,42 @@ class Fit(object):
|
|||||||
eos.db.commit()
|
eos.db.commit()
|
||||||
return fit
|
return fit
|
||||||
|
|
||||||
|
def addImplant(self, fitID, itemID):
|
||||||
|
if fitID is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
fit = eos.db.getFit(fitID)
|
||||||
|
item = eos.db.getItem(itemID, eager=("attributes", "group.category"))
|
||||||
|
try:
|
||||||
|
implant = eos.types.Implant(item)
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
|
||||||
|
fit.implants.freeSlot(implant)
|
||||||
|
fit.implants.append(implant)
|
||||||
|
fit.clear()
|
||||||
|
fit.calculateModifiedAttributes()
|
||||||
|
return True
|
||||||
|
|
||||||
|
def removeImplant(self, fitID, position):
|
||||||
|
if fitID is None:
|
||||||
|
return False
|
||||||
|
|
||||||
|
fit = eos.db.getFit(fitID)
|
||||||
|
implant = fit.implants[position]
|
||||||
|
fit.implants.remove(implant)
|
||||||
|
fit.clear()
|
||||||
|
fit.calculateModifiedAttributes()
|
||||||
|
return True
|
||||||
|
|
||||||
def appendModule(self, fitID, itemID):
|
def appendModule(self, fitID, itemID):
|
||||||
fit = eos.db.getFit(fitID)
|
fit = eos.db.getFit(fitID)
|
||||||
item = eos.db.getItem(itemID, eager=("attributes", "group.category"))
|
item = eos.db.getItem(itemID, eager=("attributes", "group.category"))
|
||||||
m = eos.types.Module(item)
|
try:
|
||||||
|
m = eos.types.Module(item)
|
||||||
|
except ValueError:
|
||||||
|
return False
|
||||||
|
|
||||||
if m.fits(fit):
|
if m.fits(fit):
|
||||||
numSlots = len(fit.modules)
|
numSlots = len(fit.modules)
|
||||||
fit.modules.append(m)
|
fit.modules.append(m)
|
||||||
|
|||||||
Reference in New Issue
Block a user