Skip to content

Commit

Permalink
renamed zoomOnAxes -> zoomEnabledAxes
Browse files Browse the repository at this point in the history
  • Loading branch information
t20100 committed Jun 12, 2023
1 parent 4d24f19 commit a78b543
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 14 deletions.
22 changes: 11 additions & 11 deletions src/silx/gui/plot/PlotInteraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ##################################################################
Expand Down Expand Up @@ -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)
Expand All @@ -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.
Expand Down Expand Up @@ -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)
2 changes: 1 addition & 1 deletion src/silx/gui/plot/_utils/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions src/silx/gui/plot/_utils/panzoom.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down

0 comments on commit a78b543

Please sign in to comment.