marcel/pylot
3
0
Fork 0
Code Issues 7 Pull Requests 1 Releases Wiki Activity

[bugfix] init of Filteroptions class not working with kwargs

Browse Source
This commit is contained in:
Marcel Paffrath 2018-02-22 16:26:46 +01:00
parent b076ee90fa
commit 39b925f475
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
bff88-dirty b076-dirty

11
pylot/core/util/widgets.py
View File

@ -1854,10 +1854,13 @@ class PickDlg(QDialog):
if real_Bool(settings.value('useGuiFilter')) or gui_filter: if real_Bool(settings.value('useGuiFilter')) or gui_filter:
filteroptions = self.filteroptions[phaseID] filteroptions = self.filteroptions[phaseID]
else: else:
filteroptions = getAutoFilteroptions(phaseID, self.parameter).parseFilterOptions() filteroptions = getAutoFilteroptions(phaseID, self.parameter)
if type(filteroptions) == dict: if type(filteroptions) == dict:
return FilterOptions(**filteroptions) freq = [filteroptions['freqmin'], filteroptions['freqmax']]
order = filteroptions['corners']
filtertype = filteroptions['type']
return FilterOptions(filtertype=filtertype, freq=freq, order=order)
else: else:
return filteroptions return filteroptions
@ -4744,7 +4747,9 @@ class FilterOptionsWidget(QWidget):
self.filterOptions.setOrder(self.orderSpinBox.value()) self.filterOptions.setOrder(self.orderSpinBox.value())
def setManuToAuto(self): def setManuToAuto(self):
self.filterOptions = copy.deepcopy(self.filterOptionsAuto) self.filterOptions.setOrder(self.filterOptionsAuto.getOrder())
self.filterOptions.setFilterType(self.filterOptionsAuto.getFilterType())
self.filterOptions.setFreq(self.filterOptionsAuto.getFreq())
self.setMFtoWidget() self.setMFtoWidget()
self.updateUi() self.updateUi()