From 3d9c35ad67749c17edf0afc946791933135504b6 Mon Sep 17 00:00:00 2001
From: alessandro90 <alessandro.ceccato.3@gmail.com>
Date: Tue, 16 Oct 2018 19:58:52 +0200
Subject: [PATCH] Optionally include signals with undefined frequencies

---
 main.py        |  44 +++++----
 main_window.ui | 241 ++++++++++++++++++++++++++-----------------------
 2 files changed, 154 insertions(+), 131 deletions(-)

diff --git a/main.py b/main.py
index 402f20e..8f572c7 100644
--- a/main.py
+++ b/main.py
@@ -66,8 +66,8 @@ class MyApp(QMainWindow, Ui_MainWindow):
                         self.lower_freq_confidence.value()
                     )
         )
-        self.apply_reset_freq_filter_btn.set_texts("Apply", "Remove")
-        self.apply_reset_freq_filter_btn.set_slave_filters(
+        self.apply_remove_freq_filter_btn.set_texts("Apply", "Remove")
+        self.apply_remove_freq_filter_btn.set_slave_filters(
             *self.frequency_filters_btns, 
             self.lower_freq_spinbox, 
             self.upper_freq_spinbox,
@@ -75,8 +75,9 @@ class MyApp(QMainWindow, Ui_MainWindow):
             self.upper_freq_filter_unit,
             self.lower_freq_confidence, 
             self.upper_freq_confidence,
+            self.include_undef_freqs,
         )
-        self.apply_reset_freq_filter_btn.clicked.connect(self.display_signals)
+        self.apply_remove_freq_filter_btn.clicked.connect(self.display_signals)
         self.reset_frequency_filters_btn.clicked.connect(self.reset_frequency_filters)
         UrlColors = namedtuple("UrlColors", ["inactive", "active", "clicked"])
         self.url_button.colors = UrlColors("#9f9f9f", "#4c75ff", "#942ccc")
@@ -132,20 +133,6 @@ class MyApp(QMainWindow, Ui_MainWindow):
             BandLabel(self.ehf_left, self.ehf, self.ehf_right),
         ]
 
-    def reset_frequency_filters(self):
-        if self.apply_reset_freq_filter_btn.isChecked():
-            self.apply_reset_freq_filter_btn.setChecked(False)
-            self.apply_reset_freq_filter_btn.clicked.emit()
-        for f in self.frequency_filters_btns:
-            if f.isChecked():
-                f.setChecked(False)
-        self.lower_freq_spinbox.setValue(0)
-        self.upper_freq_spinbox.setValue(0)
-        self.lower_freq_filter_unit.setCurrentText("MHz")
-        self.upper_freq_filter_unit.setCurrentText("MHz")
-        self.lower_freq_confidence.setValue(5)
-        self.upper_freq_confidence.setValue(5)
-
     def set_initial_size(self):
         """
         Function to handle high resolution screens. The function sets bigger sizes
@@ -242,12 +229,31 @@ class MyApp(QMainWindow, Ui_MainWindow):
                 self.frequency_filters_ok(signal):
                 self.result_list.addItem(signal)
 
+    def reset_frequency_filters(self):
+        if self.apply_remove_freq_filter_btn.isChecked():
+            self.apply_remove_freq_filter_btn.setChecked(False)
+            self.apply_remove_freq_filter_btn.clicked.emit()
+        for f in self.frequency_filters_btns:
+            if f.isChecked():
+                f.setChecked(False)
+        if self.include_undef_freqs.isChecked():
+            self.include_undef_freqs.setChecked(False)
+        self.lower_freq_spinbox.setValue(0)
+        self.upper_freq_spinbox.setValue(0)
+        self.lower_freq_filter_unit.setCurrentText("MHz")
+        self.upper_freq_filter_unit.setCurrentText("MHz")
+        self.lower_freq_confidence.setValue(5)
+        self.upper_freq_confidence.setValue(5)                
+
     def frequency_filters_ok(self, signal_name):
-        if not self.apply_reset_freq_filter_btn.isChecked():
+        if not self.apply_remove_freq_filter_btn.isChecked():
             return True
         undef_freq, _ = self.find_if_undefined(self.db.loc[signal_name])
         if undef_freq:
-            return True
+            if self.include_undef_freqs.isChecked():
+                return True
+            else:
+                return False
         conversion_factors = {"Hz":1, "kHz":1000, "MHz":1000000,
                               "GHz":1000000000}
 
diff --git a/main_window.ui b/main_window.ui
index cb9b000..fc93f79 100644
--- a/main_window.ui
+++ b/main_window.ui
@@ -1979,7 +1979,24 @@ QPushButton:checked {
                 <string notr="true"/>
                </property>
                <layout class="QGridLayout" name="gridLayout_5">
-                <item row="0" column="0">
+                <item row="0" column="0" colspan="3">
+                 <widget class="QPushButton" name="include_undef_freqs">
+                  <property name="font">
+                   <font>
+                    <pointsize>10</pointsize>
+                    <weight>75</weight>
+                    <bold>true</bold>
+                   </font>
+                  </property>
+                  <property name="text">
+                   <string>Include undefined frequencies</string>
+                  </property>
+                  <property name="checkable">
+                   <bool>true</bool>
+                  </property>
+                 </widget>
+                </item>
+                <item row="1" column="0">
                  <widget class="QPushButton" name="elf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2005,7 +2022,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="1">
+                <item row="1" column="1">
                  <widget class="QPushButton" name="slf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2025,7 +2042,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="0" column="2">
+                <item row="1" column="2">
                  <widget class="QPushButton" name="ulf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2045,7 +2062,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="0">
+                <item row="2" column="0">
                  <widget class="QPushButton" name="vlf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2065,7 +2082,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="1">
+                <item row="2" column="1">
                  <widget class="QPushButton" name="lf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2085,7 +2102,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="1" column="2">
+                <item row="2" column="2">
                  <widget class="QPushButton" name="mf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2111,7 +2128,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="0">
+                <item row="3" column="0">
                  <widget class="QPushButton" name="hf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2137,7 +2154,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="1">
+                <item row="3" column="1">
                  <widget class="QPushButton" name="vhf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2157,7 +2174,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="2" column="2">
+                <item row="3" column="2">
                  <widget class="QPushButton" name="uhf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2177,7 +2194,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="3" column="0">
+                <item row="4" column="0">
                  <widget class="QPushButton" name="shf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2197,7 +2214,7 @@ QPushButton:checked {
                   </property>
                  </widget>
                 </item>
-                <item row="3" column="2">
+                <item row="4" column="2">
                  <widget class="QPushButton" name="ehf_filter_btn">
                   <property name="enabled">
                    <bool>true</bool>
@@ -2241,7 +2258,30 @@ QPushButton:checked {
                    </sizepolicy>
                   </property>
                   <layout class="QGridLayout" name="gridLayout_6">
-                   <item row="0" column="1">
+                   <item row="2" column="0">
+                    <widget class="QLabel" name="label_10">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="font">
+                      <font>
+                       <pointsize>12</pointsize>
+                       <weight>75</weight>
+                       <bold>true</bold>
+                      </font>
+                     </property>
+                     <property name="text">
+                      <string>Upper frequency</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="1">
                     <widget class="QSpinBox" name="lower_freq_spinbox">
                      <property name="enabled">
                       <bool>true</bool>
@@ -2277,30 +2317,7 @@ QPushButton:checked {
                      </property>
                     </widget>
                    </item>
-                   <item row="1" column="0">
-                    <widget class="QLabel" name="label_10">
-                     <property name="sizePolicy">
-                      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
-                     <property name="font">
-                      <font>
-                       <pointsize>12</pointsize>
-                       <weight>75</weight>
-                       <bold>true</bold>
-                      </font>
-                     </property>
-                     <property name="text">
-                      <string>Upper frequency</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="2">
+                   <item row="2" column="2">
                     <widget class="QComboBox" name="upper_freq_filter_unit">
                      <property name="enabled">
                       <bool>true</bool>
@@ -2355,55 +2372,7 @@ QPushButton:checked {
                      </item>
                     </widget>
                    </item>
-                   <item row="0" column="4">
-                    <widget class="QSpinBox" name="lower_freq_confidence">
-                     <property name="enabled">
-                      <bool>true</bool>
-                     </property>
-                     <property name="sizePolicy">
-                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
-                     <property name="minimumSize">
-                      <size>
-                       <width>60</width>
-                       <height>0</height>
-                      </size>
-                     </property>
-                     <property name="maximumSize">
-                      <size>
-                       <width>50</width>
-                       <height>16777215</height>
-                      </size>
-                     </property>
-                     <property name="font">
-                      <font>
-                       <pointsize>12</pointsize>
-                      </font>
-                     </property>
-                     <property name="frame">
-                      <bool>false</bool>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignCenter</set>
-                     </property>
-                     <property name="buttonSymbols">
-                      <enum>QAbstractSpinBox::UpDownArrows</enum>
-                     </property>
-                     <property name="specialValueText">
-                      <string/>
-                     </property>
-                     <property name="maximum">
-                      <number>100</number>
-                     </property>
-                     <property name="value">
-                      <number>5</number>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="1" column="4">
+                   <item row="2" column="4">
                     <widget class="QSpinBox" name="upper_freq_confidence">
                      <property name="enabled">
                       <bool>true</bool>
@@ -2451,7 +2420,7 @@ QPushButton:checked {
                      </property>
                     </widget>
                    </item>
-                   <item row="0" column="0">
+                   <item row="1" column="0">
                     <widget class="QLabel" name="label_2">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -2475,29 +2444,6 @@ QPushButton:checked {
                     </widget>
                    </item>
                    <item row="1" column="3">
-                    <widget class="QLabel" name="label_13">
-                     <property name="sizePolicy">
-                      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
-                       <horstretch>0</horstretch>
-                       <verstretch>0</verstretch>
-                      </sizepolicy>
-                     </property>
-                     <property name="font">
-                      <font>
-                       <pointsize>12</pointsize>
-                       <weight>75</weight>
-                       <bold>true</bold>
-                      </font>
-                     </property>
-                     <property name="text">
-                      <string>   Confidence %</string>
-                     </property>
-                     <property name="alignment">
-                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                     </property>
-                    </widget>
-                   </item>
-                   <item row="0" column="3">
                     <widget class="QLabel" name="label_12">
                      <property name="sizePolicy">
                       <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
@@ -2520,7 +2466,7 @@ QPushButton:checked {
                      </property>
                     </widget>
                    </item>
-                   <item row="1" column="1">
+                   <item row="2" column="1">
                     <widget class="QSpinBox" name="upper_freq_spinbox">
                      <property name="enabled">
                       <bool>true</bool>
@@ -2559,7 +2505,7 @@ QPushButton:checked {
                      </property>
                     </widget>
                    </item>
-                   <item row="0" column="2">
+                   <item row="1" column="2">
                     <widget class="QComboBox" name="lower_freq_filter_unit">
                      <property name="enabled">
                       <bool>true</bool>
@@ -2623,6 +2569,77 @@ QPushButton:checked {
                      </item>
                     </widget>
                    </item>
+                   <item row="2" column="3">
+                    <widget class="QLabel" name="label_13">
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="font">
+                      <font>
+                       <pointsize>12</pointsize>
+                       <weight>75</weight>
+                       <bold>true</bold>
+                      </font>
+                     </property>
+                     <property name="text">
+                      <string>   Confidence %</string>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                     </property>
+                    </widget>
+                   </item>
+                   <item row="1" column="4">
+                    <widget class="QSpinBox" name="lower_freq_confidence">
+                     <property name="enabled">
+                      <bool>true</bool>
+                     </property>
+                     <property name="sizePolicy">
+                      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                       <horstretch>0</horstretch>
+                       <verstretch>0</verstretch>
+                      </sizepolicy>
+                     </property>
+                     <property name="minimumSize">
+                      <size>
+                       <width>60</width>
+                       <height>0</height>
+                      </size>
+                     </property>
+                     <property name="maximumSize">
+                      <size>
+                       <width>50</width>
+                       <height>16777215</height>
+                      </size>
+                     </property>
+                     <property name="font">
+                      <font>
+                       <pointsize>12</pointsize>
+                      </font>
+                     </property>
+                     <property name="frame">
+                      <bool>false</bool>
+                     </property>
+                     <property name="alignment">
+                      <set>Qt::AlignCenter</set>
+                     </property>
+                     <property name="buttonSymbols">
+                      <enum>QAbstractSpinBox::UpDownArrows</enum>
+                     </property>
+                     <property name="specialValueText">
+                      <string/>
+                     </property>
+                     <property name="maximum">
+                      <number>100</number>
+                     </property>
+                     <property name="value">
+                      <number>5</number>
+                     </property>
+                    </widget>
+                   </item>
                   </layout>
                  </widget>
                 </item>
@@ -2630,7 +2647,7 @@ QPushButton:checked {
               </widget>
              </item>
              <item>
-              <widget class="DoubleTextButton" name="apply_reset_freq_filter_btn">
+              <widget class="DoubleTextButton" name="apply_remove_freq_filter_btn">
                <property name="enabled">
                 <bool>true</bool>
                </property>