Skip to content

Commit 11f936a

Browse files
committed
GestureEventMatch: remove unused code and improve code readability
1 parent 684d921 commit 11f936a

File tree

1 file changed

+12
-33
lines changed

1 file changed

+12
-33
lines changed

plotpy/events.py

+12-33
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@ class GestureEventMatch(EventMatch):
306306

307307
def __init__(self, gesture_type: int, gesture_state: int) -> None:
308308
super().__init__()
309-
self.evt_type = QC.QEvent.Gesture
310309
self.gesture_type = gesture_type
311310
self.gesture_state = gesture_state
312311

@@ -338,7 +337,7 @@ def __get_state_str(gesture_state: int) -> str:
338337

339338
def get_event_types(self) -> frozenset[int]:
340339
"""Return the set of event types handled by this event match"""
341-
return frozenset((self.evt_type,))
340+
return frozenset((QC.QEvent.Gesture,))
342341

343342
def __call__(self, event: QC.QEvent) -> bool:
344343
"""Returns True if the event matches the event match
@@ -814,25 +813,25 @@ def __init__(self, filter: StatefulEventFilter, start_state: int = 0) -> None:
814813
filter.add_event(
815814
self.state0,
816815
filter.gesture(self.kind, QC.Qt.GestureState.GestureFinished),
817-
self.stop_notmoving,
816+
self.stop_tracking,
818817
start_state,
819818
)
820819
filter.add_event(
821820
self.state1,
822821
filter.gesture(self.kind, QC.Qt.GestureState.GestureFinished),
823-
self.stop_moving,
822+
self.stop_tracking,
824823
start_state,
825824
)
826825
filter.add_event(
827826
self.state0,
828827
filter.gesture(self.kind, QC.Qt.GestureState.GestureCanceled),
829-
self.stop_notmoving,
828+
self.stop_tracking,
830829
start_state,
831830
)
832831
filter.add_event(
833832
self.state1,
834833
filter.gesture(self.kind, QC.Qt.GestureState.GestureCanceled),
835-
self.stop_notmoving,
834+
self.stop_tracking,
836835
start_state,
837836
)
838837
self.start = QC.QPoint() # first gesture position
@@ -896,26 +895,6 @@ def stop_tracking(
896895
"""
897896
pass
898897

899-
def stop_notmoving(
900-
self, filter: StatefulEventFilter, event: QW.QGestureEvent
901-
) -> None:
902-
"""Handles the stop of the gesture tracking when the gesture is not moving.
903-
904-
Args:
905-
filter: event filter that contains the BasePlot instance
906-
event: event that triggered the stop of the tracking
907-
"""
908-
self.stop_tracking(filter, event)
909-
910-
def stop_moving(self, filter: StatefulEventFilter, event: QW.QGestureEvent) -> None:
911-
"""Handles the stop of the gesture moving.
912-
913-
Args:
914-
filter: event filter that contains the BasePlot instance
915-
event: event that triggered the stop of the moving
916-
"""
917-
self.stop_tracking(filter, event)
918-
919898
def move(self, filter: StatefulEventFilter, event: QW.QGestureEvent) -> None:
920899
"""Handles the movement of the gesture.
921900
@@ -1166,31 +1145,31 @@ class QtDragHandler(DragHandler):
11661145
SIG_MOVE = QC.Signal(object, "QEvent")
11671146

11681147
def start_tracking(self, filter: StatefulEventFilter, event: QC.QEvent) -> None:
1169-
"""Starts tracking the gesture.
1148+
"""Starts tracking the drag event.
11701149
11711150
Args:
11721151
filter: The StatefulEventFilter instance.
1173-
event: The QGestureEvent instance.
1152+
event: The QC.QEvent instance.
11741153
"""
11751154
DragHandler.start_tracking(self, filter, event)
11761155
self.SIG_START_TRACKING.emit(filter, event)
11771156

11781157
def stop_notmoving(self, filter: StatefulEventFilter, event: QC.QEvent) -> None:
1179-
"""Stops tracking when the gesture is not moving.
1158+
"""Stops tracking when the drag event is not moving.
11801159
11811160
Args:
11821161
filter: The StatefulEventFilter instance.
1183-
event: The QGestureEvent instance.
1162+
event: The QC.QEvent instance.
11841163
"""
11851164
self.SIG_STOP_NOT_MOVING.emit(filter, event)
11861165

11871166
def stop_moving(self, filter: StatefulEventFilter, event: QC.QEvent) -> None:
11881167
"""
1189-
Stops the movement of the gesture.
1168+
Stops the movement of the drag event.
11901169
11911170
Args:
11921171
filter: The StatefulEventFilter instance.
1193-
event: The QGestureEvent instance.
1172+
event: The QC.QEvent instance
11941173
"""
11951174
self.SIG_STOP_MOVING.emit(filter, event)
11961175

@@ -1199,7 +1178,7 @@ def move(self, filter: StatefulEventFilter, event: QC.QEvent) -> None:
11991178
12001179
Args:
12011180
filter: The StatefulEventFilter instance.
1202-
event: The QGestureEvent instance.
1181+
event: The QC.QEvent instance.
12031182
"""
12041183
self.SIG_MOVE.emit(filter, event)
12051184

0 commit comments

Comments
 (0)