From 8ec50b2ce6cc43d91504d7cb0b8476128e66d41d Mon Sep 17 00:00:00 2001 From: alessandro90 Date: Sun, 11 Nov 2018 13:22:01 +0100 Subject: [PATCH] Add 'include unknown modes' functionality --- main.py | 12 ++++++++++-- main_window.ui | 2 +- utilities.py | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/main.py b/main.py index 8c6c90f..a51e277 100644 --- a/main.py +++ b/main.py @@ -274,7 +274,8 @@ class MyApp(QMainWindow, Ui_MainWindow): self.mode_tree_widget.itemSelectionChanged.connect(self.manage_mode_selections) self.reset_mode_filters_btn.clicked.connect(self.reset_mode_filters) self.apply_remove_mode_filter_btn.set_texts("Apply", "Remove") - self.apply_remove_mode_filter_btn.set_slave_filters([self.mode_tree_widget]) + self.apply_remove_mode_filter_btn.set_slave_filters([self.mode_tree_widget, + self.include_unknown_modes_btn]) self.apply_remove_mode_filter_btn.clicked.connect(self.display_signals) self.reset_mode_filters_btn.clicked.connect(self.reset_mode_filters) @@ -589,6 +590,8 @@ class MyApp(QMainWindow, Ui_MainWindow): self.apply_remove_mode_filter_btn.clicked.emit() for item in self.mode_tree_widget.selectedItems(): item.setSelected(False) + if self.include_unknown_modes_btn.isChecked(): + self.include_unknown_modes_btn.setChecked(False) def frequency_filters_ok(self, signal_name): if not self.apply_remove_freq_filter_btn.isChecked(): @@ -673,11 +676,16 @@ class MyApp(QMainWindow, Ui_MainWindow): def mode_filters_ok(self, signal_name): if not self.apply_remove_mode_filter_btn.isChecked(): return True + signal_mode = self.db.at[signal_name, "mode"] + if signal_mode == Constants.unknown: + if self.include_unknown_modes_btn.isChecked(): + return True + else: + return False selected_items = [item for item in self.mode_tree_widget.selectedItems()] selected_items_text = [i.text(0) for i in selected_items] parents = [item for item in selected_items_text if item in Constants.modes.keys()] children = [item for item in selected_items_text if item not in parents] - signal_mode = self.db.at[signal_name, "mode"] ok = [] for item in selected_items: if item.text(0) in parents: diff --git a/main_window.ui b/main_window.ui index aaae821..8943bbe 100644 --- a/main_window.ui +++ b/main_window.ui @@ -3712,7 +3712,7 @@ QWidget#xFM_container, QWidget#xSK_container, QWidget#xSB_container{ - + 12 diff --git a/utilities.py b/utilities.py index 4196783..98763ec 100644 --- a/utilities.py +++ b/utilities.py @@ -46,6 +46,7 @@ class Constants(object): "RAW": [], "SC-FDMA": [],} ) + unknown = "Unknown" def checksum_ok(data, what):