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

merge origin/develop into develop

Browse Source
This commit is contained in:
Marcel Paffrath 2017-06-30 13:31:19 +02:00
commit 533f7ea353
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
QtPyLoT.py
View File

@ -1431,6 +1431,7 @@ class MainWindow(QMainWindow):
self.pylot_picks = event.pylot_picks self.pylot_picks = event.pylot_picks
self.drawPicks(picktype='manual') self.drawPicks(picktype='manual')
self.enableSaveManualPicksAction() self.enableSaveManualPicksAction()
self.locateEvent.setEnabled(True)
if event.pylot_autopicks: if event.pylot_autopicks:
self.pylot_autopicks = event.pylot_autopicks self.pylot_autopicks = event.pylot_autopicks
self.drawPicks(picktype='auto') self.drawPicks(picktype='auto')
@ -1958,7 +1959,7 @@ class MainWindow(QMainWindow):
phasefile = os.path.split(os.tempnam())[-1] phasefile = os.path.split(os.tempnam())[-1]
phasepath = os.path.join(locroot, 'obs', phasefile) phasepath = os.path.join(locroot, 'obs', phasefile)
locpath = os.path.join(locroot, 'loc', outfile) locpath = os.path.join(locroot, 'loc', outfile)
lt.export(self.getPicks(), phasepath) lt.export(self.getPicks(), phasepath, self.project.parameter)
lt.modify_inputs(infile, locroot, outfile, phasefile, ttt) lt.modify_inputs(infile, locroot, outfile, phasefile, ttt)
try: try:
lt.locate(infile) lt.locate(infile)

1
pylot/RELEASE-VERSION
View File

@ -1 +0,0 @@
a61e-dirty