From 6790c6bf66f23af7bb3183122a56f8173cbce246 Mon Sep 17 00:00:00 2001 From: cncfanatics Date: Fri, 27 Aug 2010 15:55:24 +0200 Subject: [PATCH] Add turret slots used display to full stats pane and update eos version --- eos | 2 +- gui/fittingView.py | 1 + gui/statsPane.py | 16 +++++++++++----- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/eos b/eos index 193c9473b..affdc06d4 160000 --- a/eos +++ b/eos @@ -1 +1 @@ -Subproject commit 193c9473b09f6400585ffbdc1e3d3bb4489ad501 +Subproject commit affdc06d48b35859a400224e53f4ec021284aa76 diff --git a/gui/fittingView.py b/gui/fittingView.py index 13372e4af..4d842ecc5 100644 --- a/gui/fittingView.py +++ b/gui/fittingView.py @@ -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() diff --git a/gui/statsPane.py b/gui/statsPane.py index ea0bc4682..4beb3cbbb 100644 --- a/gui/statsPane.py +++ b/gui/statsPane.py @@ -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)