bugfix: attribute was of wrong kind for which the successive call raised an exception

This commit is contained in:
Sebastian Wehling-Benatelli 2015-02-18 15:27:50 +01:00
parent d15441900e
commit 5c9f17bce3

View File

@ -357,16 +357,23 @@ class MainWindow(QMainWindow):
def filterWaveformData(self): def filterWaveformData(self):
if self.getData(): if self.getData():
def hasfreq(kwargs):
for key in kwargs.keys():
if not key.startswith('freq'):
return True
return False
kwargs = {} kwargs = {}
freq = self.getFilterOptions().getFreq() freq = self.getFilterOptions().getFreq()
if len(freq) > 1: if freq is not None and len(freq) > 1:
kwargs['freqmin'] = freq[0] kwargs['freqmin'] = freq[0]
kwargs['freqmax'] = freq[1] kwargs['freqmax'] = freq[1]
else: elif freq is not None and len(freq) == 1:
kwargs['freq'] = freq kwargs['freq'] = freq
kwargs['type'] = self.getFilterOptions().getFilterType()
kwargs['corners'] = self.filteroptions.getOrder() if hasfreq(kwargs):
self.getData().filter(kwargs) kwargs['type'] = self.getFilterOptions().getFilterType()
kwargs['corners'] = self.getFilterOptions().getOrder()
self.getData().filter(kwargs)
def adjustFilterOptions(self): def adjustFilterOptions(self):
filteroptions = None filteroptions = None