Merge branch 'fix_1963' of github.com:payno/silx into fix_1963

silx-kit · Nov 16, 2023 · 641a4ca · 641a4ca
2 parents 1a58423 + 6a3bd6b
commit 641a4ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/silx/gui/dialog/ColormapDialog.py b/src/silx/gui/dialog/ColormapDialog.py
@@ -1074,7 +1074,7 @@ def __init__(self, parent=None, title="Colormap Dialog"):
 
         self._applyColormap()
 
-    def getHistoWidget(self):
+    def getHistogramWidget(self):
         return self._histoWidget
 
     def _invalidateColormap(self):

diff --git a/src/silx/gui/plot/actions/control.py b/src/silx/gui/plot/actions/control.py
@@ -331,9 +331,9 @@ def __init__(self, plot, parent=None):
         self.plot.sigActiveImageChanged.connect(self._updateColormap)
         self.plot.sigActiveScatterChanged.connect(self._updateColormap)
 
-    def setColormapDialog(self, colormapDialog):
-        """Set a specific color dialog instead of using the default dialog."""
-        assert(colormapDialog is not None)
+    def setColormapDialog(self, dialog):
+        """Set a specific colormap dialog instead of using the default one."""
+        assert colormapDialog is not None
         if self._dialog is not None:
             self._dialog.visibleChanged.disconnect(self._dialogVisibleChanged)