diff options
| author | Josh Morman <jmorman@perspectalabs.com> | 2021-03-23 13:04:51 -0400 |
|---|---|---|
| committer | mormj <34754695+mormj@users.noreply.github.com> | 2021-03-23 14:54:58 -0400 |
| commit | f40ce52d452f335d263d67c1711487ef700086aa (patch) | |
| tree | 87c56068d225ed7d9c6fca34bde2efd27ffc4f13 /gr-filter/python | |
| parent | 3e4e7feffb29f54364b370594ee953d1c2d53327 (diff) | |
filter: revert Calculate checkbox index
revert Calculate checkbox index from wintype string
This reverts commit 96d590b12ebe22f088eec205806d738af51122b3.
Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Diffstat (limited to 'gr-filter/python')
| -rw-r--r-- | gr-filter/python/filter/design/filter_design.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/gr-filter/python/filter/design/filter_design.py b/gr-filter/python/filter/design/filter_design.py index 30bcf2de81..532f63df36 100644 --- a/gr-filter/python/filter/design/filter_design.py +++ b/gr-filter/python/filter/design/filter_design.py @@ -2047,10 +2047,9 @@ class gr_plot_filter(QtGui.QMainWindow): self.gui.filterGainEdit.setText(str(params["gain"])) # Set up GUI parameters for each filter type. - checkbox_entry=int(eval('fft.window.'+params["wintype"])) if(params["filttype"] == "lpf"): self.gui.filterTypeComboBox.setCurrentIndex(0) - self.gui.filterDesignTypeComboBox.setCurrentIndex(checkbox_entry) + self.gui.filterDesignTypeComboBox.setCurrentIndex(int(params["wintype"])) self.gui.endofLpfPassBandEdit.setText(str(params["pbend"])) self.gui.startofLpfStopBandEdit.setText(str(params["sbstart"])) @@ -2059,7 +2058,7 @@ class gr_plot_filter(QtGui.QMainWindow): self.gui.lpfPassBandRippleEdit.setText(str(params["ripple"])) elif(params["filttype"] == "bpf"): self.gui.filterTypeComboBox.setCurrentIndex(1) - self.gui.filterDesignTypeComboBox.setCurrentIndex(checkbox_entry) + self.gui.filterDesignTypeComboBox.setCurrentIndex(int(params["wintype"])) self.gui.startofBpfPassBandEdit.setText(str(params["pbstart"])) self.gui.endofBpfPassBandEdit.setText(str(params["pbend"])) @@ -2069,7 +2068,7 @@ class gr_plot_filter(QtGui.QMainWindow): self.gui.bpfPassBandRippleEdit.setText(str(params["ripple"])) elif(params["filttype"] == "cbpf"): self.gui.filterTypeComboBox.setCurrentIndex(2) - self.gui.filterDesignTypeComboBox.setCurrentIndex(checkbox_entry) + self.gui.filterDesignTypeComboBox.setCurrentIndex(int(params["wintype"])) self.gui.startofBpfPassBandEdit.setText(str(params["pbstart"])) self.gui.endofBpfPassBandEdit.setText(str(params["pbend"])) @@ -2079,7 +2078,7 @@ class gr_plot_filter(QtGui.QMainWindow): self.gui.bpfPassBandRippleEdit.setText(str(params["ripple"])) elif(params["filttype"] == "bnf"): self.gui.filterTypeComboBox.setCurrentIndex(3) - self.gui.filterDesignTypeComboBox.setCurrentIndex(checkbox_entry) + self.gui.filterDesignTypeComboBox.setCurrentIndex(int(params["wintype"])) self.gui.startofBnfStopBandEdit.setText(str(params["sbstart"])) self.gui.endofBnfStopBandEdit.setText(str(params["sbend"])) @@ -2089,7 +2088,7 @@ class gr_plot_filter(QtGui.QMainWindow): self.gui.bnfPassBandRippleEdit.setText(str(params["ripple"])) elif(params["filttype"] == "hpf"): self.gui.filterTypeComboBox.setCurrentIndex(4) - self.gui.filterDesignTypeComboBox.setCurrentIndex(checkbox_entry) + self.gui.filterDesignTypeComboBox.setCurrentIndex(int(params["wintype"])) self.gui.endofHpfStopBandEdit.setText(str(params["sbend"])) self.gui.startofHpfPassBandEdit.setText(str(params["pbstart"])) @@ -2098,14 +2097,14 @@ class gr_plot_filter(QtGui.QMainWindow): self.gui.hpfPassBandRippleEdit.setText(str(params["ripple"])) elif(params["filttype"] == "rrc"): self.gui.filterTypeComboBox.setCurrentIndex(5) - self.gui.filterDesignTypeComboBox.setCurrentIndex(checkbox_entry) + self.gui.filterDesignTypeComboBox.setCurrentIndex(int(params["wintype"])) self.gui.rrcSymbolRateEdit.setText(str(params["srate"])) self.gui.rrcAlphaEdit.setText(str(params["alpha"])) self.gui.rrcNumTapsEdit.setText(str(params["ntaps"])) elif(params["filttype"] == "gaus"): self.gui.filterTypeComboBox.setCurrentIndex(6) - self.gui.filterDesignTypeComboBox.setCurrentIndex(checkbox_entry) + self.gui.filterDesignTypeComboBox.setCurrentIndex(int(params["wintype"])) self.gui.gausSymbolRateEdit.setText(str(params["srate"])) self.gui.gausBTEdit.setText(str(params["bt"])) |