fix faulty label visibility behaviour described in #451

jopohl · May 30, 2018 · 89c802f · 89c802f
1 parent 35b6925
commit 89c802f
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/urh/controller/CompareFrameController.py b/src/urh/controller/CompareFrameController.py
@@ -849,17 +849,12 @@ def set_show_only_status(self):
     def show_only_labels(self):
         visible_columns = set()
         for msg in self.proto_analyzer.messages:
-            for lbl in msg.message_type:
-                if lbl.show:
-                    start, end = msg.get_label_range(lbl=lbl, view=self.ui.cbProtoView.currentIndex(),
-                                                     decode=True)
-                    visible_columns |= (set(range(start, end)))
+            for lbl in filter(lambda lbl: lbl.show, msg.message_type):
+                start, end = msg.get_label_range(lbl=lbl, view=self.ui.cbProtoView.currentIndex(), decode=True)
+                visible_columns |= set(range(start, end))
 
         for i in range(self.protocol_model.col_count):
-            if i in visible_columns:
-                self.ui.tblViewProtocol.showColumn(i)
-            else:
-                self.ui.tblViewProtocol.hideColumn(i)
+            self.ui.tblViewProtocol.setColumnHidden(i, i not in visible_columns)
 
     def show_only_diffs(self):
         visible_rows = [i for i in range(self.protocol_model.row_count) if not self.ui.tblViewProtocol.isRowHidden(i)
@@ -894,13 +889,12 @@ def show_only_diffs_and_labels(self):
                 self.ui.tblViewProtocol.hideColumn(j)
 
     def restore_visibility(self):
-        selected = self.ui.tblViewProtocol.selectionModel().selection()
-        """:type: QtWidgets.QItemSelection """
+        selected = self.ui.tblViewProtocol.selectionModel().selection() # type: QItemSelection
 
         for i in range(self.protocol_model.col_count):
             self.ui.tblViewProtocol.showColumn(i)
 
-        for lbl in self.proto_analyzer.protocol_labels:
+        for lbl in filter(lambda lbl: not lbl.show, self.proto_analyzer.protocol_labels):
             self.set_protocol_label_visibility(lbl)
 
         if not selected.isEmpty():