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

[new] preparation for pick info on click

Browse Source
This commit is contained in:
Marcel Paffrath 2018-01-12 14:42:16 +01:00
parent 5aef50f922
commit bb395d2514
2 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
ffa3-dirty 5aef5-dirty

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

@ -2109,12 +2109,33 @@ class PickDlg(QDialog):
ax.legend(loc=1) ax.legend(loc=1)
def connect_pick_delete(self): def connect_pick_delete(self):
self.cidpick = self.multicompfig.mpl_connect('pick_event', self.onpick_delete) self.cidpick = self.multicompfig.mpl_connect('pick_event', self.onpick)
def disconnect_pick_delete(self): def disconnect_pick_delete(self):
if hasattr(self, 'cidpick'): if hasattr(self, 'cidpick'):
self.multicompfig.mpl_disconnect(self.cidpick) self.multicompfig.mpl_disconnect(self.cidpick)
def onpick(self, event):
if event.mouseevent.button == 1:
self.onpick_info(event)
elif event.mouseevent.button == 3:
self.onpick_delete(event)
def onpick_info(self, event):
if not event.mouseevent.button == 1:
return
x = event.mouseevent.xdata
allpicks, pick_rel, phase, picktype = self.identify_selected_picks(x)
pick = allpicks[picktype][phase]
message = '{} {}-pick'.format(picktype, phase)
if 'mpp' in pick:
message += ', mpp: {}'.format(pick['mpp'])
if 'spe' in pick:
message += ', spe: {}'.format(pick['spe'])
if 'filteroptions' in pick:
message += ', filter: {}'.format(pick['filteroptions'])
print(message)
def onpick_delete(self, event): def onpick_delete(self, event):
if not event.mouseevent.button == 3: if not event.mouseevent.button == 3:
return return
@ -2125,7 +2146,16 @@ class PickDlg(QDialog):
def remove_pick_by_x(self, x): def remove_pick_by_x(self, x):
if not self.picks and not self.autopicks: if not self.picks and not self.autopicks:
return return
# init empty list and get station starttime allpicks, pick_rel, phase, picktype = self.identify_selected_picks(x)
# delete the value from corresponding dictionary
allpicks[picktype].pop(phase)
# information output
msg = 'Deleted {} pick for phase {}, at timestamp {} (relative time: {} s)'
print(msg.format(picktype, phase, self.getStartTime()+pick_rel, pick_rel))
self.setDirty(True)
def identify_selected_picks(self, x):
# init empty list and get stat5ion starttime
X = [] X = []
starttime = self.getStartTime() starttime = self.getStartTime()
# init dictionaries to iterate through and iterate over them # init dictionaries to iterate through and iterate over them
@ -2143,12 +2173,9 @@ class PickDlg(QDialog):
index, value = min(enumerate([val[0] for val in X]), key=lambda y: abs(y[1] - x)) index, value = min(enumerate([val[0] for val in X]), key=lambda y: abs(y[1] - x))
# unpack the found value # unpack the found value
pick_rel, phase, picktype = X[index] pick_rel, phase, picktype = X[index]
# delete the value from corresponding dictionary return allpicks, pick_rel, phase, picktype
allpicks[picktype].pop(phase)
# information output
msg = 'Deleted {} pick for phase {}, at timestamp {} (relative time: {} s)'
print(msg.format(picktype, phase, starttime+pick_rel, pick_rel))
self.setDirty(True)
def drawPhaseText(self): def drawPhaseText(self):
self.drawPicks(picktype='manual', textOnly=True) self.drawPicks(picktype='manual', textOnly=True)