Change QtCore.{Slot,Signal} to QtCore.pyqt{Slot,Signal} (#1917)

mslib/msui/mpl_pathinteractor.py

@@ -910,7 +910,7 @@ class VPathInteractor(PathInteractor):
     """Subclass of PathInteractor that implements an interactively editable
        vertical profile of the flight track.
     """
-    signal_get_vsec = QtCore.Signal(name="get_vsec")
+    signal_get_vsec = QtCore.pyqtSignal(name="get_vsec")
 
     def __init__(self, ax, waypoints, redraw_xaxis=None, clear_figure=None, numintpoints=101):
         """Constructor passes a PathV instance its parent.
@@ -1052,7 +1052,7 @@ class LPathInteractor(PathInteractor):
     """
     Subclass of PathInteractor that implements a non interactive linear profile of the flight track.
     """
-    signal_get_lsec = QtCore.Signal(name="get_lsec")
+    signal_get_lsec = QtCore.pyqtSignal(name="get_lsec")
 
     def __init__(self, ax, waypoints, redraw_xaxis=None, clear_figure=None, numintpoints=101):
         """Constructor passes a PathV instance its parent.

mslib/msui/mscolab.py

@@ -403,14 +403,14 @@ class MSUIMscolab(QtCore.QObject):
     """
     name = "Mscolab"
 
-    signal_unarchive_operation = QtCore.Signal(int, name="signal_unarchive_operation")
-    signal_operation_added = QtCore.Signal(int, str, name="signal_operation_added")
-    signal_operation_removed = QtCore.Signal(int, name="signal_operation_removed")
-    signal_login_mscolab = QtCore.Signal(str, str, name="signal_login_mscolab")
-    signal_logout_mscolab = QtCore.Signal(name="signal_logout_mscolab")
-    signal_listFlighttrack_doubleClicked = QtCore.Signal()
-    signal_permission_revoked = QtCore.Signal(int)
-    signal_render_new_permission = QtCore.Signal(int, str)
+    signal_unarchive_operation = QtCore.pyqtSignal(int, name="signal_unarchive_operation")
+    signal_operation_added = QtCore.pyqtSignal(int, str, name="signal_operation_added")
+    signal_operation_removed = QtCore.pyqtSignal(int, name="signal_operation_removed")
+    signal_login_mscolab = QtCore.pyqtSignal(str, str, name="signal_login_mscolab")
+    signal_logout_mscolab = QtCore.pyqtSignal(name="signal_logout_mscolab")
+    signal_listFlighttrack_doubleClicked = QtCore.pyqtSignal()
+    signal_permission_revoked = QtCore.pyqtSignal(int)
+    signal_render_new_permission = QtCore.pyqtSignal(int, str)
 
     def __init__(self, parent=None, data_dir=None):
         super().__init__(parent)
@@ -1329,22 +1329,22 @@ def get_recent_operation(self):
             show_popup(self.ui, "Error", "Your Connection is expired. New Login required!")
             self.logout()
 
-    @QtCore.Slot()
+    @QtCore.pyqtSlot()
     def reload_operation_list(self):
         if self.mscolab_server_url is not None:
             self.reload_operations()
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def reload_window(self, value):
         if self.active_op_id != value or self.ui.workLocallyCheckbox.isChecked():
             return
         self.reload_wps_from_server()
 
-    @QtCore.Slot()
+    @QtCore.pyqtSlot()
     def reload_windows_slot(self):
         self.reload_window(self.active_op_id)
 
-    @QtCore.Slot(int, int)
+    @QtCore.pyqtSlot(int, int)
     def render_new_permission(self, op_id, u_id):
         """
         op_id: operation id
@@ -1375,7 +1375,7 @@ def render_new_permission(self, op_id, u_id):
             show_popup(self.ui, "Error", "Your Connection is expired. New Login required!")
             self.logout()
 
-    @QtCore.Slot(int, int, str)
+    @QtCore.pyqtSlot(int, int, str)
     def handle_update_permission(self, op_id, u_id, access_level):
         """
         op_id: operation id
@@ -1441,7 +1441,7 @@ def delete_operation_from_list(self, op_id):
             self.ui.listOperationsMSC.takeItem(self.ui.listOperationsMSC.row(remove_item))
             return remove_item.operation_path
 
-    @QtCore.Slot(int, int)
+    @QtCore.pyqtSlot(int, int)
     def handle_revoke_permission(self, op_id, u_id):
         if u_id == self.user["id"]:
             operation_name = self.delete_operation_from_list(op_id)
@@ -1457,7 +1457,7 @@ def handle_revoke_permission(self, op_id, u_id):
                 self.ui.listFlightTracks.setCurrentRow(0)
                 self.ui.activate_selected_flight_track()
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def handle_operation_deleted(self, op_id):
         old_operation_name = self.active_operation_name
         old_active_id = self.active_op_id

mslib/msui/mscolab_chat.py

@@ -375,16 +375,16 @@ def render_new_message(self, message, scroll=True):
             self.messageList.scrollToBottom()
 
     # SOCKET HANDLERS
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def handle_permissions_updated(self, _):
         self.load_users()
 
-    @QtCore.Slot(str)
+    @QtCore.pyqtSlot(str)
     def handle_incoming_message(self, message):
         message = json.loads(message)
         self.render_new_message(message)
 
-    @QtCore.Slot(str)
+    @QtCore.pyqtSlot(str)
     def handle_incoming_message_reply(self, reply):
         reply = json.loads(reply)
         for i in range(self.messageList.count() - 1, -1, -1):
@@ -410,7 +410,7 @@ def handle_incoming_message_reply(self, reply):
                 self.messageList.setItemWidget(item, new_message_item)
                 break
 
-    @QtCore.Slot(str)
+    @QtCore.pyqtSlot(str)
     def handle_message_edited(self, message):
         message = json.loads(message)
         message_id = message["message_id"]
@@ -424,7 +424,7 @@ def handle_message_edited(self, message):
                 item.setSizeHint(message_widget.sizeHint())
                 break
 
-    @QtCore.Slot(str)
+    @QtCore.pyqtSlot(str)
     def handle_deleted_message(self, message):
         message = json.loads(message)
         message_id = message["message_id"]

mslib/msui/msui_mainwindow.py

@@ -351,15 +351,15 @@ class MSUIMainWindow(QtWidgets.QMainWindow, ui.Ui_MSUIMainWindow):
     """
 
     viewsChanged = QtCore.pyqtSignal(name="viewsChanged")
-    signal_activate_flighttrack = QtCore.Signal(ft.WaypointsTableModel, name="signal_activate_flighttrack")
-    signal_activate_operation = QtCore.Signal(int, name="signal_activate_operation")
-    signal_operation_added = QtCore.Signal(int, str, name="signal_operation_added")
-    signal_operation_removed = QtCore.Signal(int, name="signal_operation_removed")
-    signal_login_mscolab = QtCore.Signal(str, str, name="signal_login_mscolab")
-    signal_logout_mscolab = QtCore.Signal(name="signal_logout_mscolab")
-    signal_listFlighttrack_doubleClicked = QtCore.Signal()
-    signal_permission_revoked = QtCore.Signal(int)
-    signal_render_new_permission = QtCore.Signal(int, str)
+    signal_activate_flighttrack = QtCore.pyqtSignal(ft.WaypointsTableModel, name="signal_activate_flighttrack")
+    signal_activate_operation = QtCore.pyqtSignal(int, name="signal_activate_operation")
+    signal_operation_added = QtCore.pyqtSignal(int, str, name="signal_operation_added")
+    signal_operation_removed = QtCore.pyqtSignal(int, name="signal_operation_removed")
+    signal_login_mscolab = QtCore.pyqtSignal(str, str, name="signal_login_mscolab")
+    signal_logout_mscolab = QtCore.pyqtSignal(name="signal_logout_mscolab")
+    signal_listFlighttrack_doubleClicked = QtCore.pyqtSignal()
+    signal_permission_revoked = QtCore.pyqtSignal(int)
+    signal_render_new_permission = QtCore.pyqtSignal(int, str)
 
     def __init__(self, mscolab_data_dir=None, *args):
         super().__init__(*args)
@@ -490,15 +490,15 @@ def add_plugins(self):
         self.add_import_plugins(picker_default)
         self.add_export_plugins(picker_default)
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def activate_operation_slot(self, active_op_id):
         self.signal_activate_operation.emit(active_op_id)
 
-    @QtCore.Slot(int, str)
+    @QtCore.pyqtSlot(int, str)
     def add_operation_slot(self, op_id, path):
         self.signal_operation_added.emit(op_id, path)
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def remove_operation_slot(self, op_id):
         self.signal_operation_removed.emit(op_id)
 

mslib/msui/multiple_flightpath_dockwidget.py

@@ -110,7 +110,7 @@ class MultipleFlightpathControlWidget(QtWidgets.QWidget, ui.Ui_MultipleViewWidge
     # ToDO: Make a new parent class with all the functions in this class and inherit them
     #  in MultipleFlightpathControlWidget and MultipleFlightpathOperations classes.
 
-    signal_parent_closes = QtCore.Signal()
+    signal_parent_closes = QtCore.pyqtSignal()
 
     def __init__(self, parent=None, view=None, listFlightTracks=None,
                  listOperationsMSC=None, activeFlightTrack=None, mscolab_server_url=None, token=None):
@@ -173,7 +173,7 @@ def __init__(self, parent=None, view=None, listFlightTracks=None,
         self.activate_flighttrack()
         self.multipleflightrack_worker = Worker(None)
 
-    @QtCore.Slot()
+    @QtCore.pyqtSlot()
     def logout(self):
         self.operations.logout_mscolab()
         self.ui.signal_listFlighttrack_doubleClicked.disconnect()
@@ -185,7 +185,7 @@ def logout(self):
         for idx in range(len(self.obb)):
             del self.obb[idx]
 
-    @QtCore.Slot(str, str)
+    @QtCore.pyqtSlot(str, str)
     def login(self, url, token):
         self.mscolab_server_url = url
         self.token = token
@@ -250,7 +250,7 @@ def flighttrackAdded(self, parent, start, end):
             self.operations.deactivate_all_operations()
         self.activate_flighttrack()
 
-    @QtCore.Slot(tuple)
+    @QtCore.pyqtSlot(tuple)
     def ft_vertices_color(self, color):
         self.color = color
         self.colorPixmap.setPixmap(self.show_color_pixmap(color))
@@ -265,19 +265,19 @@ def ft_vertices_color(self, color):
         elif self.operation_list:
             self.operations.ft_color_update(color)
 
-    @QtCore.Slot(int, str)
+    @QtCore.pyqtSlot(int, str)
     def add_operation_slot(self, op_id, path):
         self.operations.operationsAdded(op_id, path)
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def remove_operation_slot(self, op_id):
         self.operations.operationRemoved(op_id)
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def update_op_id(self, op_id):
         self.operations.get_op_id(op_id)
 
-    @QtCore.Slot(ft.WaypointsTableModel)
+    @QtCore.pyqtSlot(ft.WaypointsTableModel)
     def get_active(self, active_flighttrack):
         self.update_last_flighttrack()
         self.active_flight_track = active_flighttrack
@@ -768,11 +768,11 @@ def logout_mscolab(self):
         self.token = None
         self.dict_operations = {}
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def permission_revoked(self, op_id):
         self.operationRemoved(op_id)
 
-    @QtCore.Slot(int, str)
+    @QtCore.pyqtSlot(int, str)
     def render_permission(self, op_id, path):
         self.operationsAdded(op_id, path)
 

mslib/msui/socket_control.py

@@ -35,17 +35,17 @@
 
 class ConnectionManager(QtCore.QObject):
 
-    signal_reload = QtCore.Signal(int, name="reload_wps")
-    signal_message_receive = QtCore.Signal(str, name="message rcv")
-    signal_message_reply_receive = QtCore.Signal(str, name="message reply")
-    signal_message_edited = QtCore.Signal(str, name="message editted")
-    signal_message_deleted = QtCore.Signal(str, name="message deleted")
-    signal_new_permission = QtCore.Signal(int, int, name="new permission")
-    signal_update_permission = QtCore.Signal(int, int, str, name="update permission")
-    signal_revoke_permission = QtCore.Signal(int, int, name="revoke permission")
-    signal_operation_permissions_updated = QtCore.Signal(int, name="operation permissions updated")
-    signal_operation_list_updated = QtCore.Signal(name="operation list updated")
-    signal_operation_deleted = QtCore.Signal(int, name="operation deleted")
+    signal_reload = QtCore.pyqtSignal(int, name="reload_wps")
+    signal_message_receive = QtCore.pyqtSignal(str, name="message rcv")
+    signal_message_reply_receive = QtCore.pyqtSignal(str, name="message reply")
+    signal_message_edited = QtCore.pyqtSignal(str, name="message editted")
+    signal_message_deleted = QtCore.pyqtSignal(str, name="message deleted")
+    signal_new_permission = QtCore.pyqtSignal(int, int, name="new permission")
+    signal_update_permission = QtCore.pyqtSignal(int, int, str, name="update permission")
+    signal_revoke_permission = QtCore.pyqtSignal(int, int, name="revoke permission")
+    signal_operation_permissions_updated = QtCore.pyqtSignal(int, name="operation permissions updated")
+    signal_operation_list_updated = QtCore.pyqtSignal(name="operation list updated")
+    signal_operation_deleted = QtCore.pyqtSignal(int, name="operation deleted")
 
     def __init__(self, token, user, mscolab_server_url=mss_default.mscolab_server_url):
         super(ConnectionManager, self).__init__()

mslib/msui/topview.py

@@ -60,7 +60,7 @@ class MSUI_TV_MapAppearanceDialog(QtWidgets.QDialog, ui_ma.Ui_MapAppearanceDialo
     Dialog to set map appearance parameters. User interface is
     defined in "ui_topview_mapappearance.py".
     """
-    signal_ft_vertices_color_change = QtCore.Signal(str, tuple)
+    signal_ft_vertices_color_change = QtCore.pyqtSignal(str, tuple)
 
     def __init__(self, parent=None, settings=None, wms_connected=False):
         """
@@ -174,16 +174,16 @@ class MSUITopViewWindow(MSUIMplViewWindow, ui.Ui_TopViewWindow):
     """
     name = "Top View"
 
-    signal_activate_flighttrack1 = QtCore.Signal(ft.WaypointsTableModel)
-    signal_activate_operation = QtCore.Signal(int)
-    signal_ft_vertices_color_change = QtCore.Signal(tuple)
-    signal_operation_added = QtCore.Signal(int, str)
-    signal_operation_removed = QtCore.Signal(int)
-    signal_login_mscolab = QtCore.Signal(str, str)
-    signal_logout_mscolab = QtCore.Signal()
-    signal_listFlighttrack_doubleClicked = QtCore.Signal()
-    signal_permission_revoked = QtCore.Signal(int)
-    signal_render_new_permission = QtCore.Signal(int, str)
+    signal_activate_flighttrack1 = QtCore.pyqtSignal(ft.WaypointsTableModel)
+    signal_activate_operation = QtCore.pyqtSignal(int)
+    signal_ft_vertices_color_change = QtCore.pyqtSignal(tuple)
+    signal_operation_added = QtCore.pyqtSignal(int, str)
+    signal_operation_removed = QtCore.pyqtSignal(int)
+    signal_login_mscolab = QtCore.pyqtSignal(str, str)
+    signal_logout_mscolab = QtCore.pyqtSignal()
+    signal_listFlighttrack_doubleClicked = QtCore.pyqtSignal()
+    signal_permission_revoked = QtCore.pyqtSignal(int)
+    signal_render_new_permission = QtCore.pyqtSignal(int, str)
 
     def __init__(self, parent=None, model=None, _id=None, active_flighttrack=None, mscolab_server_url=None, token=None):
         """
@@ -243,28 +243,28 @@ def __init__(self, parent=None, model=None, _id=None, active_flighttrack=None, m
     def __del__(self):
         del self.mpl.canvas.waypoints_interactor
 
-    @QtCore.Slot(ft.WaypointsTableModel)
+    @QtCore.pyqtSlot(ft.WaypointsTableModel)
     def update_active_flighttrack(self, active_flighttrack):
         """
         Slot that handles update of active flighttrack variable.
         """
         self.active_flighttrack = active_flighttrack
         self.signal_activate_flighttrack1.emit(active_flighttrack)
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def update_active_operation(self, active_op_id):
         self.active_op_id = active_op_id
         self.signal_activate_operation.emit(self.active_op_id)
 
-    @QtCore.Slot(int, str)
+    @QtCore.pyqtSlot(int, str)
     def add_operation_slot(self, op_id, path):
         self.signal_operation_added.emit(op_id, path)
 
-    @QtCore.Slot(int)
+    @QtCore.pyqtSlot(int)
     def remove_operation_slot(self, op_id):
         self.signal_operation_removed.emit(op_id)
 
-    @QtCore.Slot(str, str)
+    @QtCore.pyqtSlot(str, str)
     def login(self, mscolab_server_url, token):
         self.mscolab_server_url = mscolab_server_url
         self.token = token
@@ -368,11 +368,11 @@ def closed(self):
         self.ui.signal_permission_revoked.disconnect()
         self.ui.signal_render_new_permission.disconnect()
 
-    @QtCore.Slot()
+    @QtCore.pyqtSlot()
     def disable_cbs(self):
         self.wms_connected = True
 
-    @QtCore.Slot()
+    @QtCore.pyqtSlot()
     def enable_cbs(self):
         self.wms_connected = False
 
@@ -420,7 +420,7 @@ def open_settings_dialog(self):
             self.mpl.canvas.waypoints_interactor.redraw_path()
         dlg.destroy()
 
-    @QtCore.Slot(str, tuple)
+    @QtCore.pyqtSlot(str, tuple)
     def set_ft_vertices_color(self, which, color):
         if which == "ft_vertices":
             self.signal_ft_vertices_color_change.emit(color)

mslib/msui/viewwindows.py

@@ -43,7 +43,7 @@ class MSUIViewWindow(QtWidgets.QMainWindow):
 
     viewCloses = QtCore.pyqtSignal(name="viewCloses")
     # views for mscolab
-    # viewClosesId = QtCore.Signal(int, name="viewClosesId")
+    # viewClosesId = QtCore.pyqtSignal(int, name="viewClosesId")
 
     def __init__(self, parent=None, model=None, _id=None):
         super().__init__(parent)