Merge branch 'develop' into feature/obspy_dmt_interface

2018-04-04 15:20:30 +02:00 · 2018-04-04 15:20:30 +02:00 · bd086e6cd4
commit bd086e6cd4
parent 366db9aef0 a201b99c2e
2 changed files with 4 additions and 2 deletions
--- a/pylot/RELEASE-VERSION
+++ b/pylot/RELEASE-VERSION
@ -1 +0,0 @@
-7941-dirty
--- a/pylot/core/util/widgets.py
+++ b/pylot/core/util/widgets.py
@ -2093,7 +2093,10 @@ class PickDlg(QDialog):

        # get filter parameter for the phase to be picked
        filterphase = self.currentFilterPhase()
+        if filterphase:
            filteroptions = self.getFilterOptions(filterphase).parseFilterOptions()
+        else:
+            filteroptions = None

        # copy and filter data for earliest and latest possible picks
        wfdata = self.getWFData().copy().select(channel=channel)