Ortho/LightBoxPanel toolbars are shown by default

fsl/fsleyes/frame.py

@@ -431,20 +431,11 @@ class FSLEyesFrame(wx.Frame):
             # Set up a default for ortho views
             # layout (this will hopefully eventually
             # be restored from a saved state)
-            import fsl.fsleyes.controls.overlaylistpanel      as olp
-            import fsl.fsleyes.controls.locationpanel         as lop
-            import fsl.fsleyes.controls.overlaydisplaytoolbar as odt
-            import fsl.fsleyes.controls.orthotoolbar          as ot
-            import fsl.fsleyes.controls.orthoprofiletoolbar   as opt
+            import fsl.fsleyes.controls.overlaylistpanel as olp
+            import fsl.fsleyes.controls.locationpanel    as lop
 
             viewPanel.togglePanel(olp.OverlayListPanel)
             viewPanel.togglePanel(lop.LocationPanel)
-            viewPanel.togglePanel(odt.OverlayDisplayToolBar,
-                                  viewPanel=viewPanel)
-            viewPanel.togglePanel(ot .OrthoToolBar,
-                                  ortho=viewPanel)
-            viewPanel.togglePanel(opt.OrthoProfileToolBar,
-                                  ortho=viewPanel) 
 
             
     def __makeMenuBar(self):

fsl/fsleyes/views/lightboxpanel.py

@@ -17,10 +17,11 @@ import wx
 
 import numpy as np
 
-import fsl.utils.layout                        as fsllayout
-import fsl.fsleyes.gl.wxgllightboxcanvas       as lightboxcanvas
-import fsl.fsleyes.controls.lightboxtoolbar    as lightboxtoolbar
-import fsl.fsleyes.displaycontext.lightboxopts as lightboxopts
+import fsl.utils.layout                           as fsllayout
+import fsl.fsleyes.gl.wxgllightboxcanvas          as lightboxcanvas
+import fsl.fsleyes.controls.lightboxtoolbar       as lightboxtoolbar
+import fsl.fsleyes.controls.overlaydisplaytoolbar as overlaydisplaytoolbar
+import fsl.fsleyes.displaycontext.lightboxopts    as lightboxopts
 import canvaspanel
 
 
@@ -131,6 +132,18 @@ class LightBoxPanel(canvaspanel.CanvasPanel):
         self._selectedOverlayChanged()
         self.initProfile()
 
+        # The FSLEyesFrame AuiManager seems to
+        # struggle if we add these toolbars
+        # immediately, so we'll do it asynchronously
+        def addToolbars():
+            
+            self.togglePanel(overlaydisplaytoolbar.OverlayDisplayToolBar,
+                             viewPanel=self)
+            self.togglePanel(lightboxtoolbar.LightBoxToolBar, lb=self)
+
+        wx.CallAfter(addToolbars)
+            
+
 
     def destroy(self):
         """Removes property listeners"""

fsl/fsleyes/views/orthopanel.py

@@ -17,16 +17,17 @@ import logging
 
 import wx
 
-import fsl.data.strings                         as strings
-import fsl.data.constants                       as constants
-import fsl.utils.layout                         as fsllayout
-import fsl.fsleyes.gl                           as fslgl
-import fsl.fsleyes.colourmaps                   as colourmaps
-import fsl.fsleyes.gl.wxglslicecanvas           as slicecanvas
-import fsl.fsleyes.controls.orthotoolbar        as orthotoolbar
-import fsl.fsleyes.controls.orthoprofiletoolbar as orthoprofiletoolbar
-import fsl.fsleyes.displaycontext.orthoopts     as orthoopts
-import                                             canvaspanel
+import fsl.data.strings                           as strings
+import fsl.data.constants                         as constants
+import fsl.utils.layout                           as fsllayout
+import fsl.fsleyes.gl                             as fslgl
+import fsl.fsleyes.colourmaps                     as colourmaps
+import fsl.fsleyes.gl.wxglslicecanvas             as slicecanvas
+import fsl.fsleyes.controls.overlaydisplaytoolbar as overlaydisplaytoolbar
+import fsl.fsleyes.controls.orthotoolbar          as orthotoolbar
+import fsl.fsleyes.controls.orthoprofiletoolbar   as orthoprofiletoolbar
+import fsl.fsleyes.displaycontext.orthoopts       as orthoopts
+import                                               canvaspanel
 
 
 log = logging.getLogger(__name__)
@@ -171,10 +172,22 @@ class OrthoPanel(canvaspanel.CanvasPanel):
         # Initialise the panel
         self._refreshLayout()
         self._overlayListChanged()
-        self._refreshLabels()
         self._locationChanged()
         self.initProfile()
 
+        # The FSLEyesFrame AuiManager seems to
+        # struggle if we add these toolbars
+        # immediately, so we'll do it asynchronously 
+        def addToolbars():
+            self.togglePanel(overlaydisplaytoolbar.OverlayDisplayToolBar,
+                             viewPanel=self)
+            self.togglePanel(orthotoolbar.OrthoToolBar,
+                             ortho=self) 
+            self.togglePanel(orthoprofiletoolbar.OrthoProfileToolBar,
+                             ortho=self) 
+
+        wx.CallAfter(addToolbars)
+
 
     def destroy(self):
         """Called when this panel is closed.