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

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
cncfanatics
2010-09-03 14:46:49 +02:00
parent 5ed4f0ba4b f333454e38
commit c0bfb0ad8d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/pygauge.py
View File

@@ -61,7 +61,9 @@ class PyGauge(wx.PyWindow):
self._overdriveTimerStarted=False
self.SetBarGradient((wx.Colour(153,153,153),wx.Colour(204,204,204)))
self.SetBackgroundColour(wx.Colour(102,102,102))
self._tooltip = wx.ToolTip("")
self.SetToolTip(self._tooltip)
self._tooltip.SetTip("0/100")
self.Bind(wx.EVT_PAINT, self.OnPaint)
self.Bind(wx.EVT_ERASE_BACKGROUND, self.OnEraseBackground)
@@ -264,7 +266,7 @@ class PyGauge(wx.PyWindow):
if self._overdrive > self._range:
value = self._overdrive
self._tooltip.SetTip("%.2f/%.2f" % (value, self._range))
if self._skipDigits == True:
dc.DrawLabel("%d%%" % (value*100/self._range), rect, wx.ALIGN_CENTER)
else:

8
gui/statsPane.py
View File

@@ -89,15 +89,17 @@ class StatsPane(wx.Panel):
value = value if value is not None else 0
if isinstance(value, basestring):
label.SetLabel(value)
label.SetToolTip(wx.ToolTip(value))
else:
label.SetLabel(shorten(value, rounding))
label.SetToolTip(wx.ToolTip("%.1f" % value))
for labelName, value, rounding in stats:
label = getattr(self, labelName)
value = value() if fit is not None else 0
value = value if value is not None else 0
label.SetLabel(shorten(value, rounding))
label.SetToolTip(wx.ToolTip("%.1f" % value))
# cap stuff
capState = fit.capState if fit is not None else 0
capStable = fit.capStable if fit is not None else False
@@ -169,10 +171,12 @@ class StatsPane(wx.Panel):
if ehp is not None:
total += ehp[tankType]
lbl.SetLabel(shorten(ehp[tankType], 2))
lbl.SetToolTip(wx.ToolTip("%s: %d" % (tankType.capitalize(), ehp[tankType])))
else:
lbl.SetLabel("0")
self.labelEhp.SetLabel(shorten(total, 2))
self.labelEhp.SetToolTip(wx.ToolTip("Effective: %d" % total))
damagePattern = fit.damagePattern if fit is not None else None
for damageType in ("em", "thermal", "kinetic", "explosive"):
@@ -313,7 +317,7 @@ class StatsPane(wx.Panel):
box = wx.BoxSizer(wx.HORIZONTAL)
sizer.Add(bitmap, 0, wx.ALIGN_CENTER)
sizer.Add(box, 0, wx.ALIGN_CENTER)
sizer.Add(box, 0, wx.ALIGN_CENTER_VERTICAL)
suffix = "Points" if type == "calibration" else "Hardpoints"
lbl = wx.StaticText(parent, wx.ID_ANY, "0")