Removed showOverlay option from HistogramPanel - it is to be an option

on the HistogramSeries class.

fsl/data/strings.py

@@ -246,16 +246,15 @@ properties = TypeDict({
     'TimeSeriesPanel.usePixdim'   : 'Use pixdims',
     'TimeSeriesPanel.showCurrent' : 'Plot time series for current voxel',
     
-    'HistogramPanel.histType'      : 'Histogram type',
-    'HistogramPanel.autoBin'       : 'Automatic histogram binning', 
-    'HistogramPanel.showCurrent'   : 'Plot histogram for current overlay',
-    'HistogramPanel.enableOverlay' : 'Enable 3D histogram overlay',
-
+    'HistogramPanel.histType'    : 'Histogram type',
+    'HistogramPanel.autoBin'     : 'Automatic histogram binning', 
+    'HistogramPanel.showCurrent' : 'Plot histogram for current overlay',
+    
     'HistogramSeries.nbins'       : 'Number of bins',
     'HistogramSeries.ignoreZeros' : 'Ignore zeros',
     'HistogramSeries.volume'      : 'Volume',
     'HistogramSeries.dataRange'   : 'Data range',
-    
+    'HistogramSeries.showOverlay' : 'Show 3D histogram overlay',
 
     'OrthoEditProfile.selectionSize'          : 'Selection size',
     'OrthoEditProfile.selectionIs3D'          : '3D selection',

fsl/fslview/controls/histogramcontrolpanel.py

@@ -25,32 +25,28 @@ class HistogramControlPanel(fslpanel.FSLViewPanel):
             self, overlayList, displayCtx, hsPanel)
         self.__plotControl.SetWindowStyleFlag(wx.SUNKEN_BORDER)
 
+        self.__histType      = props.makeWidget(self, hsPanel, 'histType')
         self.__autoBin       = props.makeWidget(self, hsPanel, 'autoBin')
         self.__showCurrent   = props.makeWidget(self, hsPanel, 'showCurrent')
-        self.__histType      = props.makeWidget(self, hsPanel, 'histType')
-        self.__enableOverlay = props.makeWidget(self, hsPanel, 'enableOverlay')
 
         self.__histTypeLabel = wx.StaticText(self)
 
+        self.__histTypeLabel.SetLabel(strings.properties[hsPanel,
+                                                         'histType'])
         self.__autoBin      .SetLabel(strings.properties[hsPanel,
                                                          'autoBin'])
         self.__showCurrent  .SetLabel(strings.properties[hsPanel,
                                                          'showCurrent'])
-        self.__enableOverlay.SetLabel(strings.properties[hsPanel,
-                                                         'enableOverlay'])
-        self.__histTypeLabel.SetLabel(strings.properties[hsPanel,
-                                                         'histType'])
 
         self.__htSizer = wx.BoxSizer(wx.HORIZONTAL)
         self.__htSizer.Add(self.__histTypeLabel, flag=wx.EXPAND)
         self.__htSizer.Add(self.__histType,      flag=wx.EXPAND, proportion=1)
  
-        self.__optSizer = wx.GridSizer(2, 2)
+        self.__optSizer = wx.GridSizer(1, 3)
 
+        self.__optSizer.Add(self.__htSizer,       flag=wx.EXPAND)
         self.__optSizer.Add(self.__autoBin,       flag=wx.EXPAND)
         self.__optSizer.Add(self.__showCurrent,   flag=wx.EXPAND)
-        self.__optSizer.Add(self.__htSizer,       flag=wx.EXPAND)
-        self.__optSizer.Add(self.__enableOverlay, flag=wx.EXPAND)
 
         self.__sizer = wx.BoxSizer(wx.VERTICAL)
         self.SetSizer(self.__sizer)

fsl/fslview/views/histogrampanel.py

@@ -54,6 +54,7 @@ class HistogramSeries(plotpanel.DataSeries):
 
     nbins       = props.Int(minval=10, maxval=500, default=100, clamped=True)
     ignoreZeros = props.Boolean(default=True)
+    showOverlay = props.Boolean(default=False)
     volume      = props.Int(minval=0, maxval=0, clamped=True)
     dataRange   = props.Bounds(
         ndims=1,
@@ -152,10 +153,9 @@ class HistogramSeries(plotpanel.DataSeries):
 class HistogramPanel(plotpanel.PlotPanel):
 
 
-    autoBin       = props.Boolean(default=True)
-    showCurrent   = props.Boolean(default=True)
-    enableOverlay = props.Boolean(default=False)
-    histType      = props.Choice(('probability', 'count'))
+    autoBin     = props.Boolean(default=True)
+    showCurrent = props.Boolean(default=True)
+    histType    = props.Choice(('probability', 'count'))
     
 
     def __init__(self, parent, overlayList, displayCtx):
@@ -188,10 +188,10 @@ class HistogramPanel(plotpanel.PlotPanel):
         # HistogramPanel property changes.
         self.addGlobalListener(self._name, self.draw)
 
-        # But a separate listener for autoBin -
-        # this overwrites the one added by the
-        # addGlobalListener method above. See
-        # the __autoBinChanged method.
+        # Custom listener for autoBin - this
+        # overwrites the one added by the
+        # addGlobalListener method above.
+        # See the __autoBinChanged method.
         self.addListener('autoBin',
                          self._name,
                          self.__autoBinChanged,