From f3551ce5703e99c191c5ebffed8009ad2d8afdc9 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 16 Aug 2019 08:41:14 +0300 Subject: [PATCH] Move HP toggled event to global --- gui/builtinStatsViews/rechargeViewFull.py | 11 ++++++----- gui/builtinStatsViews/resistancesViewFull.py | 18 ++++++++---------- gui/globalEvents.py | 2 ++ 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/gui/builtinStatsViews/rechargeViewFull.py b/gui/builtinStatsViews/rechargeViewFull.py index ccc89f79f..011164677 100644 --- a/gui/builtinStatsViews/rechargeViewFull.py +++ b/gui/builtinStatsViews/rechargeViewFull.py @@ -19,11 +19,12 @@ # noinspection PyPackageRequirements import wx -from gui.statsView import StatsView -from gui.bitmap_loader import BitmapLoader -from gui.utils.numberFormatter import formatAmount + +import gui.globalEvents as GE import gui.mainFrame -from gui.builtinStatsViews.resistancesViewFull import EFFECTIVE_HP_TOGGLED +from gui.bitmap_loader import BitmapLoader +from gui.statsView import StatsView +from gui.utils.numberFormatter import formatAmount from service.fit import Fit @@ -34,7 +35,7 @@ class RechargeViewFull(StatsView): StatsView.__init__(self) self.parent = parent self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.mainFrame.Bind(EFFECTIVE_HP_TOGGLED, self.toggleEffective) + self.mainFrame.Bind(GE.EFFECTIVE_HP_TOGGLED, self.toggleEffective) self.effective = True def getHeaderText(self, fit): diff --git a/gui/builtinStatsViews/resistancesViewFull.py b/gui/builtinStatsViews/resistancesViewFull.py index 8fd46755c..52e6cfcf8 100644 --- a/gui/builtinStatsViews/resistancesViewFull.py +++ b/gui/builtinStatsViews/resistancesViewFull.py @@ -19,16 +19,14 @@ # noinspection PyPackageRequirements import wx -from gui.statsView import StatsView + +import gui.globalEvents as GE +import gui.mainFrame from gui.bitmap_loader import BitmapLoader from gui.pyfa_gauge import PyGauge -from gui.utils.numberFormatter import formatAmount -import gui.mainFrame -import gui.globalEvents as GE +from gui.statsView import StatsView from gui.utils import fonts - - -EffectiveHpToggled, EFFECTIVE_HP_TOGGLED = wx.lib.newevent.NewEvent() +from gui.utils.numberFormatter import formatAmount class ResistancesViewFull(StatsView): @@ -41,7 +39,7 @@ class ResistancesViewFull(StatsView): self.showEffective = True self.activeFit = None self.mainFrame = gui.mainFrame.MainFrame.getInstance() - self.mainFrame.Bind(EFFECTIVE_HP_TOGGLED, self.ehpSwitch) + self.mainFrame.Bind(GE.EFFECTIVE_HP_TOGGLED, self.ehpSwitch) def getHeaderText(self, fit): return "Resistances" @@ -161,7 +159,7 @@ class ResistancesViewFull(StatsView): self.stEHPs.SetToolTip(wx.ToolTip("Click to toggle between effective HP and raw HP")) def toggleEHP(self, event): - wx.PostEvent(self.mainFrame, EffectiveHpToggled(effective=self.stEHPs.GetLabel() == "HP")) + wx.PostEvent(self.mainFrame, GE.EffectiveHpToggled(effective=self.stEHPs.GetLabel() == "HP")) def ehpSwitch(self, event): self.showEffective = event.effective @@ -172,7 +170,7 @@ class ResistancesViewFull(StatsView): # If we did anything intresting, we'd update our labels to reflect the new fit's stats here if fit is None and not self.showEffective: self.showEffective = True - wx.PostEvent(self.mainFrame, EffectiveHpToggled(effective=True)) + wx.PostEvent(self.mainFrame, GE.EffectiveHpToggled(effective=True)) return self.stEHPs.SetLabel("EHP" if self.showEffective else "HP") diff --git a/gui/globalEvents.py b/gui/globalEvents.py index 2bfef81a4..b84026efe 100644 --- a/gui/globalEvents.py +++ b/gui/globalEvents.py @@ -11,6 +11,8 @@ TargetProfileRenamed, TARGET_PROFILE_RENAMED = wx.lib.newevent.NewEvent() TargetProfileChanged, TARGET_PROFILE_CHANGED = wx.lib.newevent.NewEvent() TargetProfileRemoved, TARGET_PROFILE_REMOVED = wx.lib.newevent.NewEvent() +EffectiveHpToggled, EFFECTIVE_HP_TOGGLED = wx.lib.newevent.NewEvent() + SsoLoggingIn, EVT_SSO_LOGGING_IN = wx.lib.newevent.NewEvent() SsoLogin, EVT_SSO_LOGIN = wx.lib.newevent.NewEvent() SsoLogout, EVT_SSO_LOGOUT = wx.lib.newevent.NewEvent()