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

Flexible handling of individual input-file names.

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-03-27 11:32:24 +02:00
parent 39748ca7c2
commit 842de86544
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -509,10 +509,11 @@ class WaveformWidget(FigureCanvas):
class PickDlg(QDialog):
def __init__(self, parent=None, data=None, station=None, picks=None,
rotate=False):
rotate=False, infile=None):
super(PickDlg, self).__init__(parent)
# initialize attributes
self.infile = infile
self.station = station
self.rotate = rotate
self.components = 'ZNE'
@ -709,6 +710,9 @@ class PickDlg(QDialog):
self.cidrelease = self.connectReleaseEvent(self.panRelease)
self.cidscroll = self.connectScrollEvent(self.scrollZoom)
def getinfile(self):
return self.infile
def getStartTime(self):
return self.stime
@ -812,9 +816,9 @@ class PickDlg(QDialog):
self.cidpress = self.connectPressEvent(self.setPick)
if self.selectPhase.currentText().upper().startswith('P'):
self.setIniPickP(gui_event, wfdata, trace_number)
self.setIniPickP(self.getinfile(), gui_event, wfdata, trace_number)
elif self.selectPhase.currentText().upper().startswith('S'):
self.setIniPickS(gui_event, wfdata)
self.setIniPickS(self.getinfile(), gui_event, wfdata)
self.zoomAction.setEnabled(False)
@ -822,9 +826,9 @@ class PickDlg(QDialog):
self.setPlotLabels()
self.draw()
def setIniPickP(self, gui_event, wfdata, trace_number):
def setIniPickP(self, infile, gui_event, wfdata, trace_number):
infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in')
#infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in')
parameter = AutoPickParameter(infile)
ini_pick = gui_event.xdata
@ -872,9 +876,9 @@ class PickDlg(QDialog):
noiselevel=(trace_number + noiselevel,
trace_number - noiselevel))
def setIniPickS(self, gui_event, wfdata):
def setIniPickS(self, infile, gui_event, wfdata):
infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in')
#infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in')
parameter = AutoPickParameter(infile)
ini_pick = gui_event.xdata