From df046769ffffaede7d2948687d4a8c7f4706cc76 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Tue, 27 May 2014 16:26:14 -0400 Subject: [PATCH] Add GUI support for changing affected skills --- gui/builtinContextMenus/__init__.py | 2 +- .../changeAffectingSkills.py | 100 ++++++++++++++++++ service/character.py | 12 +-- 3 files changed, 107 insertions(+), 7 deletions(-) create mode 100644 gui/builtinContextMenus/changeAffectingSkills.py diff --git a/gui/builtinContextMenus/__init__.py b/gui/builtinContextMenus/__init__.py index edec6a9fc..1dccad065 100644 --- a/gui/builtinContextMenus/__init__.py +++ b/gui/builtinContextMenus/__init__.py @@ -1,2 +1,2 @@ -__all__ = ["moduleAmmoPicker", "itemStats", "damagePattern", "marketJump", "droneSplit", "itemRemove", +__all__ = ["moduleAmmoPicker", "changeAffectingSkills", "itemStats", "damagePattern", "marketJump", "droneSplit", "itemRemove", "droneRemoveStack", "ammoPattern", "project", "factorReload", "whProjector", "cargo"] diff --git a/gui/builtinContextMenus/changeAffectingSkills.py b/gui/builtinContextMenus/changeAffectingSkills.py new file mode 100644 index 000000000..b0b9c9b96 --- /dev/null +++ b/gui/builtinContextMenus/changeAffectingSkills.py @@ -0,0 +1,100 @@ +# -*- coding: utf-8 -*- +from gui.contextMenu import ContextMenu +import gui.mainFrame +import service +import wx +from gui import bitmapLoader +from eos.types import Skill +import gui.globalEvents as GE + +class ChangeAffectingSkills(ContextMenu): + def __init__(self): + self.mainFrame = gui.mainFrame.MainFrame.getInstance() + self.sChar = service.Character.getInstance() + + self.sFit = service.Fit.getInstance() + fit = self.sFit.getFit(self.mainFrame.getActiveFit()) + + self.charID = fit.character.ID + + def display(self, srcContext, selection): + if self.mainFrame.getActiveFit() is None or srcContext not in ("fittingModule", "fittingShip"): + return False + + if self.sChar.getCharName(self.charID) in ("All 0", "All 5"): + return False + + if srcContext == "fittingShip": + fitID = self.mainFrame.getActiveFit() + sFit = service.Fit.getInstance() + self.stuff = sFit.getFit(fitID).ship + else: + self.stuff = selection[0] + + cont = self.stuff.itemModifiedAttributes + self.skills = [] + + for attrName in cont.iterAfflictions(): + if cont[attrName] == 0: + continue + + for fit, afflictors in cont.getAfflictions(attrName).iteritems(): + for afflictor, modifier, amount, used in afflictors: + # only add Skills + if not isinstance(afflictor, Skill): + continue + + self.skills.append(afflictor) + self.skills.sort(key=lambda x: x.item.name) + + return len(self.skills) > 0 + + def getText(self, itmContext, selection): + return "Change Affecting Skills" + + def activate(self, fullContext, selection, i): + pass + + def addSkill(self, rootMenu, skill, i): + if i < 0: + label = "Not Learned" + else: + label = "Level %s" % i + + id = wx.NewId() + self.skillIds[id] = (skill, i) + menuItem = wx.MenuItem(rootMenu, id, label) + rootMenu.Bind(wx.EVT_MENU, self.handleSkillChange, menuItem) + return menuItem + + def getSubMenu(self, context, selection, menu, i): + self.context = context + self.skillIds = {} + + m = wx.Menu() + + for skill in self.skills: + skillItem = wx.MenuItem(m, wx.NewId(), skill.item.name) + sub = wx.Menu() + skillItem.SetSubMenu(sub) + bitmap = bitmapLoader.getBitmap("level%s" % skill.level, "icons") + if bitmap is not None: + skillItem.SetBitmap(bitmap) + + for i in xrange(-1, 6): + levelItem = self.addSkill(menu, skill, i) + sub.AppendItem(levelItem) + m.AppendItem(skillItem) + + return m + + def handleSkillChange(self, event): + skill, level = self.skillIds[event.Id] + + self.sChar.changeLevel(self.charID, skill.item.ID, level) + fitID = self.mainFrame.getActiveFit() + self.sFit.changeChar(fitID, self.charID) + + wx.PostEvent(self.mainFrame, GE.FitChanged(fitID=fitID)) + +ChangeAffectingSkills.register() diff --git a/service/character.py b/service/character.py index 60633cbd4..7a8a6cbc6 100644 --- a/service/character.py +++ b/service/character.py @@ -72,7 +72,7 @@ class SkillBackupThread(threading.Thread): backupData = sCharacter.exportXml() else: backupData = sCharacter.exportText() - + if self.saveFmt == "emp": with gzip.open(path, mode='wb') as backupFile: backupFile.write(backupData) @@ -112,12 +112,12 @@ class Character(object): root = ElementTree.Element("plan") root.attrib["name"] = "Pyfa exported plan for "+self.skillReqsDict['charname'] root.attrib["revision"] = config.evemonMinVersion - + sorts = ElementTree.SubElement(root, "sorting") sorts.attrib["criteria"] = "None" sorts.attrib["order"] = "None" sorts.attrib["groupByPriority"] = "false" - + skillsSeen = set() for s in self.skillReqsDict['skills']: @@ -134,7 +134,7 @@ class Character(object): entry.attrib["type"] = "Prerequisite" notes = ElementTree.SubElement(entry, "notes") notes.text = entry.attrib["skill"] - + tree = ElementTree.ElementTree(root) data = ElementTree.tostring(root, 'utf-8') prettydata = minidom.parseString(data).toprettyxml(indent=" ") @@ -237,7 +237,7 @@ class Character(object): def apiEnabled(self, charID): id, key, default, _ = self.getApiDetails(charID) return id is not "" and key is not "" and default is not "" - + def charList(self, charID, userID, apiKey): char = eos.db.getCharacter(charID) try: @@ -263,7 +263,7 @@ class Character(object): def changeLevel(self, charID, skillID, level): char = eos.db.getCharacter(charID) skill = char.getSkill(skillID) - if isinstance(level, basestring): + if isinstance(level, basestring) or level > 5 or level < 0: skill.learned = False skill.level = None else: