From 029c7dd4c2c81d5f7c1cc73864707d8c4335bdad Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Tue, 7 Apr 2020 18:05:43 +0300 Subject: [PATCH] Recalculate fit when overrides are toggled --- gui/mainFrame.py | 4 ++-- service/fit.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gui/mainFrame.py b/gui/mainFrame.py index e6263fccf..ec9006ee4 100644 --- a/gui/mainFrame.py +++ b/gui/mainFrame.py @@ -678,8 +678,8 @@ class MainFrame(wx.Frame): def toggleOverrides(self, event): ModifiedAttributeDict.overrides_enabled = not ModifiedAttributeDict.overrides_enabled - - wx.PostEvent(self, GE.FitChanged(fitIDs=(self.getActiveFit(),))) + changedFitIDs = Fit.getInstance().processOverrideToggle() + wx.PostEvent(self, GE.FitChanged(fitIDs=changedFitIDs)) menu = self.GetMenuBar() menu.SetLabel(menu.toggleOverridesId, "&Turn Overrides Off" if ModifiedAttributeDict.overrides_enabled else "&Turn Overrides On") diff --git a/service/fit.py b/service/fit.py index 57d1387de..e2fcbe629 100644 --- a/service/fit.py +++ b/service/fit.py @@ -274,6 +274,16 @@ class Fit: fitIDs.add(fit.ID) return fitIDs + def processOverrideToggle(self): + fitIDs = set() + for fit in set(self._loadedFits): + if fit is None: + continue + if fit.calculated: + self.recalc(fit) + fitIDs.add(fit.ID) + return fitIDs + def processTargetProfileChange(self): fitIDs = set() for fit in set(self._loadedFits):