From 8e60268fc58801ea40c8245ffb265da56fb33d1c Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Thu, 22 Jun 2017 15:52:28 +0200 Subject: [PATCH 1/3] [hotfix] output XML name clipped --- QtPyLoT.py | 1 - 1 file changed, 1 deletion(-) diff --git a/QtPyLoT.py b/QtPyLoT.py index 51e3dd93..8fa3baa3 100755 --- a/QtPyLoT.py +++ b/QtPyLoT.py @@ -979,7 +979,6 @@ class MainWindow(QMainWindow): if not exform and selected_filter or not exform in OUTPUTFORMATS: exform = selected_filter.split('*')[1][:-1] - if not exform in OUTPUTFORMATS: return fname, exform return fbasename, exform From 09b2dfa5d1b7193ac9c7e2fe80fe6e5b9cb7e7fd Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Thu, 6 Jul 2017 09:53:13 +0200 Subject: [PATCH 2/3] [hotfix] could not load multiple parameters from pylot.in if values are type==string --- pylot/core/io/inputs.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pylot/core/io/inputs.py b/pylot/core/io/inputs.py index 9aa9b5d2..9b23612d 100644 --- a/pylot/core/io/inputs.py +++ b/pylot/core/io/inputs.py @@ -208,7 +208,10 @@ class PylotParameter(object): vallist = value.strip().split(' ') val = [] for val0 in vallist: - val0 = float(val0) + try: + val0 = float(val0) + except: + pass val.append(val0) else: val = str(value.strip()) From fedb7c2c0ddb25ad2f8d7e61b24428e04d4559eb Mon Sep 17 00:00:00 2001 From: Marcel Paffrath Date: Fri, 7 Jul 2017 13:15:20 +0200 Subject: [PATCH 3/3] [hotfix refs #220] Missmatching ressource_id's only produced warning on exporting picks, but did not prevent event mixing --- pylot/core/io/data.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pylot/core/io/data.py b/pylot/core/io/data.py index 0bb22951..9b8ced19 100644 --- a/pylot/core/io/data.py +++ b/pylot/core/io/data.py @@ -393,13 +393,13 @@ class Data(object): else: # prevent overwriting original pick information event_old = self.get_evt_data() - print(event_old.resource_id, event.resource_id) if not event_old.resource_id == event.resource_id: print("WARNING: Missmatch in event resource id's: {} and {}".format( event_old.resource_id, event.resource_id)) - picks = copy.deepcopy(event_old.picks) - event = merge_picks(event, picks) + else: + picks = copy.deepcopy(event_old.picks) + event = merge_picks(event, picks) # apply event information from location event_old.update(event)