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

Merge branch 'develop' of ariadne.geophysik.rub.de:/data/git/pylot into develop

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-06-27 14:00:00 +02:00
commit 96ce713337
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
QtPyLoT.py
View File

@ -657,9 +657,7 @@ class MainWindow(QMainWindow):
if not refresh: if not refresh:
return return
if self.get_current_event().pylot_picks: if self.get_current_event().pylot_picks:
self.plotWaveformDataThread() self.refreshEvents()
self.drawPicks(picktype=type)
self.draw()
self.setDirty(True) self.setDirty(True)
def load_data(self, fname=None, type='manual', loc=False, draw=True, event=None, overwrite=False): def load_data(self, fname=None, type='manual', loc=False, draw=True, event=None, overwrite=False):
@ -673,16 +671,18 @@ class MainWindow(QMainWindow):
if not fname: if not fname:
return return
self.set_fname(fname, type) self.set_fname(fname, type)
data = dict(auto=self.autodata, manual=self.data) #data = dict(auto=self.autodata, manual=self.data)
data[type] += Data(self, evtdata=fname) if not event:
event = self.get_current_event()
data = Data(self, event)
data += Data(self, evtdata=fname)
self.data = data
print('Loading {} picks from file {}.'.format(type, fname)) print('Loading {} picks from file {}.'.format(type, fname))
if not loc: if not loc:
self.updatePicks(type=type, event=event) self.updatePicks(type=type, event=event)
if draw: if draw:
if self.get_current_event().pylot_picks: if self.get_current_event().pylot_picks:
self.plotWaveformDataThread() self.refreshEvents()
self.drawPicks(picktype=type)
self.draw()
self.setDirty(True) self.setDirty(True)
def add_recentfile(self, event): def add_recentfile(self, event):