diff --git a/README b/README
index 708d50b6914d6c2851cfada0016a0af48ce42353..596ee2daa2972eb51736976d006d868a49102a30 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ Dependencies:
- matplotlib 1.3.1
- nibabel 1.3.0
- Pillow 2.5.3 (for screenshots of any type other than PNG)
-
+ - PyParsing 2.0.3
- wxPython 3.0.0.0
- OSMesa 6.5.3 (for off-screen rendering)
@@ -17,7 +17,11 @@ Dependencies:
- OpenGL 1.4, with the following extensions:
- ARB_vertex_program
- ARB_fragment_program
- - OpenGL 2.1
+ - EXT_framebuffer_object
+ - OpenGL 2.1, with the following extensions:
+ - EXT_framebuffer_object
+ - ARB_instanced_arrays
+ - ARB_draw_instanced
Some of the icons are derived from the Freeline icon set, by Enes Dal,
available at https://www.iconfinder.com/Enesdal, and released under the
diff --git a/fsl/fsleyes/controls/lightboxtoolbar.py b/fsl/fsleyes/controls/lightboxtoolbar.py
index ea72863e9c209c0819cbe1ce67c0f568537fb382..ae7d38d819c4b676042a30e76c75a7b4078e6396 100644
--- a/fsl/fsleyes/controls/lightboxtoolbar.py
+++ b/fsl/fsleyes/controls/lightboxtoolbar.py
@@ -60,8 +60,8 @@ class LightBoxToolBar(fsltoolbar.FSLEyesToolBar):
fslicons.findImageFile('movieHighlight24'),
fslicons.findImageFile('movie24')],
'toggleCanvasSettingsPanel' : [
- fslicons.findImageFile('gearHighlight24'),
- fslicons.findImageFile('gear24')],
+ fslicons.findImageFile('spannerHighlight24'),
+ fslicons.findImageFile('spanner24')],
'zax' : {
0 : [fslicons.findImageFile('sagittalSliceHighlight24'),
diff --git a/fsl/fsleyes/controls/orthotoolbar.py b/fsl/fsleyes/controls/orthotoolbar.py
index 2b2065829ec2da38400d4af7ef6263c57cb478df..297aa8cd63562ba0d8a01b0bb4ca948ff5d10380 100644
--- a/fsl/fsleyes/controls/orthotoolbar.py
+++ b/fsl/fsleyes/controls/orthotoolbar.py
@@ -98,8 +98,8 @@ class OrthoToolBar(fsltoolbar.FSLEyesToolBar):
fslicons.findImageFile('axialSliceHighlight24'),
fslicons.findImageFile('axialSlice24')],
'toggleCanvasSettingsPanel' : [
- fslicons.findImageFile('gearHighlight24'),
- fslicons.findImageFile('gear24')],
+ fslicons.findImageFile('spannerHighlight24'),
+ fslicons.findImageFile('spanner24')],
'resetZoom' : fslicons.findImageFile('resetZoom24'),
'centreCursor' : fslicons.findImageFile('centre24'),
diff --git a/fsl/fsleyes/controls/overlaydisplaytoolbar.py b/fsl/fsleyes/controls/overlaydisplaytoolbar.py
index 5bc7e5eeb665f6c761a6c489afc3134f99837db2..bf8d6c0fb08f807929f2d1e49812d0b7f42f83c9 100644
--- a/fsl/fsleyes/controls/overlaydisplaytoolbar.py
+++ b/fsl/fsleyes/controls/overlaydisplaytoolbar.py
@@ -217,7 +217,15 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
briSpec = dispSpecs['brightness']
conSpec = dispSpecs['contrast']
- # Button which toggles overlay info
+ # Buttons which toggle overlay
+ # info and display panel
+ panelSpec = actions.ToggleActionButton(
+ 'toggleDisplayPanel',
+ actionKwargs={'floatPane' : True},
+ icon=[icons.findImageFile('gearHighlight24'),
+ icons.findImageFile('gear24')],
+ tooltip=fsltooltips.actions[viewPanel, 'toggleDisplayPanel'])
+
infoSpec = actions.ToggleActionButton(
'toggleOverlayInfo',
actionKwargs={'floatPane' : True},
@@ -236,7 +244,8 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
nameTypePanel.SetSizer(nameTypeSizer)
briconPanel .SetSizer(briconSizer)
-
+
+ panelWidget = props.buildGUI(self, viewPanel, panelSpec)
infoWidget = props.buildGUI(self, viewPanel, infoSpec)
nameWidget = props.buildGUI(nameTypePanel, display, nameSpec)
typeWidget = props.buildGUI(nameTypePanel, display, typeSpec)
@@ -264,7 +273,11 @@ class OverlayDisplayToolBar(fsltoolbar.FSLEyesToolBar):
briconSizer.Add(conLabel)
briconSizer.Add(conWidget)
- return [infoWidget, nameTypePanel, alphaPanel, briconPanel]
+ return [panelWidget,
+ infoWidget,
+ nameTypePanel,
+ alphaPanel,
+ briconPanel]
def __makeVolumeOptsTools(self, opts):
diff --git a/fsl/fsleyes/icons/sources/spanner.xcf b/fsl/fsleyes/icons/sources/spanner.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..dda3bce71f7a68ee3730ce854ddf80e650e6072c
Binary files /dev/null and b/fsl/fsleyes/icons/sources/spanner.xcf differ
diff --git a/fsl/fsleyes/icons/sources/spannerHighlight.xcf b/fsl/fsleyes/icons/sources/spannerHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..c9269a5f7a606ba80bab9f9e5fd1991d24e50d39
Binary files /dev/null and b/fsl/fsleyes/icons/sources/spannerHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/spanner24.png b/fsl/fsleyes/icons/spanner24.png
new file mode 100644
index 0000000000000000000000000000000000000000..d97cf6b861e981c72369a3c5fd33bd79c7f8d21a
Binary files /dev/null and b/fsl/fsleyes/icons/spanner24.png differ
diff --git a/fsl/fsleyes/icons/spanner24@2x.png b/fsl/fsleyes/icons/spanner24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c2df6f1e369c98d7f965badd16872e48a06fe45
Binary files /dev/null and b/fsl/fsleyes/icons/spanner24@2x.png differ
diff --git a/fsl/fsleyes/icons/spannerHighlight24.png b/fsl/fsleyes/icons/spannerHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..09e37fa9a9e30a9f773c4df7ab4b82604efeafac
Binary files /dev/null and b/fsl/fsleyes/icons/spannerHighlight24.png differ
diff --git a/fsl/fsleyes/icons/spannerHighlight24@2x.png b/fsl/fsleyes/icons/spannerHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..101fe904e3cfeb7c05d4aadcb381f974234d8337
Binary files /dev/null and b/fsl/fsleyes/icons/spannerHighlight24@2x.png differ