diff --git a/fsl/fsleyes/actions/__init__.py b/fsl/fsleyes/actions/__init__.py
index 96ae092e3fe2cf4c3dafd94943e43808576be640..4cea8ced3e0c48f7502932fec878f9fee270213f 100644
--- a/fsl/fsleyes/actions/__init__.py
+++ b/fsl/fsleyes/actions/__init__.py
@@ -478,7 +478,7 @@ class ToggleActionButton(props.Toggle):
elif isinstance(widget, wx.ToggleButton):
ev = wx.EVT_TOGGLEBUTTON
elif isinstance(widget, bmptoggle.BitmapToggleButton):
- ev = bmptoggle.EVT_BITMAP_TOGGLE_EVENT
+ ev = bmptoggle.EVT_BITMAP_TOGGLE
else:
raise RuntimeError(
diff --git a/fsl/fsleyes/controls/lightboxtoolbar.py b/fsl/fsleyes/controls/lightboxtoolbar.py
index 7ea284a98db45daae5d6b386ae9074e5ac23c9c8..ea72863e9c209c0819cbe1ce67c0f568537fb382 100644
--- a/fsl/fsleyes/controls/lightboxtoolbar.py
+++ b/fsl/fsleyes/controls/lightboxtoolbar.py
@@ -56,13 +56,20 @@ class LightBoxToolBar(fsltoolbar.FSLEyesToolBar):
icons = {
'screenshot' : fslicons.findImageFile('camera24'),
- 'movieMode' : fslicons.findImageFile('movie24'),
- 'toggleCanvasSettingsPanel' : fslicons.findImageFile('gear24'),
+ 'movieMode' : [
+ fslicons.findImageFile('movieHighlight24'),
+ fslicons.findImageFile('movie24')],
+ 'toggleCanvasSettingsPanel' : [
+ fslicons.findImageFile('gearHighlight24'),
+ fslicons.findImageFile('gear24')],
'zax' : {
- 0 : fslicons.findImageFile('sagittalSlice24'),
- 1 : fslicons.findImageFile('coronalSlice24'),
- 2 : fslicons.findImageFile('axialSlice24'),
+ 0 : [fslicons.findImageFile('sagittalSliceHighlight24'),
+ fslicons.findImageFile('sagittalSlice24')],
+ 1 : [fslicons.findImageFile('coronalSliceHighlight24'),
+ fslicons.findImageFile('coronalSlice24')],
+ 2 : [fslicons.findImageFile('axialSliceHighlight24'),
+ fslicons.findImageFile('axialSlice24')],
}
}
diff --git a/fsl/fsleyes/controls/orthotoolbar.py b/fsl/fsleyes/controls/orthotoolbar.py
index 54692e4e727bdc5e6ba6546db7404d2c6b8b2648..2b2065829ec2da38400d4af7ef6263c57cb478df 100644
--- a/fsl/fsleyes/controls/orthotoolbar.py
+++ b/fsl/fsleyes/controls/orthotoolbar.py
@@ -85,20 +85,35 @@ class OrthoToolBar(fsltoolbar.FSLEyesToolBar):
icons = {
'screenshot' : fslicons.findImageFile('camera24'),
- 'movieMode' : fslicons.findImageFile('movie24'),
- 'showXCanvas' : fslicons.findImageFile('sagittalSlice24'),
- 'showYCanvas' : fslicons.findImageFile('coronalSlice24'),
- 'showZCanvas' : fslicons.findImageFile('axialSlice24'),
- 'toggleCanvasSettingsPanel' : fslicons.findImageFile('gear24'),
+ 'movieMode' : [
+ fslicons.findImageFile('movieHighlight24'),
+ fslicons.findImageFile('movie24')],
+ 'showXCanvas' : [
+ fslicons.findImageFile('sagittalSliceHighlight24'),
+ fslicons.findImageFile('sagittalSlice24')],
+ 'showYCanvas' : [
+ fslicons.findImageFile('coronalSliceHighlight24'),
+ fslicons.findImageFile('coronalSlice24')],
+ 'showZCanvas' : [
+ fslicons.findImageFile('axialSliceHighlight24'),
+ fslicons.findImageFile('axialSlice24')],
+ 'toggleCanvasSettingsPanel' : [
+ fslicons.findImageFile('gearHighlight24'),
+ fslicons.findImageFile('gear24')],
'resetZoom' : fslicons.findImageFile('resetZoom24'),
'centreCursor' : fslicons.findImageFile('centre24'),
'layout' : {
- 'horizontal' : fslicons.findImageFile('horizontalLayout24'),
- 'vertical' : fslicons.findImageFile('verticalLayout24'),
- 'grid' : fslicons.findImageFile('gridLayout24'),
- }
+ 'horizontal' : [
+ fslicons.findImageFile('horizontalLayoutHighlight24'),
+ fslicons.findImageFile('horizontalLayout24')],
+ 'vertical' : [
+ fslicons.findImageFile('verticalLayoutHighlight24'),
+ fslicons.findImageFile('verticalLayout24')],
+ 'grid' : [
+ fslicons.findImageFile('gridLayoutHighlight24'),
+ fslicons.findImageFile('gridLayout24')]}
}
tooltips = {
diff --git a/fsl/fsleyes/gl/lightboxcanvas.py b/fsl/fsleyes/gl/lightboxcanvas.py
index 27a296dd96269733f9345bd50277c91a4570009e..7a635279cd950abc324043eb44775c40baacb619 100644
--- a/fsl/fsleyes/gl/lightboxcanvas.py
+++ b/fsl/fsleyes/gl/lightboxcanvas.py
@@ -242,7 +242,7 @@ class LightBoxCanvas(slicecanvas.SliceCanvas):
displayCtx = self.displayCtx
opts = displayCtx.getOpts(overlay)
overlay = displayCtx.getReferenceImage(overlay)
- zmin, zmax = opts.bounds.getLimits(self.zax)
+ zmin, zmax = opts.bounds.getRange(self.zax)
# If the overlay does not have a
# reference NIFTI1 image, choose
diff --git a/fsl/fsleyes/icons/axialSliceHighlight24.png b/fsl/fsleyes/icons/axialSliceHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..2b11c4adb96b92db4688a15026a977b4a46486ea
Binary files /dev/null and b/fsl/fsleyes/icons/axialSliceHighlight24.png differ
diff --git a/fsl/fsleyes/icons/axialSliceHighlight24@2x.png b/fsl/fsleyes/icons/axialSliceHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad28fda27e7c741e75c433d186be0f50b9cc372a
Binary files /dev/null and b/fsl/fsleyes/icons/axialSliceHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/coronalSliceHighlight24.png b/fsl/fsleyes/icons/coronalSliceHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..d3dd592434cfd67f02e3fe430394154684648c23
Binary files /dev/null and b/fsl/fsleyes/icons/coronalSliceHighlight24.png differ
diff --git a/fsl/fsleyes/icons/coronalSliceHighlight24@2x.png b/fsl/fsleyes/icons/coronalSliceHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..83b5663b60f53de261601d9f9ec14efbdb1c8671
Binary files /dev/null and b/fsl/fsleyes/icons/coronalSliceHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/gearHighlight24.png b/fsl/fsleyes/icons/gearHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1c2ad633bc694c57eb3bce9f6851afe3afa3679
Binary files /dev/null and b/fsl/fsleyes/icons/gearHighlight24.png differ
diff --git a/fsl/fsleyes/icons/gearHighlight24@2x.png b/fsl/fsleyes/icons/gearHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..db0cacfa5ff61a67e166d5e33c76b7aa95f4f5af
Binary files /dev/null and b/fsl/fsleyes/icons/gearHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/gridLayoutHighlight24.png b/fsl/fsleyes/icons/gridLayoutHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d37c8ac0cda452029aa2573f3e00b2f2dfa5589
Binary files /dev/null and b/fsl/fsleyes/icons/gridLayoutHighlight24.png differ
diff --git a/fsl/fsleyes/icons/gridLayoutHighlight24@2x.png b/fsl/fsleyes/icons/gridLayoutHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..030c6cf97f416d8b3108aa2fbbaff65bfc53acd5
Binary files /dev/null and b/fsl/fsleyes/icons/gridLayoutHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/horizontalLayoutHighlight24.png b/fsl/fsleyes/icons/horizontalLayoutHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..95bc9e479f09e262a9064770f12438cb9bf9d3ca
Binary files /dev/null and b/fsl/fsleyes/icons/horizontalLayoutHighlight24.png differ
diff --git a/fsl/fsleyes/icons/horizontalLayoutHighlight24@2x.png b/fsl/fsleyes/icons/horizontalLayoutHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..f58fad6057eff04903d968c0ddd70429c6824c56
Binary files /dev/null and b/fsl/fsleyes/icons/horizontalLayoutHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/movieHighlight24.png b/fsl/fsleyes/icons/movieHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..116a0a3d850065e27dd5d6a4407b660b85c742ac
Binary files /dev/null and b/fsl/fsleyes/icons/movieHighlight24.png differ
diff --git a/fsl/fsleyes/icons/movieHighlight24@2x.png b/fsl/fsleyes/icons/movieHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e730856a343cc508b4af0197a1134866fc3c840
Binary files /dev/null and b/fsl/fsleyes/icons/movieHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/sagittalSliceHighlight24.png b/fsl/fsleyes/icons/sagittalSliceHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d23446b5e64ce613f3e24ed74821fab7804dc48
Binary files /dev/null and b/fsl/fsleyes/icons/sagittalSliceHighlight24.png differ
diff --git a/fsl/fsleyes/icons/sagittalSliceHighlight24@2x.png b/fsl/fsleyes/icons/sagittalSliceHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..054049dccbf494c47266ce5d2e1ad5427096de97
Binary files /dev/null and b/fsl/fsleyes/icons/sagittalSliceHighlight24@2x.png differ
diff --git a/fsl/fsleyes/icons/sources/axialSliceHighlight.xcf b/fsl/fsleyes/icons/sources/axialSliceHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..b4b51c8df4309f1464310467685c7ef1255362f8
Binary files /dev/null and b/fsl/fsleyes/icons/sources/axialSliceHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/coronalSliceHighlight.xcf b/fsl/fsleyes/icons/sources/coronalSliceHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..a63d5cd81ab29a12dab27f62bcd2fca1904b29f0
Binary files /dev/null and b/fsl/fsleyes/icons/sources/coronalSliceHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/gearHighlight.xcf b/fsl/fsleyes/icons/sources/gearHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..9400b24f4511198c27dbca0edec6ad03e574a282
Binary files /dev/null and b/fsl/fsleyes/icons/sources/gearHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/gridLayoutHighlight.xcf b/fsl/fsleyes/icons/sources/gridLayoutHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..3b838aaebbca911d71ada2625a6f1953a41c9f75
Binary files /dev/null and b/fsl/fsleyes/icons/sources/gridLayoutHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/horizontalLayoutHighlight.xcf b/fsl/fsleyes/icons/sources/horizontalLayoutHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..fa30c880b7d25c90ad2f1a100a60372ba0c5f85f
Binary files /dev/null and b/fsl/fsleyes/icons/sources/horizontalLayoutHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/movie.xcf b/fsl/fsleyes/icons/sources/movie.xcf
index a0ee9daf4b901adb82218b4d1881761f11c8cdff..2f769371acd22d28876f24042bb5861a80bbf98b 100644
Binary files a/fsl/fsleyes/icons/sources/movie.xcf and b/fsl/fsleyes/icons/sources/movie.xcf differ
diff --git a/fsl/fsleyes/icons/sources/movieHighlight.xcf b/fsl/fsleyes/icons/sources/movieHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..8fee442c097426568c9de9de3e8e7dee8ede1958
Binary files /dev/null and b/fsl/fsleyes/icons/sources/movieHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/sagittalSliceHighlight.xcf b/fsl/fsleyes/icons/sources/sagittalSliceHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..70dc23c3946c1fd143612e99834476362ecb606f
Binary files /dev/null and b/fsl/fsleyes/icons/sources/sagittalSliceHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/sources/verticalLayoutHighlight.xcf b/fsl/fsleyes/icons/sources/verticalLayoutHighlight.xcf
new file mode 100644
index 0000000000000000000000000000000000000000..b6cca76765f449237f886cf95062a1b28592f05c
Binary files /dev/null and b/fsl/fsleyes/icons/sources/verticalLayoutHighlight.xcf differ
diff --git a/fsl/fsleyes/icons/verticalLayoutHighlight24.png b/fsl/fsleyes/icons/verticalLayoutHighlight24.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef9f1cbafe084f8ef7d471ca61772566429bf1bf
Binary files /dev/null and b/fsl/fsleyes/icons/verticalLayoutHighlight24.png differ
diff --git a/fsl/fsleyes/icons/verticalLayoutHighlight24@2x.png b/fsl/fsleyes/icons/verticalLayoutHighlight24@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4876ae9c1761c483aed22cc930c58734f9f88bb
Binary files /dev/null and b/fsl/fsleyes/icons/verticalLayoutHighlight24@2x.png differ