From 4d17860f9576626582e8e5b86b412d7dec7c4b6a Mon Sep 17 00:00:00 2001 From: ReimarBauer Date: Fri, 1 Sep 2023 16:49:52 +0200 Subject: [PATCH] use category for selection --- mslib/msui/multiple_flightpath_dockwidget.py | 6 +++++- mslib/msui/topview.py | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/mslib/msui/multiple_flightpath_dockwidget.py b/mslib/msui/multiple_flightpath_dockwidget.py index 5e246c14a..921c9985a 100644 --- a/mslib/msui/multiple_flightpath_dockwidget.py +++ b/mslib/msui/multiple_flightpath_dockwidget.py @@ -113,7 +113,7 @@ class MultipleFlightpathControlWidget(QtWidgets.QWidget, ui.Ui_MultipleViewWidge signal_parent_closes = QtCore.pyqtSignal() def __init__(self, parent=None, view=None, listFlightTracks=None, - listOperationsMSC=None, activeFlightTrack=None, mscolab_server_url=None, token=None): + listOperationsMSC=None, category=None, activeFlightTrack=None, mscolab_server_url=None, token=None): super().__init__(parent) # ToDO: Remove all patches, on closing dockwidget. self.ui = parent @@ -122,6 +122,7 @@ def __init__(self, parent=None, view=None, listFlightTracks=None, self.flight_path = None # flightpath object self.dict_flighttrack = {} # Dictionary of flighttrack data: patch,color,wp_model self.active_flight_track = activeFlightTrack + self.msc_category = category # object of active category self.listOperationsMSC = listOperationsMSC self.listFlightTracks = listFlightTracks self.mscolab_server_url = mscolab_server_url @@ -555,6 +556,9 @@ def get_wps_from_server(self): if r.text != "False": _json = json.loads(r.text) operations = _json["operations"] + selected_category = self.parent.msc_category.currentText() + if selected_category != "*ANY*": + operations = [op for op in operations if op['category'] == selected_category] return operations def request_wps_from_server(self, op_id): diff --git a/mslib/msui/topview.py b/mslib/msui/topview.py index b2030b1be..8682fd292 100644 --- a/mslib/msui/topview.py +++ b/mslib/msui/topview.py @@ -341,6 +341,7 @@ def openTool(self, index): widget = mf.MultipleFlightpathControlWidget(parent=self, view=self.mpl.canvas, listFlightTracks=self.ui.listFlightTracks, listOperationsMSC=self.ui.listOperationsMSC, + category=self.ui.filterCategoryCb, activeFlightTrack=self.active_flighttrack, mscolab_server_url=self.mscolab_server_url, token=self.token)