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

Re-ordered some modules in the miscellaneous pane.

Browse Source 
Added support for warp speed, should it become implemented in eos. Currently commented out.
This commit is contained in:
Corollax
2010-10-27 03:56:29 -05:00
parent cf27b102b4
commit d2ffe9deb0
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gui/builtinStatsViews/targetingmiscViewFull.py
View File

@@ -67,9 +67,6 @@ class TargetingMiscViewFull(StatsView):
setattr(self, "label%s" % labelShort, lbl) setattr(self, "label%s" % labelShort, lbl)
box.Add(lbl, 0, wx.ALIGN_LEFT) box.Add(lbl, 0, wx.ALIGN_LEFT)
# lblUnit = wx.StaticText(contentPanel, wx.ID_ANY, " %s" % unit)
# setattr(self, "labelUnit%s" % labelShort, lblUnit)
# box.Add(lblUnit, 0, wx.ALIGN_LEFT)
self._cachedValues.append(0) self._cachedValues.append(0)
# Misc # Misc
@@ -80,8 +77,9 @@ class TargetingMiscViewFull(StatsView):
labels = (("Speed", "Speed", "m/s"), labels = (("Speed", "Speed", "m/s"),
("Align time", "AlignTime", "s"), ("Align time", "AlignTime", "s"),
("Cargo", "Cargo", u"m\u00B3"), ("Signature", "SigRadius", "m"),
("Signature", "SigRadius", "m")) #("Warp Speed", "WarpSpeed", "au/s"),
("Cargo", "Cargo", u"m\u00B3"))
for header, labelShort, unit in labels: for header, labelShort, unit in labels:
gridMisc.Add(wx.StaticText(contentPanel, wx.ID_ANY, "%s: " % header), 0, wx.ALIGN_LEFT) gridMisc.Add(wx.StaticText(contentPanel, wx.ID_ANY, "%s: " % header), 0, wx.ALIGN_LEFT)
@@ -93,9 +91,6 @@ class TargetingMiscViewFull(StatsView):
setattr(self, "labelFull%s" % labelShort, lbl) setattr(self, "labelFull%s" % labelShort, lbl)
box.Add(lbl, 0, wx.ALIGN_LEFT) box.Add(lbl, 0, wx.ALIGN_LEFT)
# lblUnit = wx.StaticText(contentPanel, wx.ID_ANY, " %s" % unit)
# setattr(self, "labelFullUnit%s" % labelShort, lblUnit)
# box.Add(lblUnit, 0, wx.ALIGN_LEFT)
self._cachedValues.append(0) self._cachedValues.append(0)
@@ -109,8 +104,9 @@ class TargetingMiscViewFull(StatsView):
("labelCtrlRange", lambda: fit.extraAttributes["droneControlRange"] / 1000, 3, 0, 0, "km"), ("labelCtrlRange", lambda: fit.extraAttributes["droneControlRange"] / 1000, 3, 0, 0, "km"),
("labelFullSpeed", lambda: fit.ship.getModifiedItemAttr("maxVelocity"), 3, 0, 0, "m/s"), ("labelFullSpeed", lambda: fit.ship.getModifiedItemAttr("maxVelocity"), 3, 0, 0, "m/s"),
("labelFullAlignTime", lambda: fit.alignTime, 3, 0, 0, "s"), ("labelFullAlignTime", lambda: fit.alignTime, 3, 0, 0, "s"),
("labelFullCargo", lambda: fit.extraAttributes["capacity"], 3, 0, 9, u"m\u00B3"), ("labelFullSigRadius", lambda: fit.ship.getModifiedItemAttr("signatureRadius"), 3, 0, 9, ""),
("labelFullSigRadius", lambda: fit.ship.getModifiedItemAttr("signatureRadius"), 3, 0, 9, "")) #("labelFullWarpSpeed", lambda: fit.warpSpeed, 3, 0, 0, "au/s"),
("labelFullCargo", lambda: fit.extraAttributes["capacity"], 3, 0, 9, u"m\u00B3"))
counter = 0 counter = 0
for labelName, value, prec, lowest, highest, unit in stats: for labelName, value, prec, lowest, highest, unit in stats:
label = getattr(self, labelName) label = getattr(self, labelName)