From 9943f784a8d74a31c04d3669d7d190da869c4c15 Mon Sep 17 00:00:00 2001 From: Gochim <54093496+Gochim@users.noreply.github.com> Date: Wed, 30 Oct 2019 13:34:54 +0200 Subject: [PATCH] Fixed code auto-checks for pull request --- gui/copySelectDialog.py | 4 +--- service/port/shipstats.py | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gui/copySelectDialog.py b/gui/copySelectDialog.py index 18fbf4d9a..6ea13ead9 100644 --- a/gui/copySelectDialog.py +++ b/gui/copySelectDialog.py @@ -190,11 +190,9 @@ class CopySelectDialog(wx.Dialog): fit = getFit(self.mainFrame.getActiveFit()) EfsPort.exportEfs(fit, 0, callback) - """ - Puts fit stats in textual format into the clipboard - """ # noinspection PyUnusedLocal def exportFitStats(self, options, callback): + """ Puts fit stats in textual format into the clipboard """ fit = getFit(self.mainFrame.getActiveFit()) Port.exportFitStats(fit, callback) diff --git a/service/port/shipstats.py b/service/port/shipstats.py index ba71b0826..0ab42c30a 100644 --- a/service/port/shipstats.py +++ b/service/port/shipstats.py @@ -39,13 +39,13 @@ def tankSection(fit): ehpAgainstDamageTypeStr = [formatAmount(ehpVal, 3, 0, 9) for ehpVal in ehpAgainstDamageType] # not used for now. maybe will be improved later - def formattedOutput(): - return \ - " {:>7} {:>7} {:>7} {:>7} {:>7}\n".format("TOTAL", "EM", "THERM", "KIN", "EXP") + \ - "EHP {:>7} {:>7} {:>7} {:>7} {:>7}\n".format(ehpStr[3], *ehpAgainstDamageTypeStr) + \ - "Shield {:>7} {:>7.0%} {:>7.0%} {:>7.0%} {:>7.0%}\n".format(ehpStr[0], *resists["shield"]) + \ - "Armor {:>7} {:>7.0%} {:>7.0%} {:>7.0%} {:>7.0%}\n".format(ehpStr[1], *resists["armor"]) + \ - "Hull {:>7} {:>7.0%} {:>7.0%} {:>7.0%} {:>7.0%}\n".format(ehpStr[2], *resists["hull"]) + # def formattedOutput(): + # return \ + # " {:>7} {:>7} {:>7} {:>7} {:>7}\n".format("TOTAL", "EM", "THERM", "KIN", "EXP") + \ + # "EHP {:>7} {:>7} {:>7} {:>7} {:>7}\n".format(ehpStr[3], *ehpAgainstDamageTypeStr) + \ + # "Shield {:>7} {:>7.0%} {:>7.0%} {:>7.0%} {:>7.0%}\n".format(ehpStr[0], *resists["shield"]) + \ + # "Armor {:>7} {:>7.0%} {:>7.0%} {:>7.0%} {:>7.0%}\n".format(ehpStr[1], *resists["armor"]) + \ + # "Hull {:>7} {:>7.0%} {:>7.0%} {:>7.0%} {:>7.0%}\n".format(ehpStr[2], *resists["hull"]) def generalOutput(): return \