Skip to content
Snippets Groups Projects
Commit fff73ac2 authored by Paul McCarthy's avatar Paul McCarthy
Browse files

OrthoProfileToolBar renamed to OrthoEditToolBar and givben tooltips.

parent 4c717e5d
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
fsl/data/strings.py
+ 2
− 2
View file @ fff73ac2
......@@ -135,7 +135,7 @@ titles = TypeDict({
'CanvasSettingsPanel' : 'View settings',
'OverlayDisplayPanel' : 'Display settings',
'OrthoToolBar' : 'Ortho view toolbar',
'OrthoProfileToolBar' : 'Ortho view edit toolbar',
'OrthoEditToolBar' : 'Ortho view edit toolbar',
'LightBoxToolBar' : 'Lightbox view toolbar',
'LookupTablePanel' : 'Lookup tables',
'LutLabelDialog' : 'New LUT label',
......@@ -176,7 +176,7 @@ actions = TypeDict({
'CanvasPanel.toggleShell' : 'Python shell',
'OrthoPanel.toggleOrthoToolBar' : 'View properties',
'OrthoPanel.toggleProfileToolBar' : 'Edit toolbar',
'OrthoPanel.toggleEditToolBar' : 'Edit toolbar',
'OrthoToolBar.more' : 'More settings',
'LightBoxToolBar.more' : 'More settings',
......
fsl/fsleyes/controls/__init__.py
+ 1
− 1
View file @ fff73ac2
......@@ -20,6 +20,6 @@ from overlayinfopanel import OverlayInfoPanel
from shellpanel import ShellPanel
from orthotoolbar import OrthoToolBar
from orthoprofiletoolbar import OrthoProfileToolBar
from orthoedittoolbar import OrthoEditToolBar
from lightboxtoolbar import LightBoxToolBar
from overlaydisplaytoolbar import OverlayDisplayToolBar
fsl/fsleyes/controls/orthoprofiletoolbar.py → fsl/fsleyes/controls/orthoedittoolbar.py
+ 260
− 0
View file @ fff73ac2
#!/usr/bin/env python
#
# orthoprofiletoolbar.py -
# orthoedittoolbar.py -
#
# Author: Paul McCarthy <pauldmccarthy@gmail.com>
#
import logging
import wx
import props
import fsl.fsleyes.toolbar as fsltoolbar
import fsl.fsleyes.actions as actions
import fsl.fsleyes.icons as icons
import fsl.data.strings as strings
import fsl.fsleyes.toolbar as fsltoolbar
import fsl.fsleyes.actions as actions
import fsl.fsleyes.icons as fslicons
import fsl.fsleyes.tooltips as fsltooltips
import fsl.data.strings as strings
from fsl.fsleyes.profiles.orthoeditprofile import OrthoEditProfile
......@@ -39,25 +38,64 @@ _LABELS = {
}
_ICONS = {
'view' : icons.findImageFile('eye24'),
'edit' : icons.findImageFile('pencil24'),
'selectionIs3D' : [icons.findImageFile('selection3D24'),
icons.findImageFile('selection2D24')],
'clearSelection' : icons.findImageFile('clear24'),
'undo' : icons.findImageFile('undo24'),
'redo' : icons.findImageFile('redo24'),
'fillSelection' : icons.findImageFile('fill24'),
'createMaskFromSelection' : icons.findImageFile('createMask24'),
'createROIFromSelection' : icons.findImageFile('createROI24'),
'limitToRadius' : icons.findImageFile('radius24'),
'localFill' : icons.findImageFile('localsearch24'),
'selint' : icons.findImageFile('selectByIntensity24'),
'view' : fslicons.findImageFile('eye24'),
'edit' : fslicons.findImageFile('pencil24'),
'selectionIs3D' : [fslicons.findImageFile('selection3D24'),
fslicons.findImageFile('selection2D24')],
'clearSelection' : fslicons.findImageFile('clear24'),
'undo' : fslicons.findImageFile('undo24'),
'redo' : fslicons.findImageFile('redo24'),
'fillSelection' : fslicons.findImageFile('fill24'),
'createMaskFromSelection' : fslicons.findImageFile('createMask24'),
'createROIFromSelection' : fslicons.findImageFile('createROI24'),
'limitToRadius' : fslicons.findImageFile('radius24'),
'localFill' : fslicons.findImageFile('localsearch24'),
'selint' : fslicons.findImageFile('selectByIntensity24'),
}
_TOOLTIPS = {
'profile' : fsltooltips.properties['OrthoPanel.profile'],
'selectionIs3D' : fsltooltips.properties['OrthoEditProfile.'
'selectionIs3D'],
'clearSelection' : fsltooltips.actions['OrthoEditProfile.'
'clearSelection'],
'undo' : fsltooltips.actions['OrthoEditProfile.'
'undo'],
'redo' : fsltooltips.actions['OrthoEditProfile.'
'redo'],
'fillSelection' : fsltooltips.actions['OrthoEditProfile.'
'fillSelection'],
'createMaskFromSelection' : fsltooltips.actions['OrthoEditProfile.'
'createMaskFromSelection'],
'createROIFromSelection' : fsltooltips.actions['OrthoEditProfile.'
'createROIFromSelection'],
'selint' : fsltooltips.properties['OrthoEditToolBar.'
'selint'],
'limitToRadius' : fsltooltips.properties['OrthoEditProfile.'
'limitToRadius'],
'searchRadius' : fsltooltips.properties['OrthoEditProfile.'
'searchRadius'],
'localFill' : fsltooltips.properties['OrthoEditProfile.'
'localFill'],
'selectionCursorColour' : fsltooltips.properties['OrthoEditProfile.sel'
'ectionCursorColour'],
'selectionOverlayColour' : fsltooltips.properties['OrthoEditProfile.sel'
'ectionOverlayColour'],
'selectionSize' : fsltooltips.properties['OrthoEditProfile.'
'selectionSize'],
'fillValue' : fsltooltips.properties['OrthoEditProfile.'
'fillValue'],
'intensityThres' : fsltooltips.properties['OrthoEditProfile.'
'intensityThres'],
}
_TOOLBAR_SPECS = {
'profile' : props.Widget(
'profile',
tooltip=_TOOLTIPS['profile'],
icons={
'view' : _ICONS['view'],
'edit' : _ICONS['edit']}),
......@@ -65,56 +103,88 @@ _TOOLBAR_SPECS = {
'view' : {},
'edit' : [
props.Widget('selectionIs3D',
enabledWhen=lambda p: p.mode in ['sel', 'desel'],
icon=_ICONS['selectionIs3D'],
toggle=True),
actions.ActionButton('clearSelection', icon=_ICONS['clearSelection']),
actions.ActionButton('undo', icon=_ICONS['undo']),
actions.ActionButton('redo', icon=_ICONS['redo']),
actions.ActionButton('fillSelection', icon=_ICONS['fillSelection']),
actions.ActionButton('createMaskFromSelection',
icon=_ICONS['createMaskFromSelection']),
actions.ActionButton('createROIFromSelection',
icon=_ICONS['createROIFromSelection']),
props.Widget('selint', icon=_ICONS['selint']),
props.Widget('limitToRadius',
icon=_ICONS['limitToRadius'],
enabledWhen=lambda p: p.mode == 'selint'),
props.Widget('localFill',
icon=_ICONS['localFill'],
enabledWhen=lambda p: p.mode == 'selint'),
props.Widget('selectionCursorColour',
label=_LABELS['selectionCursorColour']),
props.Widget('selectionOverlayColour',
label=_LABELS['selectionOverlayColour']),
props.Widget('selectionSize',
enabledWhen=lambda p: p.mode in ['sel', 'desel'],
label=_LABELS['selectionSize']),
props.Widget('fillValue', label=_LABELS['fillValue']),
props.Widget('intensityThres',
label=_LABELS['intensityThres'],
enabledWhen=lambda p: p.mode == 'selint'),
props.Widget('searchRadius',
label=_LABELS['searchRadius'],
enabledWhen=lambda p: p.mode == 'selint' and
p.limitToRadius)
props.Widget(
'selectionIs3D',
enabledWhen=lambda p: p.mode in ['sel', 'desel'],
icon=_ICONS['selectionIs3D'],
tooltip=_TOOLTIPS['selectionIs3D'],
toggle=True),
actions.ActionButton(
'clearSelection',
icon=_ICONS['clearSelection'],
tooltip=_TOOLTIPS['clearSelection']),
actions.ActionButton(
'undo',
icon=_ICONS['undo'],
tooltip=_TOOLTIPS['undo']),
actions.ActionButton(
'redo',
icon=_ICONS['redo'],
tooltip=_TOOLTIPS['redo']),
actions.ActionButton(
'fillSelection',
icon=_ICONS['fillSelection'],
tooltip=_TOOLTIPS['fillSelection']),
actions.ActionButton(
'createMaskFromSelection',
icon=_ICONS['createMaskFromSelection'],
tooltip=_TOOLTIPS['createMaskFromSelection']),
actions.ActionButton(
'createROIFromSelection',
icon=_ICONS['createROIFromSelection'],
tooltip=_TOOLTIPS['createROIFromSelection']),
props.Widget(
'selint',
icon=_ICONS['selint'],
tooltip=_TOOLTIPS['selint']),
props.Widget(
'limitToRadius',
icon=_ICONS['limitToRadius'],
tooltip=_TOOLTIPS['limitToRadius'],
enabledWhen=lambda p: p.mode == 'selint'),
props.Widget(
'localFill',
icon=_ICONS['localFill'],
tooltip=_TOOLTIPS['localFill'],
enabledWhen=lambda p: p.mode == 'selint'),
props.Widget(
'selectionCursorColour',
label=_LABELS['selectionCursorColour'],
tooltip=_TOOLTIPS['selectionCursorColour']),
props.Widget(
'selectionOverlayColour',
label=_LABELS['selectionOverlayColour'],
tooltip=_TOOLTIPS['selectionOverlayColour']),
props.Widget(
'selectionSize',
enabledWhen=lambda p: p.mode in ['sel', 'desel'],
label=_LABELS['selectionSize'],
tooltip=_TOOLTIPS['selectionSize']),
props.Widget(
'fillValue',
label=_LABELS['fillValue'],
tooltip=_TOOLTIPS['fillValue']),
props.Widget(
'intensityThres',
label=_LABELS['intensityThres'],
tooltip=_TOOLTIPS['intensityThres'],
enabledWhen=lambda p: p.mode == 'selint'),
props.Widget(
'searchRadius',
label=_LABELS['searchRadius'],
tooltip=_TOOLTIPS['searchRadius'],
enabledWhen=lambda p: p.mode == 'selint' and p.limitToRadius)
]
}
class OrthoProfileToolBar(fsltoolbar.FSLEyesToolBar):
class OrthoEditToolBar(fsltoolbar.FSLEyesToolBar):
selint = props.Boolean(default=False)
radius = props.Boolean(default=False)
def __init__(self, parent, overlayList, displayCtx, ortho):
fsltoolbar.FSLEyesToolBar.__init__(self,
......
fsl/fsleyes/tooltips.py
+ 26
− 14
View file @ fff73ac2
......@@ -194,8 +194,6 @@ properties = TypeDict({
# ViewPanels
'ViewPanel.profile' : '',
'CanvasPanel.syncLocation' : 'If checked, the location shown on '
'this panel will be linked to the '
'location shown on other panels (as '
......@@ -309,13 +307,14 @@ properties = TypeDict({
# Profiles
'OrthoPanel.profile' : 'Switch between view mode '
'and edit mode',
'OrthoEditProfile.selectionSize' : 'Size (in voxels) of the '
'selection region.',
'OrthoEditProfile.selectionIs3D' : 'If checked, the selection '
'region will be a 3D cube; '
'otherwise, it will be a'
'square in the plane of the '
'active canvas.' ,
'OrthoEditProfile.selectionIs3D' : 'Choose between a 2D square '
'selection in the plane of '
'the active canvas, or a 3D '
'cube.',
'OrthoEditProfile.selectionCursorColour' : 'Colour to use for the '
'selection cursor.',
'OrthoEditProfile.selectionOverlayColour' : 'Colour to use to highlight '
......@@ -329,14 +328,16 @@ properties = TypeDict({
'values for the purpose of '
'the search.',
'OrthoEditProfile.localFill' : 'If selecting by intensity, '
'voxels must be adjacent to '
'an already selected voxel '
'to be conxidered in the '
'search. Otherwise, all '
'voxels in the search radius '
'are considered.',
'only select voxels which are '
'adjacent to an already '
'selected voxel',
'OrthoEditProfile.limitToRadius' : 'If selecting by intensity, '
'limit the search to a sphere '
'of the specified radius.',
'OrthoEditProfile.searchRadius' : 'Limit the search to the '
'specified radius.',
'specified radius.',
'OrthoEditToolBar.selint' : 'Select voxels based on similar intensities',
})
......@@ -348,6 +349,17 @@ actions = TypeDict({
'OrthoViewProfile.resetZoom' : 'Reset zoom level to 100%',
'OrthoViewProfile.centreCursor' : 'Reset location to centre of scene',
'OrthoEditProfile.undo' : 'Undo the most recent action',
'OrthoEditProfile.redo' : 'Redo the most recent '
'undone action',
'OrthoEditProfile.fillSelection' : 'Fill the selection with '
'the current fill value',
'OrthoEditProfile.clearSelection' : 'Clear the current selection',
'OrthoEditProfile.createMaskFromSelection' : 'Create a new mask overlay '
'from the current selection',
'OrthoEditProfile.createROIFromSelection' : 'Create a new ROI overlay '
'from the current selection',
})
......
fsl/fsleyes/views/orthopanel.py
+ 4
− 4
View file @ fff73ac2
......@@ -25,7 +25,7 @@ import fsl.fsleyes.colourmaps as colourmaps
import fsl.fsleyes.gl.wxglslicecanvas as slicecanvas
import fsl.fsleyes.controls.overlaydisplaytoolbar as overlaydisplaytoolbar
import fsl.fsleyes.controls.orthotoolbar as orthotoolbar
import fsl.fsleyes.controls.orthoprofiletoolbar as orthoprofiletoolbar
import fsl.fsleyes.controls.orthoedittoolbar as orthoedittoolbar
import fsl.fsleyes.displaycontext.orthoopts as orthoopts
import canvaspanel
......@@ -48,8 +48,8 @@ class OrthoPanel(canvaspanel.CanvasPanel):
actionz = {
'toggleOrthoToolBar' : lambda *a: self.togglePanel(
orthotoolbar.OrthoToolBar, ortho=self),
'toggleProfileToolBar' : lambda *a: self.togglePanel(
orthoprofiletoolbar.OrthoProfileToolBar, ortho=self),
'toggleEditToolBar' : lambda *a: self.togglePanel(
orthoedittoolbar.OrthoEditToolBar, ortho=self),
}
canvaspanel.CanvasPanel.__init__(self,
......@@ -183,7 +183,7 @@ class OrthoPanel(canvaspanel.CanvasPanel):
viewPanel=self)
self.togglePanel(orthotoolbar.OrthoToolBar,
ortho=self)
self.togglePanel(orthoprofiletoolbar.OrthoProfileToolBar,
self.togglePanel(orthoedittoolbar.OrthoEditToolBar,
ortho=self)
wx.CallAfter(addToolbars)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment