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-05-10 15:48:02 +02:00
commit dc656e5c57
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
QtPyLoT.py
View File

@ -962,6 +962,7 @@ class MainWindow(QMainWindow):
if event.autopicks: if event.autopicks:
self.autopicks = event.autopicks self.autopicks = event.autopicks
self.drawPicks(picktype='auto') self.drawPicks(picktype='auto')
self.compare_action.setEnabled(True)
self.draw() self.draw()
def clearWaveformDataPlot(self): def clearWaveformDataPlot(self):

2
pylot/core/pick/utils.py
View File

@ -130,7 +130,7 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=None, stealth_mode=False):
if iplot: if iplot:
return EPick, LPick, PickError, fig return EPick, LPick, PickError, fig
else: else:
return Epick, LPick, PickError return EPick, LPick, PickError
def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None): def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=None):