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

Merge branch 'develop' into feature/metadata_class

Browse Source
This commit is contained in:
Marcel Paffrath 2018-07-10 11:38:10 +02:00
commit f6688b3a28
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PyLoT.py
View File

@ -2631,17 +2631,20 @@ class MainWindow(QMainWindow):
elif type == 'auto': elif type == 'auto':
event.addAutopicks(picksdict['auto']) event.addAutopicks(picksdict['auto'])
def drawPicks(self, station=None, picktype=None): def drawPicks(self, station=None, picktype=None, stime=None):
# if picktype not specified, draw both # if picktype not specified, draw both
if not stime:
stime = self.getStime()
if not picktype: if not picktype:
self.drawPicks(station, 'manual') self.drawPicks(station, 'manual', stime)
self.drawPicks(station, 'auto') self.drawPicks(station, 'auto', stime)
return return
# if picks to draw not specified, draw all picks available # if picks to draw not specified, draw all picks available
if not station: if not station:
for station in self.getPicks(type=picktype): for station in self.getPicks(type=picktype):
self.drawPicks(station, picktype=picktype) self.drawPicks(station, picktype=picktype, stime=stime)
return return
# check for station key in dictionary, else return # check for station key in dictionary, else return
@ -2659,7 +2662,6 @@ class MainWindow(QMainWindow):
ylims = np.array([-.5, +.5]) + plotID ylims = np.array([-.5, +.5]) + plotID
stat_picks = self.getPicks(type=picktype)[station] stat_picks = self.getPicks(type=picktype)[station]
stime = self.getStime()
for phase in stat_picks: for phase in stat_picks:
if phase == 'SPt': continue # wadati SP time if phase == 'SPt': continue # wadati SP time