Make sure graphs properly react to target profile updates

gui/graphFrame/lists.py

@@ -24,7 +24,6 @@ import wx
 import gui.display
 import gui.globalEvents as GE
 from eos.saveddata.targetProfile import TargetProfile
-from gui.builtinShipBrowser.events import EVT_FIT_RENAMED
 from gui.contextMenu import ContextMenu
 from service.const import GraphCacheCleanupReason
 from service.fit import Fit
@@ -49,10 +48,6 @@ class BaseList(gui.display.Display):
         self.Bind(wx.EVT_MOTION, self.OnMouseMove)
         self.Bind(wx.EVT_LEAVE_WINDOW, self.OnLeaveWindow)
 
-        self.graphFrame.mainFrame.Bind(GE.FIT_CHANGED, self.OnFitChanged)
-        self.graphFrame.mainFrame.Bind(EVT_FIT_RENAMED, self.OnFitRenamed)
-        self.graphFrame.mainFrame.Bind(GE.FIT_REMOVED, self.OnFitRemoved)
-
     def refreshExtraColumns(self, extraColSpecs):
         baseColNames = set()
         for baseColName in self.DEFAULT_COLS:
@@ -94,21 +89,6 @@ class BaseList(gui.display.Display):
             return
         self.removeListItems([item])
 
-    def OnFitRenamed(self, event):
-        event.Skip()
-        self.updateView()
-
-    def OnFitChanged(self, event):
-        event.Skip()
-        if set(event.fitIDs).union(f.ID for f in self.fits):
-            self.updateView()
-
-    def OnFitRemoved(self, event):
-        event.Skip()
-        fit = next((f for f in self.fits if f.ID == event.fitID), None)
-        if fit is not None:
-            self.removeListItems([fit])
-
     def OnMouseMove(self, event):
         row, _, col = self.HitTestSubItem(event.Position)
         if row != self.hoveredRow or col != self.hoveredColumn:
@@ -136,6 +116,21 @@ class BaseList(gui.display.Display):
         self.hoveredColumn = None
         event.Skip()
 
+    # Fit events
+    def OnFitRenamed(self, event):
+        if event.fitID in [f.ID for f in self.fits]:
+            self.updateView()
+
+    def OnFitChanged(self, event):
+        if set(event.fitIDs).union(f.ID for f in self.fits):
+            self.updateView()
+
+    def OnFitRemoved(self, event):
+        fit = next((f for f in self.fits if f.ID == event.fitID), None)
+        if fit is not None:
+            self.fits.remove(fit)
+            self.updateView()
+
     @property
     def defaultTTText(self):
         raise NotImplementedError
@@ -161,11 +156,6 @@ class BaseList(gui.display.Display):
             items.append(item)
         return items
 
-    def unbindExternalEvents(self):
-        self.graphFrame.mainFrame.Unbind(GE.FIT_CHANGED, handler=self.OnFitChanged)
-        self.graphFrame.mainFrame.Unbind(EVT_FIT_RENAMED, handler=self.OnFitRenamed)
-        self.graphFrame.mainFrame.Unbind(GE.FIT_REMOVED, handler=self.OnFitRemoved)
-
     # Context menu handlers
     def addFit(self, fit):
         if fit is None:
@@ -288,6 +278,21 @@ class TargetList(BaseList):
             self.graphFrame.clearCache(reason=GraphCacheCleanupReason.profileRemoved, extraData=profile.ID)
         self.graphFrame.draw()
 
+    # Target profile events
+    def OnProfileRenamed(self, event):
+        if event.profileID in [tp.ID for tp in self.profiles]:
+            self.updateView()
+
+    def OnProfileChanged(self, event):
+        if event.profileID in [tp.ID for tp in self.profiles]:
+            self.updateView()
+
+    def OnProfileRemoved(self, event):
+        profile = next((tp for tp in self.profiles if tp.ID == event.profileID), None)
+        if profile is not None:
+            self.profiles.remove(profile)
+            self.updateView()
+
     @property
     def targets(self):
         return self.fits + self.profiles