bec/bec_widgets
0
0
Fork 0
mirror of https://github.com/bec-project/bec_widgets.git synced 2025-07-14 03:31:50 +02:00
Code Activity

fix(crosshair): log is separately scaled for backend logic and for signal emit

Browse Source
This commit is contained in:
wyzula_j
2024-11-05 17:43:24 +01:00
committed by wyzula_j
parent 1e6659c379
commit b2eb71aae0
2 changed files with 68 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

96
bec_widgets/utils/crosshair.py
View File

@ -2,10 +2,7 @@ from collections import defaultdict
import numpy as np import numpy as np
import pyqtgraph as pg import pyqtgraph as pg
from qtpy.QtCore import QObject, Qt, Signal
# from qtpy.QtCore import QObject, pyqtSignal
from qtpy.QtCore import QObject, Qt
from qtpy.QtCore import Signal as pyqtSignal
class NonDownsamplingScatterPlotItem(pg.ScatterPlotItem): class NonDownsamplingScatterPlotItem(pg.ScatterPlotItem):
@ -17,14 +14,15 @@ class NonDownsamplingScatterPlotItem(pg.ScatterPlotItem):
class Crosshair(QObject): class Crosshair(QObject):
positionChanged = pyqtSignal(tuple) # Plain crosshair position signals mapped to real coordinates
positionClicked = pyqtSignal(tuple) crosshairChanged = Signal(tuple)
crosshairClicked = Signal(tuple)
# Signal for 1D plot # Signal for 1D plot
coordinatesChanged1D = pyqtSignal(tuple) coordinatesChanged1D = Signal(tuple)
coordinatesClicked1D = pyqtSignal(tuple) coordinatesClicked1D = Signal(tuple)
# Signal for 2D plot # Signal for 2D plot
coordinatesChanged2D = pyqtSignal(tuple) coordinatesChanged2D = Signal(tuple)
coordinatesClicked2D = pyqtSignal(tuple) coordinatesClicked2D = Signal(tuple)
def __init__(self, plot_item: pg.PlotItem, precision: int = 3, parent=None): def __init__(self, plot_item: pg.PlotItem, precision: int = 3, parent=None):
""" """
@ -52,6 +50,7 @@ class Crosshair(QObject):
) )
self.plot_item.scene().sigMouseClicked.connect(self.mouse_clicked) self.plot_item.scene().sigMouseClicked.connect(self.mouse_clicked)
# Connect signals from pyqtgraph right click menu
self.plot_item.ctrl.derivativeCheck.checkStateChanged.connect(self.check_derivatives) self.plot_item.ctrl.derivativeCheck.checkStateChanged.connect(self.check_derivatives)
self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log) self.plot_item.ctrl.logXCheck.checkStateChanged.connect(self.check_log)
self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log) self.plot_item.ctrl.logYCheck.checkStateChanged.connect(self.check_log)
@ -151,21 +150,34 @@ class Crosshair(QObject):
return None, None return None, None
def closest_x_y_value(self, input_value: float, list_x: list, list_y: list) -> tuple: def closest_x_y_value(self, input_x: float, list_x: list, list_y: list) -> tuple:
""" """
Find the closest x and y value to the input value. Find the closest x and y value to the input value.
Args: Args:
input_value (float): Input value input_x (float): Input value
list_x (list): List of x values list_x (list): List of x values
list_y (list): List of y values list_y (list): List of y values
Returns: Returns:
tuple: Closest x and y value tuple: Closest x and y value
""" """
arr = np.asarray(list_x) # Convert lists to NumPy arrays
i = (np.abs(arr - input_value)).argmin() arr_x = np.asarray(list_x)
return list_x[i], list_y[i]
# Get the indices where x is not NaN
valid_indices = ~np.isnan(arr_x)
# Filter x array to exclude NaN values
filtered_x = arr_x[valid_indices]
# Find the index of the closest value in the filtered x array
closest_index = np.abs(filtered_x - input_x).argmin()
# Map back to the original index in the list_x and list_y arrays
original_index = np.where(valid_indices)[0][closest_index]
return list_x[original_index], list_y[original_index]
def mouse_moved(self, event): def mouse_moved(self, event):
"""Handles the mouse moved event, updating the crosshair position and emitting signals. """Handles the mouse moved event, updating the crosshair position and emitting signals.
@ -175,17 +187,14 @@ class Crosshair(QObject):
""" """
pos = event[0] pos = event[0]
self.update_markers() self.update_markers()
self.positionChanged.emit((pos.x(), pos.y()))
if self.plot_item.vb.sceneBoundingRect().contains(pos): if self.plot_item.vb.sceneBoundingRect().contains(pos):
mouse_point = self.plot_item.vb.mapSceneToView(pos) mouse_point = self.plot_item.vb.mapSceneToView(pos)
self.v_line.setPos(mouse_point.x())
self.h_line.setPos(mouse_point.y())
x, y = mouse_point.x(), mouse_point.y() x, y = mouse_point.x(), mouse_point.y()
if self.is_log_x: self.v_line.setPos(x)
x = 10**x self.h_line.setPos(y)
if self.is_log_y: scaled_x, scaled_y = self.scale_emitted_coordinates(mouse_point.x(), mouse_point.y())
y = 10**y self.crosshairChanged.emit((scaled_x, scaled_y))
x_snap_values, y_snap_values = self.snap_to_data(x, y) x_snap_values, y_snap_values = self.snap_to_data(x, y)
if x_snap_values is None or y_snap_values is None: if x_snap_values is None or y_snap_values is None:
return return
@ -202,7 +211,12 @@ class Crosshair(QObject):
if x is None or y is None: if x is None or y is None:
continue continue
self.marker_moved_1d[name].setData([x], [y]) self.marker_moved_1d[name].setData([x], [y])
coordinate_to_emit = (name, round(x, self.precision), round(y, self.precision)) x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
coordinate_to_emit = (
name,
round(x_snapped_scaled, self.precision),
round(y_snapped_scaled, self.precision),
)
self.coordinatesChanged1D.emit(coordinate_to_emit) self.coordinatesChanged1D.emit(coordinate_to_emit)
elif isinstance(item, pg.ImageItem): elif isinstance(item, pg.ImageItem):
name = item.config.monitor name = item.config.monitor
@ -229,12 +243,9 @@ class Crosshair(QObject):
if self.plot_item.vb.sceneBoundingRect().contains(event._scenePos): if self.plot_item.vb.sceneBoundingRect().contains(event._scenePos):
mouse_point = self.plot_item.vb.mapSceneToView(event._scenePos) mouse_point = self.plot_item.vb.mapSceneToView(event._scenePos)
x, y = mouse_point.x(), mouse_point.y() x, y = mouse_point.x(), mouse_point.y()
self.positionClicked.emit((x, y)) scaled_x, scaled_y = self.scale_emitted_coordinates(mouse_point.x(), mouse_point.y())
self.crosshairClicked.emit((scaled_x, scaled_y))
if self.is_log_x:
x = 10**x
if self.is_log_y:
y = 10**y
x_snap_values, y_snap_values = self.snap_to_data(x, y) x_snap_values, y_snap_values = self.snap_to_data(x, y)
if x_snap_values is None or y_snap_values is None: if x_snap_values is None or y_snap_values is None:
@ -252,7 +263,12 @@ class Crosshair(QObject):
if x is None or y is None: if x is None or y is None:
continue continue
self.marker_clicked_1d[name].setData([x], [y]) self.marker_clicked_1d[name].setData([x], [y])
coordinate_to_emit = (name, round(x, self.precision), round(y, self.precision)) x_snapped_scaled, y_snapped_scaled = self.scale_emitted_coordinates(x, y)
coordinate_to_emit = (
name,
round(x_snapped_scaled, self.precision),
round(y_snapped_scaled, self.precision),
)
self.coordinatesClicked1D.emit(coordinate_to_emit) self.coordinatesClicked1D.emit(coordinate_to_emit)
elif isinstance(item, pg.ImageItem): elif isinstance(item, pg.ImageItem):
name = item.config.monitor name = item.config.monitor
@ -272,10 +288,26 @@ class Crosshair(QObject):
for marker in self.marker_clicked_1d.values(): for marker in self.marker_clicked_1d.values():
marker.clear() marker.clear()
def scale_emitted_coordinates(self, x, y):
"""Scales the emitted coordinates if the axes are in log scale.
Args:
x (float): The x-coordinate
y (float): The y-coordinate
Returns:
tuple: The scaled x and y coordinates
"""
if self.is_log_x:
x = 10**x
if self.is_log_y:
y = 10**y
return x, y
def check_log(self): def check_log(self):
"""Checks if the x or y axis is in log scale and updates the internal state accordingly.""" """Checks if the x or y axis is in log scale and updates the internal state accordingly."""
self.is_log_x = self.plot_item.ctrl.logXCheck.isChecked() self.is_log_x = self.plot_item.axes["bottom"]["item"].logMode
self.is_log_y = self.plot_item.ctrl.logYCheck.isChecked() self.is_log_y = self.plot_item.axes["left"]["item"].logMode
self.clear_markers() self.clear_markers()
def check_derivatives(self): def check_derivatives(self):

8
bec_widgets/widgets/figure/plots/plot_base.py
View File

@ -397,8 +397,8 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
"""Hook the crosshair to all plots.""" """Hook the crosshair to all plots."""
if self.crosshair is None: if self.crosshair is None:
self.crosshair = Crosshair(self.plot_item, precision=3) self.crosshair = Crosshair(self.plot_item, precision=3)
self.crosshair.positionChanged.connect(self.crosshair_position_changed) self.crosshair.crosshairChanged.connect(self.crosshair_position_changed)
self.crosshair.positionClicked.connect(self.crosshair_position_clicked) self.crosshair.crosshairClicked.connect(self.crosshair_position_clicked)
self.crosshair.coordinatesChanged1D.connect(self.crosshair_coordinates_changed) self.crosshair.coordinatesChanged1D.connect(self.crosshair_coordinates_changed)
self.crosshair.coordinatesClicked1D.connect(self.crosshair_coordinates_clicked) self.crosshair.coordinatesClicked1D.connect(self.crosshair_coordinates_clicked)
self.crosshair.coordinatesChanged2D.connect(self.crosshair_coordinates_changed) self.crosshair.coordinatesChanged2D.connect(self.crosshair_coordinates_changed)
@ -407,8 +407,8 @@ class BECPlotBase(BECConnector, pg.GraphicsLayout):
def unhook_crosshair(self) -> None: def unhook_crosshair(self) -> None:
"""Unhook the crosshair from all plots.""" """Unhook the crosshair from all plots."""
if self.crosshair is not None: if self.crosshair is not None:
self.crosshair.positionChanged.disconnect(self.crosshair_position_changed) self.crosshair.crosshairChanged.disconnect(self.crosshair_position_changed)
self.crosshair.positionClicked.disconnect(self.crosshair_position_clicked) self.crosshair.crosshairClicked.disconnect(self.crosshair_position_clicked)
self.crosshair.coordinatesChanged1D.disconnect(self.crosshair_coordinates_changed) self.crosshair.coordinatesChanged1D.disconnect(self.crosshair_coordinates_changed)
self.crosshair.coordinatesClicked1D.disconnect(self.crosshair_coordinates_clicked) self.crosshair.coordinatesClicked1D.disconnect(self.crosshair_coordinates_clicked)
self.crosshair.coordinatesChanged2D.disconnect(self.crosshair_coordinates_changed) self.crosshair.coordinatesChanged2D.disconnect(self.crosshair_coordinates_changed)