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

added load project option from command line (QtPyLoT.py -p)

Browse Source
This commit is contained in:
Marcel Paffrath 2017-05-29 11:31:09 +02:00
parent b3a4470910
commit 8975913143
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
QtPyLoT.py
View File

@ -25,6 +25,7 @@ https://www.iconfinder.com/iconsets/flavour
import os import os
import sys import sys
import argparse
import matplotlib import matplotlib
matplotlib.use('Qt4Agg') matplotlib.use('Qt4Agg')
@ -1356,6 +1357,7 @@ class MainWindow(QMainWindow):
self.update_status('picks accepted ({0})'.format(station)) self.update_status('picks accepted ({0})'.format(station))
replot = self.addPicks(station, pickDlg.getPicks()) replot = self.addPicks(station, pickDlg.getPicks())
self.get_current_event().setPick(station, pickDlg.getPicks()) self.get_current_event().setPick(station, pickDlg.getPicks())
print(pickDlg.getPicks())
if replot: if replot:
self.plotWaveformData() self.plotWaveformData()
self.drawPicks() self.drawPicks()
@ -1972,10 +1974,11 @@ class MainWindow(QMainWindow):
if not fnm: if not fnm:
dlg = QFileDialog() dlg = QFileDialog()
fnm = dlg.getOpenFileName(self, 'Open project file...', filter='Pylot project (*.plp)') fnm = dlg.getOpenFileName(self, 'Open project file...', filter='Pylot project (*.plp)')
if not fnm: if not fnm:
return return
if fnm[0]: fnm = fnm[0]
self.project = Project.load(fnm[0]) if fnm:
self.project = Project.load(fnm)
self.tabs.setCurrentIndex(0) # implemented to prevent double-loading of waveform data self.tabs.setCurrentIndex(0) # implemented to prevent double-loading of waveform data
self.init_events(new=True) self.init_events(new=True)
if hasattr(self.project, 'metadata'): if hasattr(self.project, 'metadata'):
@ -2213,7 +2216,7 @@ def create_window():
return app, app_created return app, app_created
def main(): def main(args=None):
# create the Qt application # create the Qt application
pylot_app, app_created = create_window() pylot_app, app_created = create_window()
#pylot_app = QApplication(sys.argv) #pylot_app = QApplication(sys.argv)
@ -2247,6 +2250,11 @@ def main():
pylot_app.processEvents() pylot_app.processEvents()
splash.finish(pylot_form) splash.finish(pylot_form)
if args:
if args.project_filename:
pylot_form.loadProject(args.project_filename)
if app_created: if app_created:
pylot_app.exec_() pylot_app.exec_()
else: else:
@ -2254,4 +2262,8 @@ def main():
if __name__ == "__main__": if __name__ == "__main__":
sys.exit(main()) parser = argparse.ArgumentParser(description='Welcome to PyLoT.')
parser.add_argument('-p', dest='project_filename', help='load project file',
default=None)
args = parser.parse_args()
sys.exit(main(args))

2
pylot/RELEASE-VERSION
View File

@ -1 +1 @@
69b2-dirty b3a44-dirty