From e3f758fa63d17bad4cea77b137d65b39dc3a992a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Wed, 16 Aug 2017 10:43:05 +0200 Subject: [PATCH 1/3] [Bugfix] get_evt_data().path no more existent. --- pylot/core/io/data.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pylot/core/io/data.py b/pylot/core/io/data.py index 740a0b05..0e44ca5c 100644 --- a/pylot/core/io/data.py +++ b/pylot/core/io/data.py @@ -226,12 +226,10 @@ class Data(object): # try exporting event via ObsPy else: - print(self.get_evt_data()) evtdata_org = self.get_evt_data() - eventpath = evtdata_org.path picks = evtdata_org.picks picks_copy = copy.deepcopy(picks) - evtdata_copy = Event(eventpath) + evtdata_copy = Event(fnout) evtdata_copy.picks = picks_copy # check for stations picked automatically as well as manually From 8d36393e36f422a92bb0765e6d18764bf99fd8ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Wed, 16 Aug 2017 10:52:46 +0200 Subject: [PATCH 2/3] [Bugfix] Enable compare button only, if manual as well as automatic picks are available. --- QtPyLoT.py | 1 + 1 file changed, 1 insertion(+) diff --git a/QtPyLoT.py b/QtPyLoT.py index c3e01ac7..f20eb6ad 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -1476,6 +1476,7 @@ class MainWindow(QMainWindow): self.locateEvent.setEnabled(True) if event.pylot_autopicks: self.drawPicks(picktype='auto') + if event.pylot_picks and event.pylot_autopicks: self.compare_action.setEnabled(True) self.draw() From 5d076511ec23a6f037f31c722bd4527d024a55a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludger=20K=C3=BCperkoch?= Date: Wed, 16 Aug 2017 12:12:04 +0200 Subject: [PATCH 3/3] [Bugfix] Input are already picks, no more event object. --- pylot/core/pick/compare.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pylot/core/pick/compare.py b/pylot/core/pick/compare.py index 9d382254..a63d8e15 100644 --- a/pylot/core/pick/compare.py +++ b/pylot/core/pick/compare.py @@ -251,11 +251,7 @@ class PDFDictionary(object): @classmethod def from_quakeml(self, fn): - cat = read_events(fn) - if len(cat) > 1: - raise NotImplementedError('reading more than one event at the same ' - 'time is not implemented yet! Sorry!') - return PDFDictionary(picksdict_from_picks(cat[0])) # MP MP TODO: change function argument (auto/manu) + return PDFDictionary(fn) # LK TODO: check if stations are available with both automatic and manual picks def get_all(self, phase): rlist = list()