No control panels are shown by default anymore - perspectives will fix

this. Some other minor fixes/tweaks.

fsl/data/strings.py

@@ -52,6 +52,9 @@ messages = TypeDict({
     'ProcessingDialog.error' : 'An error has occurred: {}'
                                '\n\nDetails: {}',
 
+    'perspectives.savePerspective'     : 'Enter a name for the perspective',
+    'perspectives.applyingPerspective' : 'Applying {} perspective ...',
+
     'overlay.loadOverlays.loading'     : 'Loading {} ...',
     'overlay.loadOverlays.error'       : 'An error occurred loading the image '
                                          '{}\n\nDetails: {}',

fsl/fsleyes/actions/saveperspective.py

@@ -7,7 +7,9 @@
 """
 """
 
+import wx
 
+import fsl.data.strings         as strings
 import fsl.fsleyes.actions      as actions
 import fsl.fsleyes.perspectives as perspectives
 
@@ -29,7 +31,16 @@ class SavePerspectiveAction(actions.Action):
         """
         """
 
-        # TODO prompt for name
-        name = 'blah'
+        dlg = wx.TextEntryDialog(
+            self.__frame,
+            message=strings.messages['perspectives.savePerspective'])
+
+        if dlg.ShowModal() != wx.ID_OK:
+            return
+
+        name = dlg.GetValue()
+
+        if name.strip() == '':
+            return
 
         perspectives.savePerspective(self.__frame, name)

fsl/fsleyes/controls/__init__.py

@@ -52,6 +52,7 @@ import orthotoolbar
 import overlaydisplaypanel
 import overlaydisplaytoolbar
 import overlayinfopanel
+import overlaylistpanel
 import plotlistpanel
 import powerspectrumcontrolpanel
 import shellpanel
@@ -71,6 +72,7 @@ OrthoToolBar               = orthotoolbar.OrthoToolBar
 OverlayDisplayPanel        = overlaydisplaypanel.OverlayDisplayPanel
 OverlayDisplayToolBar      = overlaydisplaytoolbar.OverlayDisplayToolBar
 OverlayInfoPanel           = overlayinfopanel.OverlayInfoPanel
+OverlayListPanel           = overlaylistpanel.OverlayListPanel
 PlotListPanel              = plotlistpanel.PlotListPanel
 PowerSpectrumControlPanel  = powerspectrumcontrolpanel.PowerSpectrumControlPanel
 ShellPanel                 = shellpanel.ShellPanel

fsl/fsleyes/controls/shellpanel.py

@@ -26,7 +26,7 @@ class ShellPanel(fslpanel.FSLEyesPanel):
     that owns this ``ShellPanel``.
     """
 
-    def __init__(self, parent, overlayList, displayCtx, sceneOpts):
+    def __init__(self, parent, overlayList, displayCtx, canvasPanel):
         """Create a ``ShellPanel``.
 
         :arg parent:      The :mod:`wx` parent object, assumed to be the
@@ -37,15 +37,15 @@ class ShellPanel(fslpanel.FSLEyesPanel):
         :arg displayCtx:  The :class:`.DisplayContext` of the
                           :class:`.CanvasPanel` that owns this ``ShellPanel``.
         
-        :arg sceneOpts:   The :class:`.SceneOpts` of the
-                          :class:`.CanvasPanel` that owns this ``ShellPanel``.
+        :arg canvasPanel: The :class:`.CanvasPanel` that owns this
+                          ``ShellPanel``.
         """
         fslpanel.FSLEyesPanel.__init__(self, parent, overlayList, displayCtx)
 
         lcls = {
             'displayCtx'  : displayCtx,
             'overlayList' : overlayList,
-            'sceneOpts'   : sceneOpts,
+            'sceneOpts'   : canvasPanel.getSceneOptions(),
             'viewPanel'   : parent,
         }
 

fsl/fsleyes/frame.py

@@ -151,7 +151,7 @@ class FSLEyesFrame(wx.Frame):
         """Returns a list of all :class:`.ViewPanel` instances that are
         currenlty displayed in this ``FSLEyesFrame``.
         """
-        return self.__viewPanels.values()
+        return list(self.__viewPanels.values())
 
 
     def getViewPanelInfo(self, viewPanel):
@@ -564,16 +564,8 @@ class FSLEyesFrame(wx.Frame):
         # TODO Restore the previous view panel layout.
         #      Currently, we just display an OrthoPanel.
         if restore:
-
             self.addViewPanel(views.OrthoPanel)
 
-            viewPanel = self.getViewPanels()[0]
-
-            # Set up a default for ortho views
-            # layout (this will hopefully eventually
-            # be restored from a saved state)
-            viewPanel.toggleOverlayList()
-            viewPanel.toggleLocationPanel()
 
             
     def __makeMenuBar(self):
@@ -624,12 +616,13 @@ class FSLEyesFrame(wx.Frame):
         viewMenu.AppendSubMenu(perspectiveMenu, 'Perspectives')
         for persp in perspectives.getAllPerspectives():
             
-            menuItem  = perspectiveMenu.Append(wx.ID_ANY,
-                                               strings.perspectives[persp])
+            menuItem  = perspectiveMenu.Append(
+                wx.ID_ANY, strings.perspectives.get(persp, persp))
             actionObj = loadperspective.LoadPerspectiveAction(self, persp)
             actionObj.bindToWidget(self, wx.EVT_MENU, menuItem)
 
         # Save perspective
+        perspectiveMenu.AppendSeparator()
         savePerspAction   = saveperspective.SavePerspectiveAction(self)
         savePerspMenuItem = perspectiveMenu.Append(
             wx.ID_ANY, strings.actions[savePerspAction])

fsl/fsleyes/views/canvaspanel.py

@@ -375,7 +375,7 @@ class CanvasPanel(viewpanel.ViewPanel):
         :meth:`.ViewPanel.togglePanel`.
         """ 
         self.togglePanel(lookuptablepanel.LookupTablePanel,
-                         location=wx.TO,
+                         location=wx.TOP,
                          action=self.toggleLookupTablePanel)
 
     @actions.toggleAction
@@ -394,7 +394,7 @@ class CanvasPanel(viewpanel.ViewPanel):
         :meth:`.ViewPanel.togglePanel`.
         """
         self.togglePanel(shellpanel.ShellPanel,
-                         self.getSceneOptions(),
+                         self,
                          location=wx.BOTTOM,
                          action=self.toggleShell) 
 

fsl/fsleyes/views/histogrampanel.py

@@ -61,10 +61,6 @@ class HistogramPanel(plotpanel.OverlayPlotPanel):
    
        toggleHistogramList
        toggleHistogramControl
-
-    
-    The ``PlotListPanel`` and ``HistogramControlPanel`` are both shown
-    by default when a new ``HistogramPanel`` is created.
     """
 
     
@@ -93,12 +89,6 @@ class HistogramPanel(plotpanel.OverlayPlotPanel):
 
         self.addListener('histType', self._name, self.draw)
 
-        def addPanels():
-            self.toggleHistogramControl()
-            self.toggleHistogramList()
-
-        wx.CallAfter(addPanels) 
-
 
     def destroy(self):
         """Removes some property listeners, and calls

fsl/fsleyes/views/lightboxpanel.py

@@ -51,16 +51,6 @@ class LightBoxPanel(canvaspanel.CanvasPanel):
        :nosignatures:
 
        toggleLightBoxToolBar
-
-    
-    When a ``LightBoxPanel`` is created, it will automatically add the
-    following control panels:
-
-    .. autosummary::
-       :nosignatures:
-
-       ~fsl.fsleyes.controls.lightboxtoolbar.LightBoxToolBar
-       ~fsl.fsleyes.controls.overlaydisplaytoolbar.OverlayDisplayToolBar
     """
 
 
@@ -160,15 +150,6 @@ class LightBoxPanel(canvaspanel.CanvasPanel):
         self.centrePanelLayout()
         self.initProfile()
 
-        # The ViewPanel AuiManager seems to
-        # struggle if we add these toolbars
-        # immediately, so we'll do it asynchronously
-        def addToolbars():
-            self.toggleDisplayProperties()
-            self.toggleLightBoxToolBar()
-
-        wx.CallAfter(addToolbars)
-
 
     def destroy(self):
         """Must be called when this ``LightBoxPanel`` is closed.

fsl/fsleyes/views/orthopanel.py

@@ -108,27 +108,15 @@ class OrthoPanel(canvaspanel.CanvasPanel):
     
        toggleOrthoToolBar
        toggleEditToolBar
-
-
-    When an ``OrthoPanel`` is created, it will automatically add the
-    following control panels:
-
-    .. autosummary::
-       :nosignatures:
-    
-       ~fsl.fsleyes.controls.orthotoolbar.OrthoToolBar
-       ~fsl.fsleyes.controls.overlaydisplaytoolbar.OverlayDisplayToolBar
     """
 
 
-    def __init__(self, parent, overlayList, displayCtx, addToolbars=True):
+    def __init__(self, parent, overlayList, displayCtx):
         """Create an ``OrthoPanel``.
 
         :arg parent:      The :mod:`wx` parent.
         :arg overlayList: An :class:`.OverlayList` instance.
         :arg displayCtx:  A :class:`.DisplayContext` instance.
-        :arg addToolbars: If ``False``, the toolbars (listed above) are not
-                          added. Defaults to ``True``.
         """
 
         sceneOpts = orthoopts.OrthoOpts()
@@ -233,16 +221,6 @@ class OrthoPanel(canvaspanel.CanvasPanel):
         self.centrePanelLayout()
         self.initProfile()
 
-        # The ViewPanel AuiManager seems to
-        # struggle if we add these toolbars
-        # immediately, so we'll do it asynchronously 
-        def _addToolbars():
-            self.toggleDisplayProperties()
-            self.toggleOrthoToolBar()
-
-        if addToolbars:
-            wx.CallAfter(_addToolbars)
-
 
     def destroy(self):
         """Must be called when this ``OrthoPanel`` is closed.
@@ -833,10 +811,7 @@ class OrthoFrame(wx.Frame):
         ctx, dummyCanvas = fslgl.getWXGLContext() 
         fslgl.bootstrap()
         
-        self.panel = OrthoPanel(self,
-                                overlayList,
-                                displayCtx,
-                                addToolbars=False)
+        self.panel = OrthoPanel(self, overlayList, displayCtx)
         self.Layout()
 
         if dummyCanvas is not None:
@@ -876,10 +851,7 @@ class OrthoDialog(wx.Dialog):
         ctx, dummyCanvas = fslgl.getWXGLContext()
         fslgl.bootstrap()
         
-        self.panel = OrthoPanel(self,
-                                overlayList,
-                                displayCtx,
-                                addToolbars=False)
+        self.panel = OrthoPanel(self, overlayList, displayCtx)
         self.Layout()
 
         if dummyCanvas is not None:

fsl/fsleyes/views/powerspectrumpanel.py

@@ -55,10 +55,6 @@ class PowerSpectrumPanel(plotpanel.OverlayPlotPanel):
        togglePowerSpectrumControl
 
     
-    The ``PlotListPanel`` and ``PowerSpectrumControlPanel`` are both shown
-    by default when a new ``PowerSpectrumPanel`` is created.    
-
-    
     **Melodic images**
 
     
@@ -101,13 +97,6 @@ class PowerSpectrumPanel(plotpanel.OverlayPlotPanel):
                                 self._name,
                                 self.__plotMelodicICsChanged)
 
-        def addPanels():
-            self.togglePowerSpectrumControl()
-            self.togglePowerSpectrumList() 
-
-        wx.CallAfter(addPanels)
-        self.draw()
-
 
     def destroy(self):
         """Must be called when this ``PowerSpectrumPanel` is no longer

fsl/fsleyes/views/timeseriespanel.py

@@ -75,9 +75,6 @@ class TimeSeriesPanel(plotpanel.OverlayPlotPanel):
 
        toggleTimeSeriesList
        toggleTimeSeriesControl
- 
-    New ``TimeSeriesPanel`` instances will display a ``PlotListPanel``
-    and a ``TimeSeriesControlPanel`` by default.
 
 
     **FEATures**
@@ -146,13 +143,6 @@ class TimeSeriesPanel(plotpanel.OverlayPlotPanel):
                          self._name,
                          self.__plotMelodicICsChanged)
 
-        def addPanels():
-            self.toggleTimeSeriesControl()
-            self.toggleTimeSeriesList()
-
-        wx.CallAfter(addPanels)
-        self.draw()
-        
 
     def destroy(self):
         """Removes some listeners, and calls the :meth:`.PlotPanel.destroy`

fsl/fsleyes/views/viewpanel.py

@@ -100,14 +100,21 @@ class ViewPanel(fslpanel.FSLEyesPanel):
         self.__profileManager = profiles.ProfileManager(
             self, overlayList, displayCtx)
 
+        # The centrePanel attribute stores a reference
+        # to the main (centre) panel on this ViewPanel.
+        # It is set by sub-class implementations via
+        # the setCentrePanel method.
+        # 
         # The panels dictionary stores a collection
         # of {type : instance} mappings of active
         # FSLeyes control panels that are contained
-        # in this view panel. The panelActions dict
-        # contains a collection of {type : Action}
-        # mappings, but only if the control panel
-        # was opened as a result of an Action on
-        # this view panel. 
+        # in this view panel.
+        #
+        # The panelActions dict contains a collection
+        # of {type : Action} mappings, but only if the
+        # control panel was opened as a result of an
+        # Action on this view panel.
+        self.__centrePanel  = None
         self.__panels       = {}
         self.__panelActions = {}
 
@@ -185,6 +192,7 @@ class ViewPanel(fslpanel.FSLEyesPanel):
         self.__profileManager = None
         self.__auiMgr         = None
         self.__panels         = None
+        self.__centrePanel    = None
 
         fslpanel.FSLEyesPanel.destroy(self)
         
@@ -203,15 +211,18 @@ class ViewPanel(fslpanel.FSLEyesPanel):
 
 
     def setCentrePanel(self, panel):
-        """Set the primary centre panel for this ``ViewPanel``. """
+        """Set the primary centre panel for this ``ViewPanel``. This method
+        is only intended to be called by sub-classes.
+        """
         
         panel.Reparent(self)
         paneInfo = (aui.AuiPaneInfo()
                     .Name(type(panel).__name__)
                     .CentrePane())
-                         
+
         self.__auiMgr.AddPane(panel, paneInfo)
         self.__auiMgrUpdate()
+        self.__centrePanel = panel
 
 
     def togglePanel(self, panelType, *args, **kwargs):
@@ -367,6 +378,12 @@ class ViewPanel(fslpanel.FSLEyesPanel):
         else:                          return None
 
 
+    def getCentrePanel(self):
+        """Returns the primary (centre) panel on this ``ViewPanel``.
+        """
+        return self.__centrePanel
+        
+
     def getPanels(self):
         """Returns a list containing all control panels currently shown in this
         ``ViewPanel``.