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

Finished flexible handling of different input file names.

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

7
QtPyLoT.py
View File

@ -81,6 +81,7 @@ class MainWindow(QMainWindow):
infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in') infile = os.path.join(os.path.expanduser('~'), '.pylot', 'pylot.in')
if os.path.isfile(infile)== False: if os.path.isfile(infile)== False:
infile = raw_input("Default file not found! Type name including full path ...") infile = raw_input("Default file not found! Type name including full path ...")
self.infile = infile
self._inputs = AutoPickParameter(infile) self._inputs = AutoPickParameter(infile)
if settings.value("user/FullName", None) is None: if settings.value("user/FullName", None) is None:
@ -606,6 +607,9 @@ class MainWindow(QMainWindow):
self.update_status('Event saved as %s' % (fbasename + exform)) self.update_status('Event saved as %s' % (fbasename + exform))
return True return True
def getinfile(self):
return self.infile
def getComponent(self): def getComponent(self):
return self.dispComponent return self.dispComponent
@ -809,7 +813,8 @@ class MainWindow(QMainWindow):
station = self.getStationName(wfID) station = self.getStationName(wfID)
self.update_status('picking on station {0}'.format(station)) self.update_status('picking on station {0}'.format(station))
data = self.get_data().getWFData() data = self.get_data().getWFData()
pickDlg = PickDlg(self, data=data.select(station=station), pickDlg = PickDlg(self, infile=self.getinfile(),
data=data.select(station=station),
station=station, station=station,
picks=self.getPicksOnStation(station)) picks=self.getPicksOnStation(station))
if pickDlg.exec_(): if pickDlg.exec_():