From bff888c98a8238c78ba2ef5e0cc4955d6bbd71f2 Mon Sep 17 00:00:00 2001 From: Marcel Date: Thu, 22 Feb 2018 11:33:14 +0100 Subject: [PATCH] [bugfix] emitted signal disturbing reset feature --- pylot/RELEASE-VERSION | 2 +- pylot/core/util/widgets.py | 19 +++++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 624322b5..1250d82e 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -90bc-dirty +2e5e-dirty diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index e69f93a5..95af68b2 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -4684,19 +4684,22 @@ class FilterOptionsWidget(QWidget): self.comparable = all(comparable) def setMFtoWidget(self): - self.selectTypeCombo.setCurrentIndex(self.typeOptions.index(self.getFilterOptions().getFilterType())) try: freqmin, freqmax = self.filterOptions.getFreq() - self.freqminSpinBox.setValue(freqmin) - self.freqmaxSpinBox.setValue(freqmax) except TypeError as e: print(e) - self.freqmaxSpinBox.setValue(1.) - self.freqminSpinBox.setValue(.1) + freqmin, freqmax = (0.1, 1.0) try: - self.orderSpinBox.setValue(self.getFilterOptions().getOrder()) - except: - self.orderSpinBox.setValue(2) + order = self.getFilterOptions().getOrder() + except TypeError as e: + print(e) + order = 4 + ftype = self.getFilterOptions().getFilterType() + + self.selectTypeCombo.setCurrentIndex(self.typeOptions.index(ftype)) + self.freqminSpinBox.setValue(freqmin) + self.freqmaxSpinBox.setValue(freqmax) + self.orderSpinBox.setValue(order) def updateMFfromWidget(self): type = self.selectTypeCombo.currentText()