Colour bar tweaks and refactors

fsl/fslview/gl/colourbarcanvas.py

@@ -26,13 +26,16 @@ import fsl.utils.colourbarbitmap     as cbarbmp
 
 class ColourBarCanvas(props.HasProperties):
 
-    cmap   = props.ColourMap()
-    vrange = props.Bounds(ndims=1)
-    label  = props.String()
-    orient = props.Choice({
+    cmap        = props.ColourMap()
+    vrange      = props.Bounds(ndims=1)
+    label       = props.String()
+    orientation = props.Choice({
         'horizontal' : 'Horizontal',
         'vertical'   : 'Vertical'})
 
+    labelSide   = props.Choice({
+        'top-left'     : 'Top / left',
+        'bottom-right' : 'Bottom / right'})
     
     def _getSize(      self): raise NotImplementedError()
     def _setGLContext( self): raise NotImplementedError()
@@ -50,7 +53,7 @@ class ColourBarCanvas(props.HasProperties):
             self._createColourBarTexture()
             self._refresh()
 
-        for prop in ('cmap', 'vrange', 'label', 'orient'):
+        for prop in ('cmap', 'vrange', 'label', 'orientation', 'labelSide'):
             self.addListener(prop, self._name, _update)
             
 
@@ -65,8 +68,15 @@ class ColourBarCanvas(props.HasProperties):
         w, h = self._getSize()
 
         if w == 0 or h == 0:
-            if self.orient == 'horizontal': w, h = 600, 200
-            else:                           w, h = 200, 600
+            if self.orientation == 'horizontal': w, h = 600, 200
+            else:                                w, h = 200, 600
+
+        if self.orientation == 'horizontal':
+            if  self.labelSide == 'top-left': labelSide = 'top'
+            else:                             labelSide = 'bottom'
+        else:
+            if  self.labelSide == 'top-left': labelSide = 'left'
+            else:                             labelSide = 'right' 
         
         bitmap = cbarbmp.colourBarBitmap(
             self.cmap,
@@ -74,8 +84,8 @@ class ColourBarCanvas(props.HasProperties):
             self.vrange.xhi,
             w, h,
             self.label,
-            self.orient,
-            'bottom')
+            self.orientation,
+            labelSide)
         bitmap = np.flipud(bitmap)
 
         if self._tex is None:

fsl/fslview/views/canvaspanel.py

@@ -38,6 +38,8 @@ class CanvasPanel(viewpanel.ViewPanel):
         'left'   : 'Left',
         'right'  : 'Right'})
 
+    colourBarLabelSide = colourbarpanel.ColourBarPanel.labelSide
+
     
     _labels = {
         'showCursor'        : 'Show cursor',
@@ -63,6 +65,9 @@ class CanvasPanel(viewpanel.ViewPanel):
             self._imageList,
             self._displayCtx)
 
+
+        self.bindProps('colourBarLabelSide', self.__colourBar, 'labelSide')
+
         self._configColourBar()
  
         self.addListener('showColourBar',
@@ -75,6 +80,7 @@ class CanvasPanel(viewpanel.ViewPanel):
     def getCanvasPanel(self):
         return self.__canvasPanel
 
+        
     def _configColourBar(self, *a):
         """
         """
@@ -90,15 +96,21 @@ class CanvasPanel(viewpanel.ViewPanel):
             self.Layout()
             return
             
-        self.__colourBar.Show(True) 
+        self.__colourBar.Show(True)
+
 
         if self.colourBarLocation in ('top', 'bottom'):
-            self.__colourBar.orientation = 'horizontal'
             self.__sizer = wx.BoxSizer(wx.VERTICAL)
         else:
-            self.__colourBar.orientation = 'vertical'
             self.__sizer = wx.BoxSizer(wx.HORIZONTAL)
 
+        if self.colourBarLocation in ('top', 'bottom'):
+            self.__colourBar.orientation = 'horizontal'
+        elif self.colourBarLocation == 'left':
+            self.__colourBar.orientation = 'vertical'
+        elif self.colourBarLocation == 'right':
+            self.__colourBar.orientation = 'vertical'
+
         if self.colourBarLocation in ('top', 'left'):
             self.__sizer.Add(self.__colourBar,   flag=wx.EXPAND)
             self.__sizer.Add(self.__canvasPanel, flag=wx.EXPAND, proportion=1)

fsl/fslview/views/colourbarpanel.py

@@ -27,12 +27,12 @@ class ColourBarPanel(viewpanel.ViewPanel):
     currently selected image.
     """
 
-    orientation = cbarcanvas.ColourBarCanvas.orient
+    orientation = cbarcanvas.ColourBarCanvas.orientation
     """Draw the colour bar horizontally or vertically. """
 
-    @classmethod
-    def isGLView(cls):
-        return True
+    labelSide   = cbarcanvas.ColourBarCanvas.labelSide
+    """Draw colour bar labels on the top/left/right/bottom."""
+                  
 
     def __init__(self,
                  parent,
@@ -48,7 +48,8 @@ class ColourBarPanel(viewpanel.ViewPanel):
         self.SetSizer(self._sizer)
         self._sizer.Add(self._cbPanel, flag=wx.EXPAND, proportion=1)
 
-        self.bindProps('orientation', self._cbPanel, 'orient')
+        self.bindProps('orientation', self._cbPanel)
+        self.bindProps('labelSide'  , self._cbPanel)
 
         self.SetBackgroundColour('black')
 

fsl/fslview/views/orthopanel.py

@@ -57,9 +57,10 @@ class OrthoPanel(canvaspanel.CanvasPanel):
                       'showYCanvas',
                       'showZCanvas',
                       'showColourBar',
-                      props.Widget(
-                          'colourBarLocation',
-                          visibleWhen=lambda i: i.showColourBar))),
+                      props.Widget('colourBarLocation',
+                                   visibleWhen=lambda i: i.showColourBar),
+                      props.Widget('colourBarLabelSide',
+                                   visibleWhen=lambda i: i.showColourBar))),
         props.VGroup(('xzoom', 'yzoom', 'zzoom'))
     ))
 

fsl/utils/colourbarbitmap.py

@@ -5,7 +5,7 @@
 #
 # Author: Paul McCarthy <pauldmccarthy@gmail.com>
 #
-"""This module provides a single function, :func:`plotColourBar`, which uses
+"""This module provides a single function, :func:`colourBarBitmap`, which uses
 :mod:`matplotlib` to plot a colour bar. The colour bar is rendered off-screen
 and returned as an rgba bitmap.
 """
@@ -81,11 +81,6 @@ def colourBarBitmap(cmap,
     ax.set_xticklabels(('{}'.format(vmin), '{}'.format(vmax)))
     ax.tick_params(colors=textColour, labelsize=fontsize)
 
-    minlbl, maxlbl = ax.get_xticklabels()
-
-    minlbl.set_horizontalalignment('left')
-    maxlbl.set_horizontalalignment('right')
-
     if labelside == 'top':
         ax.xaxis.tick_top()
         ax.xaxis.set_label_position('top')
@@ -94,6 +89,11 @@ def colourBarBitmap(cmap,
         ax.xaxis.tick_bottom()
         ax.xaxis.set_label_position('bottom') 
         va = 'bottom'
+
+    minlbl, maxlbl = ax.get_xticklabels()
+
+    minlbl.set_horizontalalignment('left')
+    maxlbl.set_horizontalalignment('right')
     
     if label is not None:
         ax.set_xlabel(label,