@@ -306,7 +306,6 @@ class GestureEventMatch(EventMatch):
306
306
307
307
def __init__ (self , gesture_type : int , gesture_state : int ) -> None :
308
308
super ().__init__ ()
309
- self .evt_type = QC .QEvent .Gesture
310
309
self .gesture_type = gesture_type
311
310
self .gesture_state = gesture_state
312
311
@@ -338,7 +337,7 @@ def __get_state_str(gesture_state: int) -> str:
338
337
339
338
def get_event_types (self ) -> frozenset [int ]:
340
339
"""Return the set of event types handled by this event match"""
341
- return frozenset ((self . evt_type ,))
340
+ return frozenset ((QC . QEvent . Gesture ,))
342
341
343
342
def __call__ (self , event : QC .QEvent ) -> bool :
344
343
"""Returns True if the event matches the event match
@@ -814,25 +813,25 @@ def __init__(self, filter: StatefulEventFilter, start_state: int = 0) -> None:
814
813
filter .add_event (
815
814
self .state0 ,
816
815
filter .gesture (self .kind , QC .Qt .GestureState .GestureFinished ),
817
- self .stop_notmoving ,
816
+ self .stop_tracking ,
818
817
start_state ,
819
818
)
820
819
filter .add_event (
821
820
self .state1 ,
822
821
filter .gesture (self .kind , QC .Qt .GestureState .GestureFinished ),
823
- self .stop_moving ,
822
+ self .stop_tracking ,
824
823
start_state ,
825
824
)
826
825
filter .add_event (
827
826
self .state0 ,
828
827
filter .gesture (self .kind , QC .Qt .GestureState .GestureCanceled ),
829
- self .stop_notmoving ,
828
+ self .stop_tracking ,
830
829
start_state ,
831
830
)
832
831
filter .add_event (
833
832
self .state1 ,
834
833
filter .gesture (self .kind , QC .Qt .GestureState .GestureCanceled ),
835
- self .stop_notmoving ,
834
+ self .stop_tracking ,
836
835
start_state ,
837
836
)
838
837
self .start = QC .QPoint () # first gesture position
@@ -896,26 +895,6 @@ def stop_tracking(
896
895
"""
897
896
pass
898
897
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
-
919
898
def move (self , filter : StatefulEventFilter , event : QW .QGestureEvent ) -> None :
920
899
"""Handles the movement of the gesture.
921
900
@@ -1166,31 +1145,31 @@ class QtDragHandler(DragHandler):
1166
1145
SIG_MOVE = QC .Signal (object , "QEvent" )
1167
1146
1168
1147
def start_tracking (self , filter : StatefulEventFilter , event : QC .QEvent ) -> None :
1169
- """Starts tracking the gesture .
1148
+ """Starts tracking the drag event .
1170
1149
1171
1150
Args:
1172
1151
filter: The StatefulEventFilter instance.
1173
- event: The QGestureEvent instance.
1152
+ event: The QC.QEvent instance.
1174
1153
"""
1175
1154
DragHandler .start_tracking (self , filter , event )
1176
1155
self .SIG_START_TRACKING .emit (filter , event )
1177
1156
1178
1157
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.
1180
1159
1181
1160
Args:
1182
1161
filter: The StatefulEventFilter instance.
1183
- event: The QGestureEvent instance.
1162
+ event: The QC.QEvent instance.
1184
1163
"""
1185
1164
self .SIG_STOP_NOT_MOVING .emit (filter , event )
1186
1165
1187
1166
def stop_moving (self , filter : StatefulEventFilter , event : QC .QEvent ) -> None :
1188
1167
"""
1189
- Stops the movement of the gesture .
1168
+ Stops the movement of the drag event .
1190
1169
1191
1170
Args:
1192
1171
filter: The StatefulEventFilter instance.
1193
- event: The QGestureEvent instance.
1172
+ event: The QC.QEvent instance
1194
1173
"""
1195
1174
self .SIG_STOP_MOVING .emit (filter , event )
1196
1175
@@ -1199,7 +1178,7 @@ def move(self, filter: StatefulEventFilter, event: QC.QEvent) -> None:
1199
1178
1200
1179
Args:
1201
1180
filter: The StatefulEventFilter instance.
1202
- event: The QGestureEvent instance.
1181
+ event: The QC.QEvent instance.
1203
1182
"""
1204
1183
self .SIG_MOVE .emit (filter , event )
1205
1184
0 commit comments