Refactored icon management, because of stupied OSX retina display.

fsl/fslview/controls/orthotoolbar.py

@@ -27,16 +27,16 @@ class OrthoToolBar(fsltoolbar.FSLViewToolBar):
         orthoOpts = ortho.getSceneOptions()
 
         icns = {
-            'screenshot'  : icons.findImageFile('camera',        32)[0],
-            'showXCanvas' : icons.findImageFile('sagittalSlice', 32)[0],
-            'showYCanvas' : icons.findImageFile('coronalSlice',  32)[0],
-            'showZCanvas' : icons.findImageFile('axialSlice',    32)[0],
-            'more'        : icons.findImageFile('gear',          32)[0],
+            'screenshot'  : icons.findImageFile('camera'),
+            'showXCanvas' : icons.findImageFile('sagittalSlice'),
+            'showYCanvas' : icons.findImageFile('coronalSlice'),
+            'showZCanvas' : icons.findImageFile('axialSlice'),
+            'more'        : icons.findImageFile('gear'),
 
             'layout' : {
-                'horizontal' : icons.findImageFile('horizontalLayout', 32)[0],
-                'vertical'   : icons.findImageFile('verticalLayout',   32)[0],
-                'grid'       : icons.findImageFile('gridLayout',       32)[0],
+                'horizontal' : icons.findImageFile('horizontalLayout'),
+                'vertical'   : icons.findImageFile('verticalLayout'),
+                'grid'       : icons.findImageFile('gridLayout'),
             }
         }
 

fsl/fslview/controls/overlaydisplaytoolbar.py

@@ -16,6 +16,7 @@ import wx
 import props
 
 import fsl.fslview.toolbar as fsltoolbar
+import fsl.fslview.icons   as icons
 import fsl.fslview.actions as actions
 import fsl.utils.typedict  as td
 import overlaydisplaypanel as overlaydisplay
@@ -36,7 +37,9 @@ _TOOLBAR_PROPS = td.TypeDict({
     'VolumeOpts' : [
         props.Widget('cmap'),
         props.Widget('displayRange', showLimits=False),
-        actions.ActionButton('VolumeOpts', 'resetDisplayRange')],
+        actions.ActionButton('VolumeOpts',
+                             'resetDisplayRange',
+                             icon=icons.findImageFile('resetRange'))],
     
 
     'MaskOpts' : [
@@ -183,7 +186,9 @@ class OverlayDisplayToolBar(fsltoolbar.FSLViewToolBar):
         more = props.buildGUI(
             self,
             self,
-            view=actions.ActionButton(self, 'more'))
+            view=actions.ActionButton(self,
+                                      'more',
+                                      icon=icons.findImageFile('gear32')))
 
         tools .append(more)
         labels.append(None)

fsl/fslview/controls/overlaylistpanel.py

@@ -46,14 +46,14 @@ class ListItemWidget(wx.Panel):
         self.saveButton = wx.Button(      self, style=btnStyle)
         self.lockButton = wx.ToggleButton(self, style=btnStyle)
 
-        self.saveButton.SetBitmap(icons.loadBitmap('floppydisk', 20))
-        self.lockButton.SetBitmap(icons.loadBitmap('chainlink', 20))
+        self.saveButton.SetBitmap(icons.loadBitmap('floppydisk'))
+        self.lockButton.SetBitmap(icons.loadBitmap('chainlink'))
         
         self.visibility = props.makeWidget(
             self,
             display,
             'enabled',
-            icon=icons.findImageFile('eye', 20)[0])
+            icon=icons.findImageFile('eye'))
 
         self.sizer = wx.BoxSizer(wx.HORIZONTAL)
 

fsl/fslview/icons.py

@@ -5,7 +5,6 @@
 # Author: Paul McCarthy <pauldmccarthy@gmail.com>
 #
 import os.path as op
-import glob
 
 import wx
 
@@ -13,21 +12,8 @@ import wx
 _bitmapPath = op.join(op.dirname(__file__), 'icons')
 
 
-def findImageFile(iconId, size):
-
-    path      = op.join(_bitmapPath, '{}_*png'.format(iconId))
-    files     = glob.glob(path)
-    fileNames = map(op.basename, files)
-    filePrefs = [op.splitext(f)[0] for f in fileNames]
-    sizes     = map(int, [fp.split('_')[1] for fp in filePrefs])
-
-    if len(sizes) == 0:
-        raise ValueError('Invalid icon ID: {}'.format(iconId))
-
-    sizeDiffs = map(abs, [s - size for s in sizes])
-    idx       = sizeDiffs.index(min(sizeDiffs))
-
-    return files[idx], sizes[idx]
+def findImageFile(iconId):
+    return op.join(_bitmapPath, '{}.png'.format(iconId))
 
 
 def _resizeImage(image, size):
@@ -45,14 +31,10 @@ def _resizeImage(image, size):
     return image
 
 
-def loadImage(iconId, size=None):
-
-    filename, fSize = findImageFile(iconId, size)
-    img             = wx.Image(filename)
-
-    if fSize != size: return _resizeImage(img, size)
-    else:             return img
+def loadBitmap(iconId):
 
+    filename = findImageFile(iconId)
+    bmp = wx.EmptyBitmap(1, 1)
+    bmp.LoadFile(filename, wx.BITMAP_TYPE_PNG)
 
-def loadBitmap(iconId, size=None):
-    return wx.BitmapFromImage(loadImage(iconId, size))
+    return bmp