1 files changed, 32 insertions, 56 deletions
diff --git a/silx/gui/plot/actions/histogram.py b/silx/gui/plot/actions/histogram.py
index d6e3269..9181f53 100644
--- a/silx/gui/plot/actions/histogram.py
+++ b/silx/gui/plot/actions/histogram.py
@@ -34,10 +34,10 @@ The following QAction are available:
 from __future__ import division
 
 __authors__ = ["V.A. Sole", "T. Vincent", "P. Knobel"]
-__date__ = "30/04/2018"
+__date__ = "10/10/2018"
 __license__ = "MIT"
 
-from . import PlotAction
+from .PlotToolAction import PlotToolAction
 from silx.math.histogram import Histogramnd
 from silx.math.combo import min_max
 import numpy
@@ -47,7 +47,7 @@ from silx.gui import qt
 _logger = logging.getLogger(__name__)
 
 
-class PixelIntensitiesHistoAction(PlotAction):
+class PixelIntensitiesHistoAction(PlotToolAction):
     """QAction to plot the pixels intensities diagram
 
     :param plot: :class:`.PlotWidget` instance on which to operate
@@ -55,43 +55,33 @@ class PixelIntensitiesHistoAction(PlotAction):
     """
 
     def __init__(self, plot, parent=None):
-        PlotAction.__init__(self,
-                            plot,
-                            icon='pixel-intensities',
-                            text='pixels intensity',
-                            tooltip='Compute image intensity distribution',
-                            triggered=self._triggered,
-                            parent=parent,
-                            checkable=True)
-        self._plotHistogram = None
+        PlotToolAction.__init__(self,
+                                plot,
+                                icon='pixel-intensities',
+                                text='pixels intensity',
+                                tooltip='Compute image intensity distribution',
+                                parent=parent)
         self._connectedToActiveImage = False
         self._histo = None
 
-    def _triggered(self, checked):
-        """Update the plot of the histogram visibility status
-
-        :param bool checked: status  of the action button
-        """
-        if checked:
-            if not self._connectedToActiveImage:
-                self.plot.sigActiveImageChanged.connect(
-                    self._activeImageChanged)
-                self._connectedToActiveImage = True
-                self.computeIntensityDistribution()
-
-            self.getHistogramPlotWidget().show()
-
-        else:
-            if self._connectedToActiveImage:
-                self.plot.sigActiveImageChanged.disconnect(
-                    self._activeImageChanged)
-                self._connectedToActiveImage = False
+    def _connectPlot(self, window):
+        if not self._connectedToActiveImage:
+            self.plot.sigActiveImageChanged.connect(
+                self._activeImageChanged)
+            self._connectedToActiveImage = True
+            self.computeIntensityDistribution()
+        PlotToolAction._connectPlot(self, window)
 
-            self.getHistogramPlotWidget().hide()
+    def _disconnectPlot(self, window):
+        if self._connectedToActiveImage:
+            self.plot.sigActiveImageChanged.disconnect(
+                self._activeImageChanged)
+            self._connectedToActiveImage = False
+        PlotToolAction._disconnectPlot(self, window)
 
     def _activeImageChanged(self, previous, legend):
         """Handle active image change: toggle enabled toolbar, update curve"""
-        if self.isChecked():
+        if self._isWindowInUse():
             self.computeIntensityDistribution()
 
     def computeIntensityDistribution(self):
@@ -132,35 +122,21 @@ class PixelIntensitiesHistoAction(PlotAction):
                               color='#66aad7')
             plot.resetZoom()
 
-    def eventFilter(self, qobject, event):
-        """Observe when the close event is emitted then
-        simply uncheck the action button
-
-        :param qobject: the object observe
-        :param event: the event received by qobject
-        """
-        if event.type() == qt.QEvent.Close:
-            if self._plotHistogram is not None:
-                self._plotHistogram.hide()
-            self.setChecked(False)
-
-        return PlotAction.eventFilter(self, qobject, event)
-
     def getHistogramPlotWidget(self):
         """Create the plot histogram if needed, otherwise create it
 
         :return: the PlotWidget showing the histogram of the pixel intensities
         """
+        return self._getToolWindow()
+
+    def _createToolWindow(self):
         from silx.gui.plot.PlotWindow import Plot1D
-        if self._plotHistogram is None:
-            self._plotHistogram = Plot1D(parent=self.plot)
-            self._plotHistogram.setWindowFlags(qt.Qt.Window)
-            self._plotHistogram.setWindowTitle('Image Intensity Histogram')
-            self._plotHistogram.installEventFilter(self)
-            self._plotHistogram.getXAxis().setLabel("Value")
-            self._plotHistogram.getYAxis().setLabel("Count")
-
-        return self._plotHistogram
+        window = Plot1D(parent=self.plot)
+        window.setWindowFlags(qt.Qt.Window)
+        window.setWindowTitle('Image Intensity Histogram')
+        window.getXAxis().setLabel("Value")
+        window.getYAxis().setLabel("Count")
+        return window
 
     def getHistogram(self):
         """Return the last computed histogram