updated_multiple_flightpath_dockwidget

.github/workflows/testing-develop.yml

@@ -31,13 +31,3 @@ jobs:
     secrets:
       PAT: ${{ secrets.PAT }}
 
-  test-filter-flight-paths:
-    uses:
-      ./.github/workflows/testing.yml
-    with:
-      xdist: no
-      branch_name: filter_flight_paths
-      event_name: ${{ github.event_name }}
-    secrets:
-      PAT: ${{ secrets.PAT }}
-

mslib/msui/kmloverlay_dockwidget.py

@@ -478,7 +478,7 @@ def select_file(self, filenames):
                 return
             text = filename
             if text not in self.dict_files:  # prevents same file being added twice
-                # initializing the nested dictionary dict_files
+                # initializing the nested dictionary dict_flighttrack
                 self.dict_files[text] = {}
                 self.dict_files[text]["patch"] = None
                 self.dict_files[text]["color"] = (0, 0, 0, 1)
@@ -536,7 +536,7 @@ def load_file(self):
         Loads multiple KML Files simultaneously and constructs the
         corresponding patches.
         """
-        for entry in self.dict_files.values():  # removes all patches from map, but not from dict_files
+        for entry in self.dict_files.values():  # removes all patches from map, but not from dict_flighttrack
             if entry["patch"] is not None:  # since newly initialized files will have patch:None
                 entry["patch"].remove()
 

mslib/msui/mscolab.py

@@ -414,6 +414,15 @@ class MSUIMscolab(QtCore.QObject):
     """
     name = "Mscolab"
 
+    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)
+
     def __init__(self, parent=None, data_dir=None):
         super(MSUIMscolab, self).__init__(parent)
         self.ui = parent
@@ -429,8 +438,7 @@ def __init__(self, parent=None, data_dir=None):
         self.ui.activeOperationDesc.setHidden(True)
 
         # reset operation description label for flight tracks and open views
-        self.ui.listFlightTracks.itemDoubleClicked.connect(
-            lambda: self.ui.activeOperationDesc.setText("Select Operation to View Description."))
+        self.ui.listFlightTracks.itemDoubleClicked.connect(self.listFlighttrack_itemDoubleClicked)
         self.ui.listViews.itemDoubleClicked.connect(
             lambda: self.ui.activeOperationDesc.setText("Select Operation to View Description."))
 
@@ -611,6 +619,8 @@ def after_login(self, emailid, url, r):
             # disable activate operation button
             self.ui.actionActivateOperation.setEnabled(False)
 
+            self.signal_login_mscolab.emit(self.mscolab_server_url, self.token)
+
     def fetch_gravatar(self, refresh=False):
         email_hash = hashlib.md5(bytes(self.email.encode('utf-8')).lower()).hexdigest()
         email_in_config = self.email in config_loader(dataset="gravatar_ids")
@@ -837,6 +847,7 @@ def add_operation(self):
             self.error_dialog.showMessage('Your operation was created successfully')
             op_id = self.get_recent_op_id()
             self.conn.handle_new_operation(op_id)
+            self.signal_operation_added.emit(op_id, path)
         else:
             self.error_dialog = QtWidgets.QErrorMessage()
             self.error_dialog.showMessage('The path already exists')
@@ -1003,6 +1014,7 @@ def handle_delete_operation(self):
                         res = requests.post(url, data=data)
                         res.raise_for_status()
                         self.reload_operations()
+                        self.signal_operation_removed.emit(self.active_op_id)
                     except requests.exceptions.RequestException as e:
                         logging.debug(e)
                         show_popup(self.ui, "Error", "Some error occurred! Could not delete operation.")
@@ -1301,6 +1313,7 @@ def render_new_permission(self, op_id, u_id):
                 widgetItem.access_level = operation["access_level"]
                 widgetItem.active_operation_desc = operation["description"]
                 self.ui.listOperationsMSC.addItem(widgetItem)
+                self.signal_render_new_permission.emit(operation["op_id"], operation["path"])
             if self.chat_window is not None:
                 self.chat_window.load_users()
         else:
@@ -1383,6 +1396,7 @@ def handle_revoke_permission(self, op_id, u_id):
                 # on import permissions revoked name can not taken from the operation list,
                 # because we update the list first by reloading it.
                 show_popup(self.ui, "Permission Revoked", "Access to an operation was revoked")
+                self.signal_permission_revoked.emit(op_id)
 
     @QtCore.Slot(int)
     def handle_operation_deleted(self, op_id):
@@ -1526,6 +1540,8 @@ def set_active_op_id(self, item):
             self.active_operation_desc = item.active_operation_desc
             self.waypoints_model = None
 
+            self.signal_activate_operation.emit(self.active_op_id)
+
             self.inactive_op_id = None
             font = QtGui.QFont()
             for i in range(self.ui.listOperationsMSC.count()):
@@ -1763,6 +1779,10 @@ def handle_export_msc(self, extension, function, pickertype):
             show_popup(self.ui, "Error", "Your Connection is expired. New Login required!")
             self.logout()
 
+    def listFlighttrack_itemDoubleClicked(self):
+        self.ui.activeOperationDesc.setText("Select Operation to View Description.")
+        self.signal_listFlighttrack_doubleClicked.emit()
+
     def logout(self):
         if self.mscolab_server_url is None:
             return
@@ -1824,6 +1844,8 @@ def logout(self):
             del self.settings["auth"][self.mscolab_server_url]
         save_settings_qsettings('mscolab', self.settings)
 
+        self.signal_logout_mscolab.emit()
+
         # Don't try to activate local flighttrack while testing
         if "pytest" not in sys.modules:
             # activate first local flighttrack after logging out

mslib/msui/msui.py

@@ -140,6 +140,7 @@ class MSUI_ShortcutsDialog(QtWidgets.QDialog, ui_sh.Ui_ShortcutsDialog):
     """
     Dialog showing shortcuts for all currently open windows
     """
+
     def __init__(self):
         super(MSUI_ShortcutsDialog, self).__init__(QtWidgets.QApplication.activeWindow())
         self.setupUi(self)
@@ -336,6 +337,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)
 
     def __init__(self, mscolab_data_dir=None, *args):
         super(MSUIMainWindow, self).__init__(*args)
@@ -426,6 +436,15 @@ def __init__(self, mscolab_data_dir=None, *args):
         self.listFlightTracks.itemClicked.connect(lambda: self.listOperationsMSC.setCurrentItem(None))
         self.listOperationsMSC.itemClicked.connect(lambda: self.listFlightTracks.setCurrentItem(None))
 
+        self.mscolab.signal_activate_operation.connect(self.activate_operation_slot)
+        self.mscolab.signal_operation_added.connect(self.add_operation_slot)
+        self.mscolab.signal_operation_removed.connect(self.remove_operation_slot)
+        self.mscolab.signal_login_mscolab.connect(lambda d, t: self.signal_login_mscolab.emit(d, t))
+        self.mscolab.signal_logout_mscolab.connect(lambda: self.signal_logout_mscolab.emit())
+        self.mscolab.signal_listFlighttrack_doubleClicked.connect(lambda: self.signal_listFlighttrack_doubleClicked.emit())
+        self.mscolab.signal_permission_revoked.connect(lambda op_id: self.signal_permission_revoked.emit(op_id))
+        self.mscolab.signal_render_new_permission.connect(lambda op_id, path: self.signal_render_new_permission.emit(op_id, path))
+
         # Don't start the updater during a test run of msui
         if "pytest" not in sys.modules:
             self.updater = UpdaterUI(self)
@@ -490,6 +509,18 @@ def add_plugins(self):
         self.add_import_plugins(picker_default)
         self.add_export_plugins(picker_default)
 
+    @QtCore.Slot(int)
+    def activate_operation_slot(self, active_op_id):
+        self.signal_activate_operation.emit(active_op_id)
+
+    @QtCore.Slot(int, str)
+    def add_operation_slot(self, op_id, path):
+        self.signal_operation_added.emit(op_id, path)
+
+    @QtCore.Slot(int)
+    def remove_operation_slot(self, op_id):
+        self.signal_operation_removed.emit(op_id)
+
     def add_plugin_submenu(self, name, extension, function, pickertype, plugin_type="Import"):
         if plugin_type == "Import":
             menu = self.menuImportFlightTrack
@@ -705,6 +736,7 @@ def activate_flight_track(self, item):
         font.setBold(True)
         item.setFont(font)
         self.menu_handler()
+        self.signal_activate_flighttrack.emit(self.active_flight_track)
 
     def update_active_flight_track(self, old_flight_track_name=None):
         for i in range(self.listViews.count()):
@@ -738,7 +770,8 @@ def save_handler(self):
             self.save_as_handler()
 
     def save_as_handler(self):
-        """Slot for the 'Save Active Flight Track As' menu entry.
+        """
+        Slot for the 'Save Active Flight Track As' menu entry.
         """
         default_filename = os.path.join(self.last_save_directory, self.active_flight_track.name + ".ftml")
         file_type = ["Flight track (*.ftml)"]
@@ -809,7 +842,10 @@ def create_view(self, _type, model):
         view_window = None
         if _type == "topview":
             # Top view.
-            view_window = topview.MSUITopViewWindow(parent=self, model=model)
+            view_window = topview.MSUITopViewWindow(parent=self, model=model,
+                                                    active_flighttrack=self.active_flight_track,
+                                                    mscolab_server_url=self.mscolab.mscolab_server_url,
+                                                    token=self.mscolab.token)
             view_window.mpl.resize(layout['topview'][0], layout['topview'][1])
             if layout["immutable"]:
                 view_window.mpl.setFixedSize(layout['topview'][0], layout['topview'][1])