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

Merge branch 'develop' into map_projection

Browse Source
This commit is contained in:
Marcel Paffrath 2017-04-12 15:21:58 +02:00
commit 50f6d7d987
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
4880-dirty bb60-dirty

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

@ -720,13 +720,13 @@ class PickDlg(QDialog):
self.leave_picking_mode() self.leave_picking_mode()
def init_p_pick(self): def init_p_pick(self):
self.set_button_color(self.p_button, 'green') self.set_button_color(self.p_button, 'yellow')
self.updateCurrentLimits() self.updateCurrentLimits()
self.activatePicking() self.activatePicking()
self.currentPhase = 'P' self.currentPhase = 'P'
def init_s_pick(self): def init_s_pick(self):
self.set_button_color(self.s_button, 'green') self.set_button_color(self.s_button, 'yellow')
self.updateCurrentLimits() self.updateCurrentLimits()
self.activatePicking() self.activatePicking()
self.currentPhase = 'S' self.currentPhase = 'S'
@ -879,10 +879,10 @@ class PickDlg(QDialog):
print(self.currentPhase) print(self.currentPhase)
if self.currentPhase == 'P': if self.currentPhase == 'P':
self.set_button_color(self.p_button, 'red') self.set_button_color(self.p_button, 'green')
self.setIniPickP(gui_event, wfdata, trace_number) self.setIniPickP(gui_event, wfdata, trace_number)
elif self.currentPhase == 'S': elif self.currentPhase == 'S':
self.set_button_color(self.s_button, 'red') self.set_button_color(self.s_button, 'green')
self.setIniPickS(gui_event, wfdata) self.setIniPickS(gui_event, wfdata)
self.zoomAction.setEnabled(False) self.zoomAction.setEnabled(False)