Merge pull request #1133 from silx-kit/vasole-patch-1-1

[GUI] Synchronize with latest silx

Author: vasole

src/PyMca5/PyMcaGui/io/hdf5/Hdf5NodeView.py

@@ -1,5 +1,5 @@
 #/*##########################################################################
-# Copyright (C) 2004-2022 European Synchrotron Radiation Facility
+# Copyright (C) 2004-2025 European Synchrotron Radiation Facility
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
 # the ESRF.
@@ -94,36 +94,21 @@ class Plot1DViewWithPlugins(DataViews._Plot1dView):
     def createWidget(self, parent):
         return Plot1DWithPlugins(parent=parent)
 
-
-class Plot2DWithPlugins(Plot2D):
-    """Add a plugin toolbutton to a Plot2D"""
-    def __init__(self, parent=None):
-        Plot2D.__init__(self, parent)
-
-        self._toolbar = qt.QToolBar(self)
-        self.addToolBar(self._toolbar)
-        pluginsToolButton = PluginsToolButton(plot=self, parent=self,
+class Plot2DViewWithPlugins(DataViews._Plot2dView):
+    def createWidget(self, parent):
+        widget = super().createWidget(parent)
+        widget.setKeepDataAspectRatio(False)
+        pymcaToolbar = qt.QToolBar(widget)
+        widget.addToolBar(pymcaToolbar)
+        pluginsToolButton = PluginsToolButton(plot=widget, parent=widget,
                                               method="getPlugin2DInstance")
 
         if PLUGINS_DIR:
             pluginsToolButton.getPlugins(
                     method="getPlugin2DInstance",
                     directoryList=PLUGINS_DIR)
-        self._toolbar.addWidget(pluginsToolButton)
-        if hasattr(self, "getIntensityHistogramAction"):
-            self.getIntensityHistogramAction().setVisible(True)
-        else:
-            print("Plot2D getIntensityHistogramAction missing")
-
-
-class Plot2DViewWithPlugins(DataViews._Plot2dView):
-    def createWidget(self, parent):
-        widget = Plot2DWithPlugins(parent=parent)
-        widget.setDefaultColormap(self.defaultColormap())
-        widget.getColormapAction().setColorDialog(self.defaultColorDialog())
-        widget.setKeepDataAspectRatio(False)
-        widget.getXAxis().setLabel('X')
-        widget.getYAxis().setLabel('Y')
+        pymcaToolbar.addWidget(pluginsToolButton)
+        widget.getIntensityHistogramAction().setVisible(True)
         return widget
 
 class ArrayCurvePlotWithPlugins(NXdataWidgets.ArrayCurvePlot):

src/PyMca5/tests/WidgetsInstantiationTest.py

@@ -1,5 +1,5 @@
 #/*##########################################################################
-# Copyright (C) 2004-2023 European Synchrotron Radiation Facility
+# Copyright (C) 2004-2025 European Synchrotron Radiation Facility
 #
 # This file is part of the PyMca X-ray Fluorescence Toolkit developed at
 # the ESRF by the Software group.
@@ -30,6 +30,12 @@
 import unittest
 import PyMca5.PyMcaGui.PyMcaQt as qt
 from PyMca5.PyMcaGui.misc.testutils import TestCaseQt
+try:
+    import silx.gui
+    SILX = True
+except Exception:
+    # do not block tests because of any unforeseen silx exception
+    SILX = False
 
 _logger = logging.getLogger(__name__)
 
@@ -231,6 +237,21 @@ def testShow(self):
         from PyMca5.PyMcaGui.plotting import PyMcaPrintPreview
         PyMcaPrintPreview.resetSingletonPrintPreview()
 
+class TestHdf5NodeView(TestCaseQt):
+    def setUp(self):
+        super(TestHdf5NodeView, self).setUp()
+
+    @unittest.skipUnless(SILX, "silx not installed")
+    def testShow(self):
+        from PyMca5.PyMcaGui.io.hdf5.Hdf5NodeView import Plot2DViewWithPlugins
+        dummy = qt.QWidget()
+        widget = Plot2DViewWithPlugins(dummy)
+        widget.createWidget(dummy)
+        dummy.show()
+        self.qapp.processEvents()
+        from PyMca5.PyMcaGui.plotting import PyMcaPrintPreview
+        PyMcaPrintPreview.resetSingletonPrintPreview()
+
 class TestPyMcaMain(TestCaseQt):
     def setUp(self):
         super(TestPyMcaMain, self).setUp()
@@ -283,7 +304,8 @@ def runTest(self):
                         TestXMCDWindow,
                         TestPCAParametersDialog,
                         TestPyMcaMain,
-                        ):
+                        TestHdf5NodeView,
+                       ):
         test_suite.addTest(
             unittest.defaultTestLoader.loadTestsFromTestCase(TestCaseCls))
     return test_suite