Add E,R,T shortcuts for trackers

Author: alexandre01

ultimatelabeling/models/keyboard_listener.py

@@ -33,8 +33,8 @@ def keyPressEvent(self, event):
         if event.key() in [Qt.Key_W, Qt.Key_S]:
             self.notify_listeners("on_key_ws", event.key() == Qt.Key_W)
 
-        if event.key() == Qt.Key_T:
-            self.notify_listeners("on_key_tracker")
+        if event.key() in [Qt.Key_E, Qt.Key_R, Qt.Key_T]:
+            self.notify_listeners("on_key_tracker", [Qt.Key_E, Qt.Key_R, Qt.Key_T].index(event.key()))
 
     def keyReleaseEvent(self, event):
           if event.key() == Qt.Key_Control:
@@ -74,5 +74,5 @@ def on_key_number(self, number):
     def on_key_ws(self, go_up):
         pass
 
-    def on_key_tracker(self):
+    def on_key_tracker(self, index):
         pass

ultimatelabeling/models/state.py

@@ -45,8 +45,6 @@ def __init__(self):
 
         self.right_click_option = RightClickOption.DELETE_CURRENT
 
-        self.last_used_tracker = 0
-
         self.keypoints_show_bbox = False
         self.keypoints_instance_color = False
         self.bbox_class_color = False

ultimatelabeling/views/tracking_manager.py

@@ -4,7 +4,7 @@
 from ultimatelabeling.models import Detection, FrameMode
 from ultimatelabeling.models import KeyboardListener
 
-PORTS = [8787, 8788]
+PORTS = [0, 8787, 8788]
 
 
 class TrackingThread(QThread):
@@ -59,6 +59,7 @@ def run(self):
 
             if (self.state.frame_mode == FrameMode.CONTROLLED and self.selected) or self.state.current_frame == frame:
                 self.state.set_current_frame(frame)
+                self.state.current_detection = detection
 
             frame += 1
 
@@ -108,7 +109,7 @@ def display_err_message(self, err_message):
         QMessageBox.warning(self, "", "Error: {}".format(err_message))
 
     def on_start_tracking(self):
-        if not self.state.tracking_server_running and self.i < 2:
+        if not self.state.tracking_server_running and self.i >= 1:
             QMessageBox.warning(self, "", "Tracking server is not connected.")
             return
 
@@ -143,9 +144,9 @@ def __init__(self, state):
         self.state = state
 
         self.trackers = [
-            TrackingButtons(self.state, self, 0, "SiamMask"),
+            TrackingButtons(self.state, self, 0, "KCF"),
             TrackingButtons(self.state, self, 1, "SiamMask"),
-            TrackingButtons(self.state, self, 2, "KCF")
+            TrackingButtons(self.state, self, 2, "SiamMask")
         ]
 
         layout = QHBoxLayout()
@@ -156,13 +157,11 @@ def __init__(self, state):
         self.setLayout(layout)
 
     def select(self, selected_i):
-        self.state.last_used_tracker = selected_i
-
         for i, tracker in enumerate(self.trackers):
             tracker.thread.selected = i == selected_i
 
-    def on_key_tracker(self):
-        tracker = self.trackers[self.state.last_used_tracker]
+    def on_key_tracker(self, index):
+        tracker = self.trackers[index]
 
         if not tracker.thread.isRunning():
             tracker.on_start_tracking()