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

[Bugfix] fname referenced before assignment.

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-07-17 10:04:57 +02:00
parent 897b915eff
commit cf5cae0ad4
1 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
QtPyLoT.py
View File

@ -1074,17 +1074,6 @@ class MainWindow(QMainWindow):
filename = 'PyLoT_' + eventname filename = 'PyLoT_' + eventname
outpath = os.path.join(directory, filename) outpath = os.path.join(directory, filename)
title = 'Save pick data ...' title = 'Save pick data ...'
# if not outformat:
# outformat = settings.value('output/Format')
# outformat = outformat[0:4]
# else:
# selected_filter = "NonLinLoc observation file (*.obs)"
# fname = outpath
# if outformat == '.obs':
# file_filter = "NonLinLoc observation file (*.obs)"
# elif outformat == '.cnv':
# file_filter = "VELEST observation file format (*.cnv)"
# elif outformat == '.xml':
file_filter = "(*.xml *.obs *.cnv)" file_filter = "(*.xml *.obs *.cnv)"
if dlgflag == 1: if dlgflag == 1:
@ -1093,12 +1082,11 @@ class MainWindow(QMainWindow):
outpath, outpath,
file_filter) file_filter)
# fbasename, exform = os.path.splitext(fname) try:
fbasename = fname fbasename = fname
except:
fbasename = outpath
exform = ['.obs', '.xml', '.cnv'] exform = ['.obs', '.xml', '.cnv']
# if not exform and selected_filter or not exform in OUTPUTFORMATS:
# exform = selected_filter.split('*')[1][:-1]
# return fname, exform
return fbasename, exform return fbasename, exform
settings = QSettings() settings = QSettings()
@ -1148,7 +1136,6 @@ class MainWindow(QMainWindow):
# return False # return False
# 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[0], upperErrors=[uppererrorP[3], uppererrorS[3]]) self.get_data().exportEvent(fbasename, exform[0], upperErrors=[uppererrorP[3], uppererrorS[3]])
self.get_data().exportEvent(fbasename, exform[1], upperErrors=[uppererrorP[3], uppererrorS[3]]) self.get_data().exportEvent(fbasename, exform[1], upperErrors=[uppererrorP[3], uppererrorS[3]])
# self.get_data().exportEvent(fbasename, exform[2], upperErrors=[uppererrorP[3], uppererrorS[3]]) # self.get_data().exportEvent(fbasename, exform[2], upperErrors=[uppererrorP[3], uppererrorS[3]])