From 326eb7b9fbe8439c9b1423acc191c29ad6a5ea38 Mon Sep 17 00:00:00 2001 From: destinyk <destiny.kuehn@student.nmt.edu> Date: Fri, 16 Feb 2024 13:15:34 -0700 Subject: [PATCH] pass node type to sort func, not node object --- nexus/nexus.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/nexus/nexus.py b/nexus/nexus.py index d713c1f5..61feb233 100755 --- a/nexus/nexus.py +++ b/nexus/nexus.py @@ -754,18 +754,18 @@ class NexusWindow(*load_ui("NexusWindow.ui")): ''' index = self.uiInventoryTree.indexAt(point) node = index.model().get_node(index) - type = '' + node_type = '' if isinstance(node, NetworkNode): - type = 'Networks' + node_type = 'Networks' elif isinstance(node, StationNode): - type = 'Stations' + node_type = 'Stations' elif isinstance(node, ChannelNode): - type = 'Channels' + node_type = 'Channels' menu = QtWidgets.QMenu(self) - sort_asc = QtGui.QAction(f"Sort {type} 0-Z") - sort_asc.triggered.connect(lambda: self.set_sorting_order('ascending', node)) - sort_desc = QtGui.QAction(f"Sort {type} Z-0") - sort_desc.triggered.connect(lambda: self.set_sorting_order('descending', node)) + sort_asc = QtGui.QAction(f"Sort {node_type} 0-Z") + sort_asc.triggered.connect(lambda: self.set_sorting_order('ascending', type(node))) + sort_desc = QtGui.QAction(f"Sort {node_type} Z-0") + sort_desc.triggered.connect(lambda: self.set_sorting_order('descending', type(node))) menu.exec([sort_asc, sort_desc], self.uiInventoryTree.mapToGlobal(point)) def set_sorting_order(self, order, node): @@ -774,7 +774,7 @@ class NexusWindow(*load_ui("NexusWindow.ui")): descending order ''' sort_value = False if order == 'ascending' else True - self.sorting_dict[type(node)] = sort_value + self.sorting_dict[node] = sort_value # keep scroll bar where it was after # sorting inventory scroll_value = self.uiInventoryTree.verticalScrollBar().value() -- GitLab