From f2da12d66151b21989a4721bad8dedfc8eed2c44 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauld.mccarthy@gmail.com>
Date: Tue, 30 Jun 2015 11:01:24 +0100
Subject: [PATCH] Fixed histogram display range reset on 3D histogram overlay
enabling. Was caused by bug in the props bindable module.
---
fsl/fslview/displaycontext/displaycontext.py | 2 ++
fsl/fslview/views/histogrampanel.py | 4 +---
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/fsl/fslview/displaycontext/displaycontext.py b/fsl/fslview/displaycontext/displaycontext.py
index 680f75c93..cf527f473 100644
--- a/fsl/fslview/displaycontext/displaycontext.py
+++ b/fsl/fslview/displaycontext/displaycontext.py
@@ -119,6 +119,8 @@ class DisplayContext(props.SyncableHasProperties):
dParent = None
else:
dParent = self.getParent().getDisplay(overlay, overlayType)
+ if overlayType is None:
+ overlayType = dParent.overlayType
display = fsldisplay.Display(overlay,
self.__overlayList,
diff --git a/fsl/fslview/views/histogrampanel.py b/fsl/fslview/views/histogrampanel.py
index 92294a5e5..0eb7a8f99 100644
--- a/fsl/fslview/views/histogrampanel.py
+++ b/fsl/fslview/views/histogrampanel.py
@@ -162,11 +162,8 @@ class HistogramSeries(plotpanel.DataSeries):
self.overlayList.append(self.overlay3D)
- print 'Appended new mask overlay'
opts = self.displayCtx.getOpts(self.overlay3D, overlayType='mask')
- print 'Got overlay options'
-
opts.bindProps('volume', self)
opts.bindProps('colour', self)
opts.bindProps('threshold', self, 'dataRange')
@@ -250,6 +247,7 @@ class HistogramPanel(plotpanel.PlotPanel):
"""De-registers property listeners. """
plotpanel.PlotPanel.destroy(self)
+ self.removeGlobalListener(self._name)
self._overlayList.removeListener('overlays', self._name)
self._displayCtx .removeListener('selectedOverlay', self._name)
--
GitLab