Add turret slots used display to full stats pane and update eos version

This commit is contained in:
cncfanatics
2010-08-27 15:55:24 +02:00
parent 5cd0b01e5e
commit 6790c6bf66
3 changed files with 13 additions and 6 deletions

2
eos

Submodule eos updated: 193c9473b0...affdc06d48

View File

@@ -121,3 +121,4 @@ class FittingView(wx.ListCtrl):
self.SetColumnWidth(i, 40)
self.SortItems(lambda id1, id2: cmp(slotOrder.index(modSlotMap[id1]), slotOrder.index(modSlotMap[id2])))
event.Skip()

View File

@@ -19,11 +19,10 @@
import wx
from gui import bitmapLoader
import gui.shipBrowser as sb
import gui.fittingView as fv
import gui.mainFrame
import controller
from eos.types import Slot, Hardpoint
class StatsPane(wx.Panel):
def collapseChanged(self, event):
collapsed = event.Collapsed
@@ -36,16 +35,23 @@ class StatsPane(wx.Panel):
self.fullPanel.Show(not collapsed)
self.miniPanel.Show(collapsed)
gui.mainFrame.MainFrame.getInstance().statsSizer.Layout()
self.mainFrame.statsSizer.Layout()
def fitChanged(self, event):
cFit = controller.Fit.getInstance()
fit = cFit.getFit(event.fitID)
pass
turretHPUsed = fit.getHardpointsUsed(Hardpoint.TURRET)
self.labelFullAvailableTurretHardpoints.SetLabel(str(turretHPUsed))
event.Skip()
def __init__(self, parent):
wx.Panel.__init__(self, parent)
self.mainFrame = gui.mainFrame.MainFrame.getInstance()
# Register events
self.mainFrame.Bind(fv.FIT_CHANGED, self.fitChanged)
self.pickerSizer = wx.BoxSizer(wx.VERTICAL)
self.SetSizer(self.pickerSizer)
@@ -119,7 +125,7 @@ class StatsPane(wx.Panel):
suffix = "Points" if type == "calibration" else "Hardpoints"
lbl = wx.StaticText(parent, wx.ID_ANY, "0")
setattr(self, "label%sAvailable%s%s" % (panel, type.capitalize(), suffix), lbl)
setattr(self, "label%sAvailable%s%s" % (panel.capitalize(), type.capitalize(), suffix.capitalize()), lbl)
box.Add(lbl, 0, wx.ALIGN_LEFT)
box.Add(wx.StaticText(parent, wx.ID_ANY, "/"), 0, wx.ALIGN_LEFT)