diff --git a/fsl/fsleyes/controls/histogramcontrolpanel.py b/fsl/fsleyes/controls/histogramcontrolpanel.py index 5162da680910817145d9ca684d78fedc0f359f52..238816b0016962dca5a51a974d1b36e60f25cd62 100644 --- a/fsl/fsleyes/controls/histogramcontrolpanel.py +++ b/fsl/fsleyes/controls/histogramcontrolpanel.py @@ -178,7 +178,13 @@ class HistogramControlPanel(fslpanel.FSLEyesPanel): self.__nbins = props.makeWidget(wlist, hs, 'nbins', showLimits=False) volume = props.makeWidget(wlist, hs, 'volume', showLimits=False) - dataRange = props.makeWidget(wlist, hs, 'dataRange', showLimits=False) + dataRange = props.makeWidget( + wlist, + hs, + 'dataRange', + showLimits=False, + labels=[strings.choices['HistogramPanel.dataRange.min'], + strings.choices['HistogramPanel.dataRange.max']]) ignoreZeros = props.makeWidget(wlist, hs, 'ignoreZeros') showOverlay = props.makeWidget(wlist, hs, 'showOverlay') diff --git a/fsl/fsleyes/controls/overlaydisplaypanel.py b/fsl/fsleyes/controls/overlaydisplaypanel.py index c7c0057cd18ddbdc817ddf3ef330b2c874cffeed..d7fd6745b6e57c9e350dd589b3b6db331555a56b 100644 --- a/fsl/fsleyes/controls/overlaydisplaypanel.py +++ b/fsl/fsleyes/controls/overlaydisplaypanel.py @@ -49,8 +49,16 @@ _DISPLAY_PROPS = td.TypeDict({ props.Widget('invertClipping', enabledWhen=lambda o, sw: not sw, dependencies=[(lambda o: o.display, 'softwareMode')]), - props.Widget('displayRange', showLimits=False, slider=True), - props.Widget('clippingRange', showLimits=False, slider=True)], + props.Widget('displayRange', + showLimits=False, + slider=True, + labels=[strings.choices['VolumeOpts.displayRange.min'], + strings.choices['VolumeOpts.displayRange.max']]), + props.Widget('clippingRange', + showLimits=False, + slider=True, + labels=[strings.choices['VolumeOpts.displayRange.min'], + strings.choices['VolumeOpts.displayRange.max']])], 'MaskOpts' : [ props.Widget('resolution', showLimits=False), diff --git a/fsl/fsleyes/controls/overlaydisplaytoolbar.py b/fsl/fsleyes/controls/overlaydisplaytoolbar.py index 28662091255a7e70c4089b72bd801abfebe0f3ae..360a931ff148e598f6740f82d7a955086a67fb59 100644 --- a/fsl/fsleyes/controls/overlaydisplaytoolbar.py +++ b/fsl/fsleyes/controls/overlaydisplaytoolbar.py @@ -97,7 +97,9 @@ _TOOLBAR_PROPS = td.TypeDict({ 'displayRange', slider=False, showLimits=False, - tooltip=_TOOLTIPS['VolumeOpts.displayRange']), + tooltip=_TOOLTIPS['VolumeOpts.displayRange'], + labels=[strings.choices['VolumeOpts.displayRange.min'], + strings.choices['VolumeOpts.displayRange.max']]), 'resetDisplayRange' : actions.ActionButton( 'resetDisplayRange', icon=icons.findImageFile('verticalReset24'), diff --git a/fsl/fsleyes/displaycontext/volumeopts.py b/fsl/fsleyes/displaycontext/volumeopts.py index fcd308c3f393643550aba3e0645e91820f3efbda..1c34d25a61cd0e61a4f36f3d02a57c83c34a94d6 100644 --- a/fsl/fsleyes/displaycontext/volumeopts.py +++ b/fsl/fsleyes/displaycontext/volumeopts.py @@ -322,17 +322,11 @@ class VolumeOpts(ImageOpts): """ - displayRange = props.Bounds( - ndims=1, - labels=[strings.choices['VolumeOpts.displayRange.min'], - strings.choices['VolumeOpts.displayRange.max']]) + displayRange = props.Bounds(ndims=1) """Image values which map to the minimum and maximum colour map colours.""" - clippingRange = props.Bounds( - ndims=1, - labels=[strings.choices['VolumeOpts.displayRange.min'], - strings.choices['VolumeOpts.displayRange.max']]) + clippingRange = props.Bounds(ndims=1) """Values outside of this range are not shown.""" diff --git a/fsl/fsleyes/views/histogrampanel.py b/fsl/fsleyes/views/histogrampanel.py index 7b438d999741d818d748fa02e5df72b826935133..00b5c564679fd16d748c791a13e1baa4b24d12a0 100644 --- a/fsl/fsleyes/views/histogrampanel.py +++ b/fsl/fsleyes/views/histogrampanel.py @@ -61,10 +61,7 @@ class HistogramSeries(plotpanel.DataSeries): showOverlay = props.Boolean(default=False) includeOutliers = props.Boolean(default=False) volume = props.Int(minval=0, maxval=0, clamped=True) - dataRange = props.Bounds( - ndims=1, - labels=[strings.choices['HistogramPanel.dataRange.min'], - strings.choices['HistogramPanel.dataRange.max']]) + dataRange = props.Bounds(ndims=1) def __init__(self,