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

Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-08-14 15:10:57 +02:00
commit fd3305c694
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -100,7 +100,7 @@ class Data(object):
def getPicksStr(self): def getPicksStr(self):
picks_str = '' picks_str = ''
for pick in self.get_evt_data().picks: for pick in self.get_evt_data().picks:
picks_str += str(PyLoT) + '\n' picks_str += str(pick) + '\n'
return picks_str return picks_str
def getParent(self): def getParent(self):

3
pylot/core/pick/autopick.py
View File

@ -944,7 +944,8 @@ def autopickstation(wfstream, pickparam, verbose=False,
ax3.set_title(trH2_filt.stats.channel) ax3.set_title(trH2_filt.stats.channel)
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
########################################################################## ##########################################################################
# calculate "real" onset times # calculate "real" onset times

12
pylot/core/pick/picker.py
View File

@ -274,7 +274,8 @@ class AICPicker(AutoPicker):
ax.set_title(self.Data[0].stats.station) ax.set_title(self.Data[0].stats.station)
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
return return
iislope = islope[0][0:imax+1] iislope = islope[0][0:imax+1]
@ -334,13 +335,15 @@ class AICPicker(AutoPicker):
ax2.legend() ax2.legend()
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
else: else:
ax1.set_title(self.Data[0].stats.station) ax1.set_title(self.Data[0].stats.station)
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
if self.Pick == None: if self.Pick == None:
@ -476,7 +479,8 @@ class PragPicker(AutoPicker):
ax.legend() ax.legend()
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
return return

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

@ -153,7 +153,8 @@ def earllatepicker(X, nfac, TSNR, Pick1, iplot=0, verbosity=1, fig=None):
ax.legend() ax.legend()
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
return EPick, LPick, PickError return EPick, LPick, PickError
@ -347,7 +348,8 @@ def fmpicker(Xraw, Xfilt, pickwin, Pick, iplot=0, fig=None):
ax2.set_yticks([]) ax2.set_yticks([])
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
return FM return FM
@ -785,7 +787,8 @@ def checksignallength(X, pick, TSNR, minsiglength, nfac, minpercent, iplot=0, fi
ax.set_yticks([]) ax.set_yticks([])
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
return returnflag return returnflag
@ -1089,7 +1092,8 @@ def checkZ4S(X, pick, zfac, checkwin, iplot, fig=None):
ax.set_xlabel('Time [s] since %s' % zdat[0].stats.starttime) ax.set_xlabel('Time [s] since %s' % zdat[0].stats.starttime)
if plt_flag == 1: if plt_flag == 1:
fig.show() fig.show()
raw_input() try: input()
except SyntaxError: pass
plt.close(fig) plt.close(fig)
return returnflag return returnflag

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

@ -1910,6 +1910,9 @@ class PickDlg(QDialog):
def scrollZoom(self, gui_event, factor=2.): def scrollZoom(self, gui_event, factor=2.):
if not gui_event.xdata or not gui_event.ydata:
return
self.updateCurrentLimits() self.updateCurrentLimits()
if gui_event.button == 'up': if gui_event.button == 'up':