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

Merge remote-tracking branch 'origin/develop' into darius

Browse Source
This commit is contained in:
Darius Arnold 2017-09-07 17:03:18 +02:00
commit cfe59cc264
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -657,8 +657,9 @@ def wadaticheck(pickdic, dttolerance, iplot=0, fig_dict=None):
print("wadatacheck: Skipped %d S pick(s)" % ibad) print("wadatacheck: Skipped %d S pick(s)" % ibad)
else: else:
print("###############################################") print("###############################################")
print("wadatacheck: Not enough checked S-P times available!") print("wadaticheck: Not enough checked S-P times available!")
print("Skip Wadati check!") print("Skip Wadati check!")
wfitflag = 1
wdfit2 = None wdfit2 = None
checkedonsets = pickdic checkedonsets = pickdic

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

@ -1208,6 +1208,7 @@ class PickDlg(QDialog):
# init pick delete (with right click) # init pick delete (with right click)
self.connect_pick_delete() self.connect_pick_delete()
self.setWindowTitle('Pickwindow on station: {}'.format(self.getStation()))
def setupUi(self): def setupUi(self):
menuBar = QtGui.QMenuBar(self) menuBar = QtGui.QMenuBar(self)