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

[bugfix] error-prone check for method_id.id

Browse Source
This commit is contained in:
Marcel Paffrath 2017-07-17 11:58:32 +02:00
parent 7e0f4efbcc
commit 2633f4b9cf
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
QtPyLoT.py
View File

@ -1115,7 +1115,7 @@ class MainWindow(QMainWindow):
# MP MP changed to suppress unnecessary user prompt # MP MP changed to suppress unnecessary user prompt
fcheck = ['manual', 'origins', 'magnitude'] fcheck = ['manual', 'origins', 'magnitude']
try: try:
self.get_data().exportEvent(fbasename, exform, fcheck='manual', self.get_data().exportEvent(fbasename, exform, fcheck=fcheck,
upperErrors=[uppererrorP[3], uppererrorS[3]]) upperErrors=[uppererrorP[3], uppererrorS[3]])
except FormatError as e: except FormatError as e:
fbasename, exform = getSavePath(e, directory, outformat) fbasename, exform = getSavePath(e, directory, outformat)
@ -1139,15 +1139,15 @@ class MainWindow(QMainWindow):
# export to given path # export to given path
#self.get_data().exportEvent(fbasename, exform, upperErrors=[uppererrorP[3], uppererrorS[3]]) #self.get_data().exportEvent(fbasename, exform, upperErrors=[uppererrorP[3], uppererrorS[3]])
try: #try:
self.get_data().exportEvent(fbasename, exform[0], fcheck='manual', self.get_data().exportEvent(fbasename, exform[0], fcheck=fcheck,
upperErrors=[uppererrorP[3], uppererrorS[3]]) upperErrors=[uppererrorP[3], uppererrorS[3]])
self.get_data().exportEvent(fbasename, exform[1], fcheck='manual', self.get_data().exportEvent(fbasename, exform[1], fcheck=fcheck,
upperErrors=[uppererrorP[3], uppererrorS[3]]) upperErrors=[uppererrorP[3], uppererrorS[3]])
except Exception as e: # except Exception as e:
QMessageBox.warning(self, "PyLoT Warning", # QMessageBox.warning(self, "PyLoT Warning",
"Could not save event: {}".format(e)) # "Could not save event: {}".format(e))
return # return
#self.get_data().exportEvent(fbasename, exform[2], upperErrors=[uppererrorP[3], uppererrorS[3]]) #self.get_data().exportEvent(fbasename, exform[2], upperErrors=[uppererrorP[3], uppererrorS[3]])
# all files save (ui clean) # all files save (ui clean)
self.update_status('Picks saved as %s, %s, and %s' % (fbasename + exform[0], fbasename + exform[1], self.update_status('Picks saved as %s, %s, and %s' % (fbasename + exform[0], fbasename + exform[1],

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
7f0a-dirty 7e0f-dirty

4
pylot/core/io/data.py
View File

@ -174,7 +174,7 @@ class Data(object):
picks = event.picks picks = event.picks
#remove existing picks #remove existing picks
for j, pick in reversed(list(enumerate(picks))): for j, pick in reversed(list(enumerate(picks))):
if pick.method_id.id.split('/')[1] == picktype: if picktype in str(pick.method_id.id):
picks.pop(j) picks.pop(j)
checkflag = 1 checkflag = 1
if checkflag: if checkflag:
@ -182,7 +182,7 @@ class Data(object):
#append new picks #append new picks
for pick in self.get_evt_data().picks: for pick in self.get_evt_data().picks:
if pick.method_id.id.split('/')[1] == picktype: if picktype in str(pick.method_id.id):
picks.append(pick) picks.append(pick)
def exportEvent(self, fnout, fnext='.xml', fcheck='auto', upperErrors=None): def exportEvent(self, fnout, fnext='.xml', fcheck='auto', upperErrors=None):