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

[bugfix] autoPyLoT <-> obspyDMT

Browse Source
This commit is contained in:
Marcel Paffrath 2018-06-21 13:24:24 +02:00
parent 7ad36c2305
commit 2a8efd0904
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PyLoT.py
View File

@ -2481,6 +2481,7 @@ class MainWindow(QMainWindow):
# export current picks etc. # export current picks etc.
self.exportAllEvents(['.xml']) self.exportAllEvents(['.xml'])
wfpath = self.dataPlot.qcombo_processed.currentText() if self.obspy_dmt else ''
# define arguments for picker # define arguments for picker
args = {'parameter': self._inputs, args = {'parameter': self._inputs,
'station': 'all', 'station': 'all',
@ -2490,8 +2491,8 @@ class MainWindow(QMainWindow):
'fig_dict': None, 'fig_dict': None,
'fig_dict_wadatijack': self.fig_dict_wadatijack, 'fig_dict_wadatijack': self.fig_dict_wadatijack,
'locflag': 0, 'locflag': 0,
'savexml': False} 'savexml': False,
'obspyDMT_wfpath': wfpath}
# init pick thread # init pick thread
self.mp_thread = QtCore.QThreadPool() self.mp_thread = QtCore.QThreadPool()
self.mp_worker = Worker(autoPyLoT, args, redirect_stdout=True) self.mp_worker = Worker(autoPyLoT, args, redirect_stdout=True)

3
pylot/core/util/widgets.py
View File

@ -3409,6 +3409,7 @@ class TuneAutopicker(QWidget):
if not station: if not station:
self._warn('No station selected') self._warn('No station selected')
return return
wfpath = self.wftype if self.obspy_dmt else ''
args = {'parameter': self.parameter, args = {'parameter': self.parameter,
'station': station, 'station': station,
'fnames': 'None', 'fnames': 'None',
@ -3417,7 +3418,7 @@ class TuneAutopicker(QWidget):
'fig_dict': self.fig_dict, 'fig_dict': self.fig_dict,
'locflag': 0, 'locflag': 0,
'savexml': False, 'savexml': False,
'obspyDMT_wfpath': self.obspy_dmt} 'obspyDMT_wfpath': wfpath}
for key in self.fig_dict.keys(): for key in self.fig_dict.keys():
if not key == 'plot_style': if not key == 'plot_style':
self.fig_dict[key].clear() self.fig_dict[key].clear()