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

[bugfix] now filtering in the main window works; filter parameters are not stored -> has to be checked again

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2015-10-31 00:07:24 +01:00
parent 2201c3ea4d
commit a31e1a21f0
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
QtPyLoT.py
View File

@ -536,38 +536,31 @@ class MainWindow(QMainWindow):
self.plotWaveformData() self.plotWaveformData()
self.drawPicks() self.drawPicks()
def pushFilterWF(self, param_args):
self.getData().filterWFData(param_args)
def filterWaveformData(self): def filterWaveformData(self):
if self.getData(): if self.getData():
def hasfreq(kwdict):
for key in kwdict.keys():
if not key.startswith('freq'):
return True
return False
def pushFilterWF(kwdict):
if hasfreq(kwargs):
self.getData().filterWFData(kwargs)
if self.getFilterOptions() and self.filterAction.isChecked(): if self.getFilterOptions() and self.filterAction.isChecked():
kwargs = self.getFilterOptions().parseFilterOptions() kwargs = self.getFilterOptions().parseFilterOptions()
pushFilterWF(kwargs) self.pushFilterWF(kwargs)
elif self.filterAction.isChecked(): elif self.filterAction.isChecked():
self.adjustFilterOptions() self.adjustFilterOptions()
kwargs = self.getFilterOptions().parseFilterOptions()
pushFilterWF(kwargs)
else: else:
self.getData().resetWFData() self.getData().resetWFData()
self.plotWaveformData() self.plotWaveformData()
def adjustFilterOptions(self): def adjustFilterOptions(self):
filteroptions = self.getFilterOptions()
fstring = "Filter Options ({0})".format(self.getSeismicPhase()) fstring = "Filter Options ({0})".format(self.getSeismicPhase())
filterDlg = FilterOptionsDialog(titleString=fstring, filterDlg = FilterOptionsDialog(titleString=fstring,
parent=self, parent=self)
filterOptions=filteroptions)
if filterDlg.exec_(): if filterDlg.exec_():
filteroptions = filterDlg.getFilterOptions() filteroptions = filterDlg.getFilterOptions()
self.setFilterOptions(filteroptions) self.setFilterOptions(filteroptions)
if self.filterAction.isChecked():
kwargs = self.getFilterOptions().parseFilterOptions()
self.pushFilterWF(kwargs)
self.plotWaveformData()
def getFilterOptions(self): def getFilterOptions(self):
try: try: