From 141dd3c9e6c04e12fcde5f167b19585f9e5e98d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Tue, 9 May 2017 18:12:00 +0200 Subject: [PATCH 1/2] Bugfix: wrong parameter naming --- pylot/RELEASE-VERSION | 2 +- pylot/core/pick/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 405bf88d..e08fda2d 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -a8577-dirty +3090-dirty diff --git a/pylot/core/pick/utils.py b/pylot/core/pick/utils.py index 70d7b5b4..a9d41a37 100644 --- a/pylot/core/pick/utils.py +++ b/pylot/core/pick/utils.py @@ -130,7 +130,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None, stealth_mode=False): if iplot: return EPick, LPick, PickError, fig else: - return Epick, LPick, PickError + return EPick, LPick, PickError def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None): From 89a70aae0b6a9e23d02a91d6a181d69b0319300d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Tue, 9 May 2017 18:22:23 +0200 Subject: [PATCH 2/2] Enabled comparison button if manual and automatic picks are available. --- QtPyLoT.py | 1 + pylot/RELEASE-VERSION | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index fb3b6d5b..2d283096 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -962,6 +962,7 @@ class MainWindow(QMainWindow): if event.autopicks: self.autopicks = event.autopicks self.drawPicks(picktype='auto') + self.compare_action.setEnabled(True) self.draw() def clearWaveformDataPlot(self): diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index e08fda2d..b253ed02 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -3090-dirty +141d-dirty