Colourmap display names are now explicitly set.

fsl/fsleyes/colourmaps.py

@@ -52,6 +52,8 @@ The following functions are available for managing and accessing colour maps:
    :nosignatures:
 
    getColourMaps
+   getColourMap
+   getColourMapLabel
    registerColourMap
    installColourMap
    isColourMapRegistered
@@ -256,7 +258,7 @@ def registerColourMap(cmapFile,
     if overlayList is None: overlayList = []
 
     data = np.loadtxt(cmapFile)
-    cmap = colors.ListedColormap(data, name)
+    cmap = colors.ListedColormap(data, key)
 
     log.debug('Loading and registering custom '
               'colour map: {}'.format(cmapFile))
@@ -401,6 +403,11 @@ def getColourMap(cmapName):
     return _caseInsensitiveLookup(_cmaps, cmapName).mapObj
 
 
+def getColourMapLabel(cmapName):
+    """Returns a label/display name for the specified colour map. """
+    return _caseInsensitiveLookup(_cmaps, cmapName).name
+
+
 def isColourMapRegistered(cmapName):
     """Returns ``True`` if the specified colourmap is registered, ``False``
     otherwise. 

fsl/fsleyes/controls/overlaydisplaypanel.py

@@ -21,6 +21,7 @@ import fsl.utils.typedict                as td
 import fsl.data.strings                  as strings
 import fsl.fsleyes.tooltips              as fsltooltips
 import fsl.fsleyes.panel                 as fslpanel
+import fsl.fsleyes.colourmaps            as fslcm
 import fsl.fsleyes.actions.loadcolourmap as loadcmap
 import fsl.fsleyes.displaycontext        as displayctx
 
@@ -258,6 +259,7 @@ class OverlayDisplayPanel(fslpanel.FSLEyesPanel):
 
         # Negative colour map widget
         negCmap    = props.Widget('negativeCmap',
+                                  labels=fslcm.getColourMapLabel,
                                   enabledWhen=lambda i, enc: enc,
                                   dependencies=['useNegativeCmap'])
         useNegCmap = props.Widget('useNegativeCmap')
@@ -304,7 +306,8 @@ _DISPLAY_PROPS = td.TypeDict({
                      enabledWhen=lambda o: o.overlay.is4DImage()),
         props.Widget('interpolation',
                      labels=strings.choices['VolumeOpts.interpolation']),
-        props.Widget('cmap'),
+        props.Widget('cmap',
+                     labels=fslcm.getColourMapLabel),
         props.Widget('invert'),
         props.Widget('invertClipping'),
         props.Widget('linkLowRanges',
@@ -342,6 +345,7 @@ _DISPLAY_PROPS = td.TypeDict({
                      enabledWhen=lambda o, ci: ci is None),
         props.Widget('clipImage',     labels=_imageName),
         props.Widget('cmap',
+                     labels=fslcm.getColourMapLabel,
                      dependencies=['colourImage'],
                      enabledWhen=lambda o, ci: ci is not None), 
         props.Widget('clippingRange',

fsl/fsleyes/controls/overlaydisplaytoolbar.py

@@ -16,12 +16,13 @@ import wx
 
 import props
 
-import fsl.fsleyes.toolbar                   as fsltoolbar
-import fsl.fsleyes.icons                     as icons
-import fsl.fsleyes.tooltips                  as fsltooltips
-import fsl.fsleyes.actions                   as actions
-import fsl.utils.typedict                    as td
-import fsl.data.strings                      as strings
+import fsl.fsleyes.toolbar    as fsltoolbar
+import fsl.fsleyes.icons      as icons
+import fsl.fsleyes.tooltips   as fsltooltips
+import fsl.fsleyes.actions    as actions
+import fsl.fsleyes.colourmaps as fslcm
+import fsl.utils.typedict     as td
+import fsl.data.strings       as strings
 
 
 log = logging.getLogger(__name__)
@@ -521,6 +522,7 @@ _TOOLBAR_PROPS = td.TypeDict({
             tooltip=_TOOLTIPS['VolumeOpts.resetDisplayRange']), 
         'cmap' : props.Widget(
             'cmap',
+            labels=fslcm.getColourMapLabel,
             tooltip=_TOOLTIPS['VolumeOpts.cmap'])},
 
     'MaskOpts' : {