From 07099f405717a685ec448b32941aa215b1074e70 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 23 Feb 2018 01:15:57 -0500 Subject: [PATCH 1/7] Fix working on missing skills context menu (#1412) (cherry picked from commit 96c13c344a7412d8836a6252f87ca6a417f1954a) --- gui/characterSelection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/characterSelection.py b/gui/characterSelection.py index c23ce33d8..6fc901f1c 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -97,7 +97,7 @@ class CharacterSelection(wx.Panel): grantItem = menu.Append(wx.ID_ANY, "Grant Missing Skills") self.Bind(wx.EVT_MENU, self.grantMissingSkills, grantItem) - exportItem = menu.Append(wx.ID_ANY, "Export Missing Skills") + exportItem = menu.Append(wx.ID_ANY, "Copy Missing Skills") self.Bind(wx.EVT_MENU, self.exportSkills, exportItem) self.PopupMenu(menu, pos) From 9e1b7dbb8776bf0298f659f64784c0be831ce1be Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 27 Feb 2018 00:44:42 -0500 Subject: [PATCH 2/7] Add ability to drag a module from fitting window to projected pane --- gui/builtinAdditionPanes/projectedView.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py index 88de48411..457f7ed98 100644 --- a/gui/builtinAdditionPanes/projectedView.py +++ b/gui/builtinAdditionPanes/projectedView.py @@ -99,14 +99,22 @@ class ProjectedView(d.Display): data[0] is hard-coded str of originating source data[1] is typeID or index of data we want to manipulate """ + sFit = Fit.getInstance() + fit = sFit.getFit(self.mainFrame.getActiveFit()) if data[0] == "projected": # if source is coming from projected, we are trying to combine drones. self.mergeDrones(x, y, int(data[1])) + elif data[0] == "fitting": + dstRow, _ = self.HitTest((x, y)) + # Gather module information to get position + module = fit.modules[int(data[1])] + sFit.project(fit.ID, module.item.ID) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) elif data[0] == "market": sFit = Fit.getInstance() fitID = self.mainFrame.getActiveFit() - sFit.project(fitID, int(data[1])) + sFit.project(fit.ID, int(data[1])) wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) def kbEvent(self, event): From a804f9a1ad30160f4970b910e271638908f3ef3b Mon Sep 17 00:00:00 2001 From: blitzmann Date: Fri, 23 Feb 2018 01:15:57 -0500 Subject: [PATCH 3/7] Fix working on missing skills context menu (#1412) (cherry picked from commit 96c13c344a7412d8836a6252f87ca6a417f1954a) --- gui/characterSelection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/characterSelection.py b/gui/characterSelection.py index c23ce33d8..6fc901f1c 100644 --- a/gui/characterSelection.py +++ b/gui/characterSelection.py @@ -97,7 +97,7 @@ class CharacterSelection(wx.Panel): grantItem = menu.Append(wx.ID_ANY, "Grant Missing Skills") self.Bind(wx.EVT_MENU, self.grantMissingSkills, grantItem) - exportItem = menu.Append(wx.ID_ANY, "Export Missing Skills") + exportItem = menu.Append(wx.ID_ANY, "Copy Missing Skills") self.Bind(wx.EVT_MENU, self.exportSkills, exportItem) self.PopupMenu(menu, pos) From 6e73b9fefdde55e47b023dfd569520d8066e48e7 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 27 Feb 2018 00:52:15 -0500 Subject: [PATCH 4/7] Tox --- gui/builtinAdditionPanes/projectedView.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gui/builtinAdditionPanes/projectedView.py b/gui/builtinAdditionPanes/projectedView.py index 457f7ed98..93350e7f7 100644 --- a/gui/builtinAdditionPanes/projectedView.py +++ b/gui/builtinAdditionPanes/projectedView.py @@ -110,12 +110,11 @@ class ProjectedView(d.Display): # Gather module information to get position module = fit.modules[int(data[1])] sFit.project(fit.ID, module.item.ID) - wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fit.ID)) elif data[0] == "market": sFit = Fit.getInstance() - fitID = self.mainFrame.getActiveFit() sFit.project(fit.ID, int(data[1])) - wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=self.mainFrame.getActiveFit())) + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fit.ID)) def kbEvent(self, event): keycode = event.GetKeyCode() From 7ab3ad9e08b2466c3ba392b9b1b79e986afe9306 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 28 Feb 2018 23:37:58 -0500 Subject: [PATCH 5/7] Don't delete and recreate skills when updating char sheet. Instead, get each individual skill and change level. (cherry picked from commit 55c79c1bafaa9a1b159b73a72c6480f7e8d6cb6b) --- eos/saveddata/character.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index 4a4d3e7f8..05a585120 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -120,10 +120,10 @@ class Character(object): return all0 def apiUpdateCharSheet(self, skills, secStatus=0): - del self.__skills[:] - self.__skillIdMap.clear() for skillRow in skills: - self.addSkill(Skill(self, skillRow["typeID"], skillRow["level"])) + skill = self.getSkill(int(skillRow["typeID"])) + skill.setLevel(int(skillRow["level"], persist=True, ignoreRestrict=True)) + self.secStatus = secStatus @property From f773e0a935f2ddecb29f9529bb0e72459d3f07a7 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 28 Feb 2018 23:49:42 -0500 Subject: [PATCH 6/7] fix misplaced parentheses (cherry picked from commit 2a60216a92d39bb200c26bce8573484f54a80dc5) --- eos/saveddata/character.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eos/saveddata/character.py b/eos/saveddata/character.py index 05a585120..1f911f57f 100644 --- a/eos/saveddata/character.py +++ b/eos/saveddata/character.py @@ -122,7 +122,7 @@ class Character(object): def apiUpdateCharSheet(self, skills, secStatus=0): for skillRow in skills: skill = self.getSkill(int(skillRow["typeID"])) - skill.setLevel(int(skillRow["level"], persist=True, ignoreRestrict=True)) + skill.setLevel(int(skillRow["level"]), persist=True, ignoreRestrict=True) self.secStatus = secStatus From ae6434affb373838e7b074d3c128f324e919c289 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Thu, 1 Mar 2018 00:30:08 -0500 Subject: [PATCH 7/7] Fix issue with importing EVE API XML --- service/character.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/character.py b/service/character.py index 127e233bb..7001c8e8b 100644 --- a/service/character.py +++ b/service/character.py @@ -66,7 +66,7 @@ class CharacterImportThread(threading.Thread): with open(path, mode='r') as charFile: sheet = ParseXML(charFile) char = sCharacter.new(sheet.name + " (imported)") - sCharacter.apiUpdateCharSheet(char.ID, sheet.skills) + sCharacter.apiUpdateCharSheet(char.ID, sheet.skills, 0) except: # if it's not api XML data, try this # this is a horrible logic flow, but whatever