Fix Big Sur compatibility (#298)

* Test_rebuild

* Run build

* Keep status bar references

* Manually generate status bar

* Another test

* Alt setup

* Restore binds

* Activate

* Clear cache when switching properties

* Fix Big Sur crash

* Apply MPL monkey patch to Mac too

* Reset Actions scripts

Author: David Stirling

CellProfiler-Analyst.py

@@ -7,12 +7,12 @@
 
 
 import sys
-from io import StringIO
 import os
 import os.path
 import logging
 
 from cpa.dimensionreduction import DimensionReduction
+from cpa.guiutils import create_status_bar
 from cpa.util.version import display_version
 from cpa.properties import Properties
 from cpa.dbconnect import DBConnect
@@ -95,7 +95,7 @@ def __init__(self, properties, parent, id=-1, **kwargs):
         self.tbicon = None
         self.SetName('CPA')
         self.Center(wx.HORIZONTAL)
-        self.CreateStatusBar()
+        self.status_bar = create_status_bar(self)
         self.log_io = True
 
         #
@@ -174,7 +174,7 @@ def __init__(self, properties, parent, id=-1, **kwargs):
 
         # Black background and white font
         self.console.SetDefaultStyle(wx.TextAttr(wx.WHITE,wx.BLACK))
-        self.console.SetBackgroundColour('#000000')  
+        self.console.SetBackgroundColour('#000000')
 
         log_level = logging.INFO # INFO is the default log level
         self.logr = logging.getLogger()
@@ -314,6 +314,8 @@ def on_load_properties(self, evt):
         p.clear()
         from cpa.datamodel import DataModel
         DataModel.forget()
+        from cpa.trainingset import CellCache
+        CellCache.forget()
         self.console.Clear()
 
         if not p.is_initialized():

cpa/classifier.py

@@ -1,6 +1,9 @@
 # Encoding: utf-8
 
 import matplotlib
+
+from cpa.guiutils import create_status_bar
+
 matplotlib.use('WXAgg')
 
 import matplotlib.pyplot as plt
@@ -131,11 +134,11 @@ def __init__(self, properties=None, parent=None, id=ID_CLASSIFIER, **kwargs):
         self.SetMenuBar(self.menuBar)
         self.CreateMenus()
 
-        self.CreateStatusBar()
-
+        self.status_bar = create_status_bar(self, force=True)
         #### Create GUI elements
         # Top level - three split windows
         self.splitter = wx.SplitterWindow(self, style=wx.NO_BORDER | wx.SP_3DSASH | wx.SP_LIVE_UPDATE)
+
         self.fetch_and_rules_panel = wx.Panel(self.splitter)
         self.bins_splitter = wx.SplitterWindow(self.splitter, style=wx.NO_BORDER | wx.SP_3DSASH | wx.SP_LIVE_UPDATE)
 
@@ -187,7 +190,7 @@ def __init__(self, properties=None, parent=None, id=ID_CLASSIFIER, **kwargs):
         self.scoreImageBtn = wx.Button(self.find_rules_panel, -1, 'Score Image')
 
         # add sorting class
-        self.addSortClassBtn = wx.Button(self.GetStatusBar(), -1, "Add new class", style=wx.BU_EXACTFIT)
+        self.addSortClassBtn = wx.Button(self.status_bar, -1, "Add new class", style=wx.BU_EXACTFIT)
 
         #### Create Sizers
         self.fetchSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -358,7 +361,7 @@ def __init__(self, properties=None, parent=None, id=ID_CLASSIFIER, **kwargs):
         self.nNeuronsTxt.Bind(wx.EVT_TEXT, self.ValidateNumberOfNeurons)
         self.nObjectsTxt.Bind(wx.EVT_TEXT_ENTER, self.OnFetch)
 
-        self.GetStatusBar().Bind(wx.EVT_SIZE, self.status_bar_onsize)
+        self.status_bar.Bind(wx.EVT_SIZE, self.status_bar_onsize)
         wx.CallAfter(self.status_bar_onsize, None)
 
         self.Bind(wx.EVT_MENU, self.OnClose, self.exitMenuItem)
@@ -391,7 +394,7 @@ def __init__(self, properties=None, parent=None, id=ID_CLASSIFIER, **kwargs):
     def status_bar_onsize(self, event):
         # draw the "add sort class..." button in the status bar
         button = self.addSortClassBtn
-        width, height = self.GetStatusBar().GetClientSize()
+        width, height = self.status_bar.GetClientSize()
         # diagonal lines drawn on mac, so move let by height.
         button.SetPosition((width - button.GetSize()[0] - 1 - height, button.GetPosition()[1]))
 

cpa/datatable.py

@@ -2,6 +2,7 @@
 
 from cpa import dbconnect
 from cpa.dbconnect import DBConnect
+from cpa.guiutils import create_status_bar
 from .datamodel import DataModel
 from .properties import Properties
 from tempfile import gettempdir
@@ -381,7 +382,7 @@ def __init__(self, data=None, labels=None, grouping='Image',
         self.GetMenuBar().Append(self.dbmenu, 'Database')
         if self.grid:
             self.CreateColumnMenu()
-        self.CreateStatusBar()
+        self.status_bar = create_status_bar(self)
 
         self.SetSize((800,500))
         if self.grid:

cpa/generalclassifier.py

@@ -20,35 +20,34 @@
 # MatPlotLib currently has a bug on Windows which crashes wx if you close an interactive plot window.
 # This should be fixed in MPL 3.4, but for now we'll monkey patch in the fix.
 # See MPL PR #19596 for more details. - dstirling Mar 2021
-if sys.platform == 'win32':
-    import wx
-    import matplotlib.backends.backend_wx
-    from matplotlib._pylab_helpers import Gcf
-
-    def mp_onClose(self, event):
-        self.canvas.close_event()
-        self.canvas.stop_event_loop()
-        self.figmgr.frame = None
-        Gcf.destroy(self.figmgr)
-        event.Skip()
-
-    def mp_Destroy(self, *args, **kwargs):
-        try:
-            self.canvas.mpl_disconnect(self.toolbar._id_drag)
-        except AttributeError:
-            pass
-        if self and not self.IsBeingDeleted():
-            wx.Frame.Destroy(self, *args, **kwargs)
-        return True
-
-    def mp_mandestroy(self, *args):
-        frame = self.frame
-        if frame:
-            wx.CallAfter(frame.Close)
-
-    matplotlib.backends.backend_wx.FigureFrameWx._onClose = mp_onClose
-    matplotlib.backends.backend_wx.FigureFrameWx.Destroy = mp_Destroy
-    matplotlib.backends.backend_wx.FigureManagerWx.destroy = mp_mandestroy
+import wx
+import matplotlib.backends.backend_wx
+from matplotlib._pylab_helpers import Gcf
+
+def mp_onClose(self, event):
+    self.canvas.close_event()
+    self.canvas.stop_event_loop()
+    self.figmgr.frame = None
+    Gcf.destroy(self.figmgr)
+    event.Skip()
+
+def mp_Destroy(self, *args, **kwargs):
+    try:
+        self.canvas.mpl_disconnect(self.toolbar._id_drag)
+    except AttributeError:
+        pass
+    if self and not self.IsBeingDeleted():
+        wx.Frame.Destroy(self, *args, **kwargs)
+    return True
+
+def mp_mandestroy(self, *args):
+    frame = self.frame
+    if frame:
+        wx.CallAfter(frame.Close)
+
+matplotlib.backends.backend_wx.FigureFrameWx._onClose = mp_onClose
+matplotlib.backends.backend_wx.FigureFrameWx.Destroy = mp_Destroy
+matplotlib.backends.backend_wx.FigureManagerWx.destroy = mp_mandestroy
 ##########
 
 class GeneralClassifier(BaseEstimator, ClassifierMixin):

cpa/guiutils.py

@@ -1,4 +1,5 @@
 import logging
+import platform
 import wx
 import wx.adv
 import os
@@ -837,3 +838,20 @@ def show_load_dialog():
     else:
         wx.CallAfter(dlg.Destroy)
         return False
+
+def create_status_bar(parent, force=False):
+    if platform.system() == "Darwin" and platform.mac_ver()[0].startswith('11'):
+        # wx 4.1.0 crashes on Big Sur if you try to make a status bar.
+        # Redirect messages to the log instead.
+        # Provide a toolbar if we need to place buttons in the status bar.
+        def log_status(text):
+            logging.info(text)
+        parent.SetStatusText = log_status
+        if force:
+            tb = wx.ToolBar(parent, style=wx.TB_BOTTOM)
+            parent.SetToolBar(tb)
+            return tb
+        else:
+            return None
+    else:
+        return parent.CreateStatusBar()

cpa/imagegallery.py

@@ -3,6 +3,9 @@
 
 
 import matplotlib
+
+from cpa.guiutils import create_status_bar
+
 matplotlib.use('WXAgg')
 
 import sys
@@ -77,7 +80,7 @@ def __init__(self, properties=None, parent=None, id=ID_IMAGE_GALLERY, **kwargs):
         self.SetMenuBar(self.menuBar)
         self.CreateMenus()
 
-        self.CreateStatusBar()
+        self.status_bar = create_status_bar(self)
 
         #### Create GUI elements
         # Top level - three split windows

cpa/tableviewer.py

@@ -17,6 +17,7 @@
 import wx
 import wx.grid as  gridlib
 import cpa.helpmenu
+from cpa.guiutils import create_status_bar
 from .properties import Properties
 from . import dbconnect
 from .datamodel import DataModel
@@ -564,7 +565,7 @@ def __init__(self, parent, **kwargs):
 
         self.GetMenuBar().Append(cpa.helpmenu.make_help_menu(self, manual_url="6_table_viewer.html"), 'Help')
 
-        self.CreateStatusBar()
+        self.status_bar = create_status_bar(self)
 
         self.Bind(wx.EVT_MENU, self.on_new_table, new_table_item)
         self.Bind(wx.EVT_MENU, self.on_load_csv, load_csv_menu_item)