diff --git a/src/silx/gui/plot/PlotInteraction.py b/src/silx/gui/plot/PlotInteraction.py index 5b60a73b21..9919d81db6 100644 --- a/src/silx/gui/plot/PlotInteraction.py +++ b/src/silx/gui/plot/PlotInteraction.py @@ -46,7 +46,7 @@ CURSOR_SIZE_VER, CURSOR_SIZE_ALL) from ._utils import (FLOAT32_SAFE_MIN, FLOAT32_MINPOS, FLOAT32_SAFE_MAX, - applyZoomToPlot, ZoomOnAxes) + applyZoomToPlot, EnabledAxes) # Base class ################################################################## @@ -1643,7 +1643,7 @@ class PlotInteraction(qt.QObject): def __init__(self, parent): super().__init__(parent) self.__zoomOnWheel = True - self.__zoomOnAxes = ZoomOnAxes() + self.__zoomEnabledAxes = EnabledAxes() # Default event handler self._eventHandler = ItemsInteraction(parent) @@ -1658,16 +1658,16 @@ def setZoomOnWheelEnabled(self, enabled: bool): self.__zoomOnWheel = enabled self.sigChanged.emit() - def setZoomOnAxes(self, xaxis: bool, yaxis: bool, y2axis: bool): + def setZoomEnabledAxes(self, xaxis: bool, yaxis: bool, y2axis: bool): """Toggle zoom interaction for each axis""" - zoomOnAxes = ZoomOnAxes(xaxis, yaxis, y2axis) - if zoomOnAxes != self.__zoomOnAxes: - self.__zoomOnAxes = zoomOnAxes + zoomEnabledAxes = EnabledAxes(xaxis, yaxis, y2axis) + if zoomEnabledAxes != self.__zoomEnabledAxes: + self.__zoomEnabledAxes = zoomEnabledAxes self.sigChanged.emit() - def getZoomOnAxes(self) -> ZoomOnAxes: + def getZoomEnabledAxes(self) -> EnabledAxes: """Returns axes for which zoom is enabled""" - return self.__zoomOnAxes + return self.__zoomEnabledAxes def _getInteractiveMode(self): """Returns the current interactive mode as a dict. @@ -1756,12 +1756,12 @@ def _onWheel(self, x: float, y: float, angle: float): """Handle wheel events""" if not self.isZoomOnWheelEnabled(): return - zoomOnAxes = self.getZoomOnAxes() - if zoomOnAxes.isDisabled(): + zoomEnabledAxes = self.getZoomEnabledAxes() + if zoomEnabledAxes.isDisabled(): return plotWidget = self.parent() if plotWidget is None: return scale = 1.1 if angle > 0 else 1. / 1.1 - applyZoomToPlot(plotWidget, scale, (x, y), zoomOnAxes) + applyZoomToPlot(plotWidget, scale, (x, y), zoomEnabledAxes) diff --git a/src/silx/gui/plot/_utils/__init__.py b/src/silx/gui/plot/_utils/__init__.py index 9d85010d78..bbac877e33 100644 --- a/src/silx/gui/plot/_utils/__init__.py +++ b/src/silx/gui/plot/_utils/__init__.py @@ -31,7 +31,7 @@ import numpy from .panzoom import FLOAT32_SAFE_MIN, FLOAT32_MINPOS, FLOAT32_SAFE_MAX -from .panzoom import applyZoomToPlot, applyPan, checkAxisLimits, ZoomOnAxes +from .panzoom import applyZoomToPlot, applyPan, checkAxisLimits, EnabledAxes def addMarginsToLimits(margins, isXLog, isYLog, diff --git a/src/silx/gui/plot/_utils/panzoom.py b/src/silx/gui/plot/_utils/panzoom.py index e9027c75ba..fcff19bf82 100644 --- a/src/silx/gui/plot/_utils/panzoom.py +++ b/src/silx/gui/plot/_utils/panzoom.py @@ -120,7 +120,7 @@ def scale1DRange( return newMin, newMax -class ZoomOnAxes(NamedTuple): +class EnabledAxes(NamedTuple): """Toggle zoom for each axis""" xaxis: bool = True yaxis: bool = True @@ -135,7 +135,7 @@ def applyZoomToPlot( plot, scale: float, center: tuple[float, float]=None, - enabled: ZoomOnAxes=ZoomOnAxes(), + enabled: EnabledAxes=EnabledAxes(), ): """Zoom in/out plot given a scale and a center point.