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

Merge branch 'develop' into feature/obspy_dmt_interface

Browse Source
This commit is contained in:
Marcel Paffrath 2018-04-04 15:20:30 +02:00
commit bd086e6cd4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pylot/RELEASE-VERSION
View File

@ -1 +0,0 @@
7941-dirty

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

@ -2093,7 +2093,10 @@ class PickDlg(QDialog):
# get filter parameter for the phase to be picked # get filter parameter for the phase to be picked
filterphase = self.currentFilterPhase() filterphase = self.currentFilterPhase()
filteroptions = self.getFilterOptions(filterphase).parseFilterOptions() if filterphase:
filteroptions = self.getFilterOptions(filterphase).parseFilterOptions()
else:
filteroptions = None
# copy and filter data for earliest and latest possible picks # copy and filter data for earliest and latest possible picks
wfdata = self.getWFData().copy().select(channel=channel) wfdata = self.getWFData().copy().select(channel=channel)