Merge remote-tracking branch 'origin/develop' into darius
This commit is contained in:
commit
cfe59cc264
@ -657,8 +657,9 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None):
|
||||
print("wadatacheck: Skipped %d S pick(s)" % ibad)
|
||||
else:
|
||||
print("###############################################")
|
||||
print("wadatacheck: Not enough checked S-P times available!")
|
||||
print("wadaticheck: Not enough checked S-P times available!")
|
||||
print("Skip Wadati check!")
|
||||
wfitflag = 1
|
||||
wdfit2 = None
|
||||
|
||||
checkedonsets = pickdic
|
||||
|
@ -1208,6 +1208,7 @@ class PickDlg(QDialog):
|
||||
|
||||
# init pick delete (with right click)
|
||||
self.connect_pick_delete()
|
||||
self.setWindowTitle('Pickwindow on station: {}'.format(self.getStation()))
|
||||
|
||||
def setupUi(self):
|
||||
menuBar = QtGui.QMenuBar(self)
|
||||
|
Loading…
x
Reference in New Issue
Block a user