From b701acb2754a52acc51406abefc8334c8af5b607 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Sun, 1 Nov 2015 13:02:29 -0500 Subject: [PATCH] Overrides work properly now. Currently toggled on/off by opening character editor, this will be taken over by a menu option --- eos/modifiedAttributeDict.py | 5 +++++ gui/characterEditor.py | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/eos/modifiedAttributeDict.py b/eos/modifiedAttributeDict.py index 76ef86007..c5dda0f71 100644 --- a/eos/modifiedAttributeDict.py +++ b/eos/modifiedAttributeDict.py @@ -38,6 +38,9 @@ class ChargeAttrShortcut(object): return None class ModifiedAttributeDict(collections.MutableMapping): + + OVERRIDES = True + class CalculationPlaceholder(): pass @@ -109,6 +112,8 @@ class ModifiedAttributeDict(collections.MutableMapping): del self.__intermediary[key] def getOriginal(self, key): + if self.OVERRIDES and key in self.__overrides: + return self.__overrides.get(key) val = self.__original.get(key) if val is None: return None diff --git a/gui/characterEditor.py b/gui/characterEditor.py index 92b3b760c..4308f25ed 100644 --- a/gui/characterEditor.py +++ b/gui/characterEditor.py @@ -29,6 +29,8 @@ from gui.contextMenu import ContextMenu from wx.lib.buttons import GenBitmapButton import gui.globalEvents as GE +from eos.modifiedAttributeDict import ModifiedAttributeDict + class CharacterEditor(wx.Frame): def __init__(self, parent): wx.Frame.__init__ (self, parent, id=wx.ID_ANY, title=u"pyfa: Character Editor", pos=wx.DefaultPosition, @@ -36,6 +38,10 @@ class CharacterEditor(wx.Frame): i = wx.IconFromBitmap(BitmapLoader.getBitmap("character_small", "gui")) + print ModifiedAttributeDict.OVERRIDES + ModifiedAttributeDict.OVERRIDES = not ModifiedAttributeDict.OVERRIDES + print ModifiedAttributeDict.OVERRIDES + self.mainFrame = parent self.SetIcon(i)