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

Merge branch 'master' of evefit.org:pyfa

Browse Source
This commit is contained in:
cncfanatics
2010-09-04 11:15:00 +02:00
parent c938e38e03 893c48812f
commit 6231fcc274
4 changed files with 75 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gui/builtinViewColumns/attributeDisplay.py
View File

@@ -54,7 +54,7 @@ class AttributeDisplay(ViewColumn):
def getText(self, mod):
attr = mod.getModifiedItemAttr(self.info.name)
if attr:
return shorten(attr, 2)
return shorten(attr, 3, 0, 0)
else:
return ""

4
gui/builtinViewColumns/maxRange.py
View File

@@ -55,10 +55,10 @@ class MaxRange(ViewColumn):
if falloff is None:
falloff = ""
else:
falloff = "+%sm" % shorten(falloff, 1)
falloff = "+%sm" % shorten(falloff, 3, 0, 3)
if maxRange:
return "%sm" % shorten(maxRange, 1) + falloff
return "%sm" % shorten(maxRange, 3, 0, 3) + falloff
else:
return "" + falloff

80
gui/statsPane.py
View File

@@ -50,40 +50,40 @@ class StatsPane(wx.Panel):
def fitChanged(self, event):
cFit = controller.Fit.getInstance()
fit = cFit.getFit(event.fitID)
statsMiniFull = (("label%sUsedTurretHardpoints", lambda: fit.getHardpointsUsed(Hardpoint.TURRET), 0),
("label%sTotalTurretHardpoints", lambda: fit.ship.getModifiedItemAttr('turretSlotsLeft'), 0),
("label%sUsedLauncherHardpoints", lambda: fit.getHardpointsUsed(Hardpoint.MISSILE), 0),
("label%sTotalLauncherHardpoints", lambda: fit.ship.getModifiedItemAttr('launcherSlotsLeft'), 0),
("label%sUsedCalibrationPoints", lambda: fit.calibrationUsed, 0),
("label%sTotalCalibrationPoints", lambda: fit.ship.getModifiedItemAttr('upgradeCapacity'), 0),
("label%sUsedPg", lambda: fit.pgUsed, 1),
("label%sUsedCpu", lambda: fit.cpuUsed, 1),
("label%sTotalPg", lambda: fit.ship.getModifiedItemAttr("powerOutput"), 1),
("label%sTotalCpu", lambda: fit.ship.getModifiedItemAttr("cpuOutput"), 1),
("label%sVolleyTotal", lambda: fit.weaponVolley, 1),
("label%sDpsTotal", lambda: fit.totalDPS, 1),
("label%sCapacitorCapacity", lambda: fit.ship.getModifiedItemAttr("capacitorCapacity"), 1),
("label%sCapacitorRecharge", lambda: fit.capRecharge, 1),
("label%sCapacitorDischarge", lambda: fit.capUsed, 1),
("label%sSpeed", lambda: fit.ship.getModifiedItemAttr("maxVelocity"), 1),
("label%sAlignTime", lambda: fit.alignTime, 1))
statsMiniFull = (("label%sUsedTurretHardpoints", lambda: fit.getHardpointsUsed(Hardpoint.TURRET), 0, 0, 0),
("label%sTotalTurretHardpoints", lambda: fit.ship.getModifiedItemAttr('turretSlotsLeft'), 0, 0, 0),
("label%sUsedLauncherHardpoints", lambda: fit.getHardpointsUsed(Hardpoint.MISSILE), 0, 0, 0),
("label%sTotalLauncherHardpoints", lambda: fit.ship.getModifiedItemAttr('launcherSlotsLeft'), 0, 0, 0),
("label%sUsedCalibrationPoints", lambda: fit.calibrationUsed, 0, 0, 0),
("label%sTotalCalibrationPoints", lambda: fit.ship.getModifiedItemAttr('upgradeCapacity'), 0, 0, 0),
("label%sUsedPg", lambda: fit.pgUsed, 4, 0, 9),
("label%sUsedCpu", lambda: fit.cpuUsed, 4, 0, 9),
("label%sTotalPg", lambda: fit.ship.getModifiedItemAttr("powerOutput"), 4, 0, 9),
("label%sTotalCpu", lambda: fit.ship.getModifiedItemAttr("cpuOutput"), 4, 0, 9),
("label%sVolleyTotal", lambda: fit.weaponVolley, 3, 0, 9),
("label%sDpsTotal", lambda: fit.totalDPS, 3, 0, 9),
("label%sCapacitorCapacity", lambda: fit.ship.getModifiedItemAttr("capacitorCapacity"), 3, 0, 9),
("label%sCapacitorRecharge", lambda: fit.capRecharge, 3, 0, 0),
("label%sCapacitorDischarge", lambda: fit.capUsed, 3, 0, 0),
("label%sSpeed", lambda: fit.ship.getModifiedItemAttr("maxVelocity"), 3, 0, 0),
("label%sAlignTime", lambda: fit.alignTime, 3, 0, 0))
stats = (("labelFullUsedDroneBay", lambda: fit.droneBayUsed, 0),
("labelFullUsedDroneBandwidth", lambda: fit.droneBandwidthUsed, 0),
("labelFullTotalDroneBay", lambda: fit.ship.getModifiedItemAttr("droneCapacity"), 0),
("labelFullTotalDroneBandwidth", lambda: fit.ship.getModifiedItemAttr("droneBandwidth"), 0),
("labelFullDpsWeapon", lambda: fit.weaponDPS, 1),
("labelFullDpsDrone", lambda: fit.droneDPS, 1),
("labelTankSustainedShieldPassive", lambda: fit.calculateShieldRecharge(), 1),
("labelTargets", lambda: fit.maxTargets, 0),
("labelRange", lambda: fit.ship.getModifiedItemAttr('maxTargetRange') / 1000, 1),
("labelScanRes", lambda: fit.ship.getModifiedItemAttr('scanResolution'), 0),
("labelSensorStr", lambda: fit.scanStrength, 0),
("labelFullCargo", lambda: fit.extraAttributes["capacity"], 1),
("labelFullSigRadius", lambda: fit.ship.getModifiedItemAttr("signatureRadius"), 0))
stats = (("labelFullUsedDroneBay", lambda: fit.droneBayUsed, 3, 0, 9),
("labelFullUsedDroneBandwidth", lambda: fit.droneBandwidthUsed, 3, 0, 9),
("labelFullTotalDroneBay", lambda: fit.ship.getModifiedItemAttr("droneCapacity"), 3, 0, 9),
("labelFullTotalDroneBandwidth", lambda: fit.ship.getModifiedItemAttr("droneBandwidth"), 3, 0, 9),
("labelFullDpsWeapon", lambda: fit.weaponDPS, 3, 0, 9),
("labelFullDpsDrone", lambda: fit.droneDPS, 3, 0, 9),
("labelTankSustainedShieldPassive", lambda: fit.calculateShieldRecharge(), 3, 0, 9),
("labelTargets", lambda: fit.maxTargets, 3, 0, 0),
("labelRange", lambda: fit.ship.getModifiedItemAttr('maxTargetRange') / 1000, 3, 0, 0),
("labelScanRes", lambda: fit.ship.getModifiedItemAttr('scanResolution'), 3, 0, 0),
("labelSensorStr", lambda: fit.scanStrength, 3, 0, 0),
("labelFullCargo", lambda: fit.extraAttributes["capacity"], 3, 0, 9),
("labelFullSigRadius", lambda: fit.ship.getModifiedItemAttr("signatureRadius"), 3, 0, 9))
for panel in ("Mini", "Full"):
for labelName, value, rounding in statsMiniFull:
for labelName, value, prec, lowest, highest in statsMiniFull:
label = getattr(self, labelName % panel)
value = value() if fit is not None else 0
value = value if value is not None else 0
@@ -91,14 +91,14 @@ class StatsPane(wx.Panel):
label.SetLabel(value)
label.SetToolTip(wx.ToolTip(value))
else:
label.SetLabel(shorten(value, rounding))
label.SetLabel(shorten(value, prec, lowest, highest))
label.SetToolTip(wx.ToolTip("%.1f" % value))
for labelName, value, rounding in stats:
for labelName, value, prec, lowest, highest 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.SetLabel(shorten(value, prec, lowest, highest))
label.SetToolTip(wx.ToolTip("%.1f" % value))
# cap stuff
capState = fit.capState if fit is not None else 0
@@ -170,12 +170,12 @@ class StatsPane(wx.Panel):
lbl = getattr(self, "labelResistance%sEhp" % tankType.capitalize())
if ehp is not None:
total += ehp[tankType]
lbl.SetLabel(shorten(ehp[tankType], 2))
lbl.SetLabel(shorten(ehp[tankType], 3, 0, 9))
lbl.SetToolTip(wx.ToolTip("%s: %d" % (tankType.capitalize(), ehp[tankType])))
else:
lbl.SetLabel("0")
self.labelEhp.SetLabel(shorten(total, 2))
self.labelEhp.SetLabel(shorten(total, 3, 0, 9))
self.labelEhp.SetToolTip(wx.ToolTip("Effective: %d" % total))
damagePattern = fit.damagePattern if fit is not None else None
@@ -215,13 +215,13 @@ class StatsPane(wx.Panel):
if maxType == "shieldPassive":
self.labelMiniTankReinforced.SetLabel("")
self.labelMiniTankSustained.SetLabel(shorten(maxAmount, 1))
self.labelMiniTankSustained.SetLabel(shorten(maxAmount, 3, 0, 9))
self.labelMiniTankUnitReinforced.SetLabel("")
bitmap = bitmapLoader.getBitmap("%s_big" % maxType, "icons")
else:
self.labelMiniTankReinforced.SetLabel(shorten(maxAmount, 1))
self.labelMiniTankReinforced.SetLabel(shorten(maxAmount, 3, 0, 9))
sustainable = fit.sustainableTank["%sRepair" % maxType]
self.labelMiniTankSustained.SetLabel(shorten(sustainable, 1))
self.labelMiniTankSustained.SetLabel(shorten(sustainable, 3, 0, 9))
self.labelMiniTankUnitReinforced.SetLabel(" HP/S")
bitmap = bitmapLoader.getBitmap("%sActive_big" % maxType, "icons")
@@ -369,7 +369,7 @@ class StatsPane(wx.Panel):
setattr(self, "label%sTotal%s" % (panel.capitalize(), capitalizedType), lbl)
absolute.Add(lbl, 0, wx.ALIGN_LEFT)
units = {"cpu":" tf", "pg":" GJ", "droneBandwidth":" mbit/s", "droneBay":u" m\u00B3"}
units = {"cpu":" tf", "pg":" MW", "droneBandwidth":" mbit/s", "droneBay":u" m\u00B3"}
lbl = wx.StaticText(parent, wx.ID_ANY, "%s" % units[type])
absolute.Add(lbl, 0, wx.ALIGN_LEFT)

40
util.py
View File

@@ -1,9 +1,33 @@
def shorten(val, digits):
if val > 10**8:
return ("%." + str(digits)+ "fG") % (val / float(10**9))
elif val > 10**6:
return ("%." + str(digits)+ "fM") % (val / float(10**6))
elif val > 10**3:
return ("%." + str(digits)+ "fk") % (val / float(10**3))
def shorten(val, prec=4, lowest=0, highest=0):
def process(val, prec):
# Check if we have no integer and some fraction after bunch of zeroes,
# counting these zeros in process
shiftFraction, integersNumber = 0, 0
if int(val) == 0 and val != 0:
while val < 0.1**(shiftFraction+1):
shiftFraction += 1
else:
while abs(val) >= 10**(integersNumber):
integersNumber +=1
# We want to show at least (prec) significant numbers in any cases
roundFactor = prec + shiftFraction - integersNumber
# But we don't want to round integers
if roundFactor < 0: roundFactor = 0
val = round(val, roundFactor)
# Strip trailing zero for integers and convert to string
result = str(val)[-2:] == '.0' and str(val)[:-2] or str(val)
return result
if abs(val) >= 1000 and highest >= 3:
suffixmap = {3 : "k", 6 : "M", 9 : "G"}
for key in sorted(suffixmap, reverse = True):
if val >= 10**key and key <= highest:
return u"{0}{1}".format(process(val/float(10**key), prec), suffixmap[key])
elif abs(val) < 1 and val != 0 and lowest <= -3:
suffixmap = {-6 : u'\u03bc', -3 : "m"}
for key in sorted(suffixmap, reverse = False):
if val < 10**(key+3) and key >= lowest:
return u"{0}{1}".format(process(val/float(10**key), prec), suffixmap[key])
else:
return ("%." + str(digits) + "f") % val
return u"{0}".format(process(val, prec))