Extra options for each histogram plot available via 'More' button in

HistogramListPanel

fsl/data/strings.py

@@ -251,6 +251,13 @@ properties = TypeDict({
     'HistogramPanel.showCurrent'   : 'Plot histogram for current overlay',
     'HistogramPanel.enableOverlay' : 'Enable 3D histogram overlay',
 
+    'HistogramSeries.nbins'       : 'Number of bins',
+    'HistogramSeries.ignoreZeros' : 'Ignore zeros',
+    'HistogramSeries.volume'      : 'Volume',
+    'HistogramSeries.allVolumes'  : 'Use all volumes',
+    'HistogramSeries.dataRange'   : 'Data range',
+    
+
     'OrthoEditProfile.selectionSize'          : 'Selection size',
     'OrthoEditProfile.selectionIs3D'          : '3D selection',
     'OrthoEditProfile.fillValue'              : 'Fill value',

fsl/fslview/controls/histogramcontrolpanel.py

@@ -14,11 +14,6 @@ import fsl.data.strings  as strings
 import                      plotcontrolpanel
 
 
-class OverlayHistOptionsPanel(fslpanel.FSLViewPanel):
-    def __init__(self, parent, overlayList, displayCtx, hsPanel):
-        pass
-
-
 class HistogramControlPanel(fslpanel.FSLViewPanel):
 
 

fsl/fslview/controls/histogramlistpanel.py

@@ -8,8 +8,11 @@
 
 import wx
 
+import props
+
 import pwidgets.elistbox      as elistbox
 import fsl.fslview.panel      as fslpanel
+import fsl.data.strings       as strings
 import fsl.fslview.colourmaps as fslcm
 
 import                           timeserieslistpanel 
@@ -55,10 +58,28 @@ class HistogramListPanel(fslpanel.FSLViewPanel):
 
         for hs in self.__hsPanel.dataSeries:
             widg = timeserieslistpanel.TimeSeriesWidget(self, hs)
+
+            widg.more = wx.Button(widg, label='More')
+            widg.sizer.Add(widg.more)
+            widg.Layout()
+            widg.more.target = hs
+            widg.more.Bind(wx.EVT_BUTTON, self.__showHsControlPanel)
+            
             self.__hsList.Append(hs.overlay.name,
                                  clientData=hs,
                                  extraWidget=widg)
 
+        if len(self.__hsPanel.dataSeries) > 0:
+            self.__hsList.SetSelection(0)
+
+
+    def __showHsControlPanel(self, ev):
+
+        hs  = ev.GetEventObject().target
+        dlg = HistSeriesDialog(self, self.__hsPanel, hs)
+
+        dlg.Show()
+        
     
     def __onListAdd(self, ev):
         
@@ -72,6 +93,7 @@ class HistogramListPanel(fslpanel.FSLViewPanel):
         hs.lineStyle = '-'
         hs.colour    = fslcm.randomColour()
         hs.label     = hs.overlay.name
+        
         self.__hsPanel.dataSeries.append(hs)
 
         
@@ -86,3 +108,98 @@ class HistogramListPanel(fslpanel.FSLViewPanel):
         
     def __onListRemove(self, ev):
         self.__hsPanel.dataSeries.remove(ev.data)
+
+
+
+class HistSeriesDialog(wx.Dialog):
+    def __init__(self, parent, hsPanel, hs):
+        wx.Dialog.__init__(self,
+                           parent,
+                           title=hs.overlay.name,
+                           style=wx.CLOSE_BOX | wx.STAY_ON_TOP)
+
+        self.__name    = '{}_{}'.format(type(self).__name__, id(self))
+        self.__hsPanel = hsPanel
+        self.__hs      = hs
+
+        self.__nbins       = props.makeWidget(self, hs, 'nbins',
+                                              showLimits=False)
+        self.__ignoreZeros = props.makeWidget(self, hs, 'ignoreZeros')
+        self.__volume      = props.makeWidget(self, hs, 'volume',
+                                              showLimits=False)
+        self.__allVolumes  = props.makeWidget(self, hs, 'allVolumes')
+        self.__dataRange   = props.makeWidget(self, hs, 'dataRange',
+                                              showLimits=False)
+
+        self.__nbinsLbl       = wx.StaticText(self)
+        self.__ignoreZerosLbl = wx.StaticText(self)
+        self.__volumeLbl      = wx.StaticText(self)
+        self.__allVolumesLbl  = wx.StaticText(self)
+        self.__dataRangeLbl   = wx.StaticText(self)
+
+        self.__nbinsLbl      .SetLabel(strings.properties[hs, 'nbins'])
+        self.__ignoreZerosLbl.SetLabel(strings.properties[hs, 'ignoreZeros'])
+        self.__volumeLbl     .SetLabel(strings.properties[hs, 'volume'])     
+        self.__allVolumesLbl .SetLabel(strings.properties[hs, 'allVolumes']) 
+        self.__dataRangeLbl  .SetLabel(strings.properties[hs, 'dataRange'])  
+
+        self.__sizer = wx.FlexGridSizer(5, 2)
+
+        self.SetSizer(self.__sizer)
+
+        self.__sizer.Add(self.__nbinsLbl,       flag=wx.EXPAND)
+        self.__sizer.Add(self.__nbins,          flag=wx.EXPAND)
+        self.__sizer.Add(self.__ignoreZerosLbl, flag=wx.EXPAND)
+        self.__sizer.Add(self.__ignoreZeros,    flag=wx.EXPAND)
+        self.__sizer.Add(self.__volumeLbl,      flag=wx.EXPAND)
+        self.__sizer.Add(self.__volume,         flag=wx.EXPAND)
+        self.__sizer.Add(self.__allVolumesLbl,  flag=wx.EXPAND)
+        self.__sizer.Add(self.__allVolumes,     flag=wx.EXPAND)
+        self.__sizer.Add(self.__dataRangeLbl,   flag=wx.EXPAND)
+        self.__sizer.Add(self.__dataRange,      flag=wx.EXPAND)
+
+        self.__volume       .Enable(hs.overlay.is4DImage())
+        self.__volumeLbl    .Enable(hs.overlay.is4DImage())
+        self.__allVolumes   .Enable(hs.overlay.is4DImage())
+        self.__allVolumesLbl.Enable(hs.overlay.is4DImage())
+        self.__autoBinChanged()
+
+        hsPanel.addListener('autoBin',
+                            self.__name, 
+                            self.__autoBinChanged)
+        hsPanel.addListener('dataSeries',
+                            self.__name, 
+                            self.__dataSeriesChanged) 
+        hs     .addListener('allVolumes',
+                            self.__name,
+                            self.__allVolumesChanged)
+
+        self.Bind(wx.EVT_WINDOW_DESTROY, self.__onDestroy)
+
+        self.Layout()
+        self.Fit()
+        self.CentreOnParent()
+
+
+    def __onDestroy(self, ev=None):
+        if ev is not None:
+            ev.Skip()
+        self.__hsPanel.removeListener('autoBin',    self.__name)
+        self.__hs     .removeListener('allVolumes', self.__name)
+
+
+    def __dataSeriesChanged(self, *a):
+        if self.__hs not in self.__hsPanel.dataSeries:
+            self.Close()
+            self.Destroy()
+            self.__onDestroy()
+    
+        
+    def __allVolumesChanged(self, *a):
+        self.__volume   .Enable(not self.__hs.allVolumes)
+        self.__volumeLbl.Enable(not self.__hs.allVolumes)
+
+        
+    def __autoBinChanged(self, *a):
+        self.__nbins   .Enable(not self.__hsPanel.autoBin)
+        self.__nbinsLbl.Enable(not self.__hsPanel.autoBin)

fsl/fslview/controls/lookuptablepanel.py

@@ -547,9 +547,9 @@ class LutLabelDialog(wx.Dialog):
 
         self._ok.SetDefault()
 
-        self.Fit()
         self.Layout()
-
+        self.Fit()
+        
         self.CentreOnParent()
 
         self.value  = None

fsl/fslview/views/histogrampanel.py

@@ -185,10 +185,10 @@ class HistogramPanel(plotpanel.PlotPanel):
 
         self._overlayList.addListener('overlays',
                                       self._name,
-                                      self.__updateCurrent) 
+                                      self.__overlaysChanged)
         self._displayCtx .addListener('selectedOverlay',
                                       self._name,
-                                      self.__updateCurrent)
+                                      self.draw)
 
         # Re draw whenever any PlotPanel or
         # HistogramPanel property changes.
@@ -216,6 +216,15 @@ class HistogramPanel(plotpanel.PlotPanel):
         self._overlayList.removeListener('overlays',        self._name)
         self._displayCtx .removeListener('selectedOverlay', self._name)
 
+
+    def __overlaysChanged(self, *a):
+        self.disableListener('dataSeries', self._name)
+        for ds in self.dataSeries:
+            if ds.overlay not in self._overlayList:
+                self.dataSeries.remove(ds)
+        self.enableListener('dataSeries', self._name)
+        self.draw() 
+
         
     def __autoBinChanged(self, *a):
         """Called when the :attr:`autoBin` property changes. Makes sure that
@@ -230,7 +239,6 @@ class HistogramPanel(plotpanel.PlotPanel):
             self.__current.histPropsChanged()
 
         self.draw()
-
         
 
     def __updateCurrent(self, *a):
@@ -239,14 +247,15 @@ class HistogramPanel(plotpanel.PlotPanel):
         currentHs      = self.__current
         self.__current = None
 
-        if len(self._overlayList) == 0:
-            pass
-        elif not isinstance(overlay, fslimage.Image):
-            pass
-        elif overlay in [hs.overlay for hs in self.dataSeries]:
-            pass
-        elif currentHs is not None and overlay == currentHs.overlay:
+        if len(self._overlayList) == 0             or \
+           not isinstance(overlay, fslimage.Image) or \
+           overlay in [hs.overlay for hs in self.dataSeries]:
+            return
+        
+        if currentHs is not None and \
+           currentHs.overlay not in [hs.overlay for hs in self.dataSeries]:
             self.__current = currentHs
+            
         else:
             hs             = HistogramSeries(self, overlay)
             hs.colour      = [0, 0, 0]
@@ -256,8 +265,6 @@ class HistogramPanel(plotpanel.PlotPanel):
             hs.label       = None
 
             self.__current = hs
-            
-        self.draw()
 
 
     def getCurrent(self): 
@@ -266,6 +273,7 @@ class HistogramPanel(plotpanel.PlotPanel):
 
     def draw(self, *a):
 
+        self.__updateCurrent()
         current = self.getCurrent()
 
         if self.showCurrent and \