From 99f14746e4fbc778db8137695cd8082d934df2c6 Mon Sep 17 00:00:00 2001 From: WatchMeCalculate Date: Tue, 19 Jun 2018 00:16:32 -0700 Subject: [PATCH] Removed return and re-added apiUpdateCharSheet function --- eos/saveddata/character.py | 6 ++++++ service/character.py | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index 9316b32f7..7fc112d71 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -125,6 +125,12 @@ class Character(object): return all0 + def apiUpdateCharSheet(self, skills, secStatus=0.00): + self.clearSkills() + for skillRow in skills: + self.addSkill(Skill(self, skillRow["typeID"], skillRow["level"])) + self.secStatus = float(secStatus) + def clearSkills(self): del self.__skills[:] self.__skillIdMap.clear() diff --git a/service/character.py b/service/character.py index f5e771872..2ff03de67 100644 --- a/service/character.py +++ b/service/character.py @@ -51,9 +51,6 @@ class CharacterImportThread(threading.Thread): self.callback = callback def run(self): - wx.CallAfter(self.callback) - # todo: Fix character import (don't need CCP SML anymore, only support evemon?) - return paths = self.paths sCharacter = Character.getInstance() all5_character = es_Character("All 5", 5)