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

File extention for output taken from preferences OutputsTab.

Browse Source
This commit is contained in:
Ludger Küperkoch 2017-06-29 16:35:52 +02:00
parent fc0934ba1d
commit 1e99ae8272
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
QtPyLoT.py
View File

@ -170,6 +170,11 @@ class MainWindow(QMainWindow):
settings.setValue("data/dataRoot", dirname) settings.setValue("data/dataRoot", dirname)
if settings.value('compclass', None) is None: if settings.value('compclass', None) is None:
settings.setValue('compclass', SetChannelComponents()) settings.setValue('compclass', SetChannelComponents())
if settings.value('output/Format', None) is None:
outformat = QInputDialog.getText(self,
"Enter output format (*.xml, *.cnv, *.obs):",
"Format")
settings.setValue("output/Format", outformat)
settings.sync() settings.sync()
# setup UI # setup UI
@ -1040,9 +1045,16 @@ class MainWindow(QMainWindow):
eventname = self.get_current_event_name() eventname = self.get_current_event_name()
filename = 'PyLoT_'+eventname filename = 'PyLoT_'+eventname
outpath = os.path.join(directory, filename) outpath = os.path.join(directory, filename)
file_filter = "QuakeML file (*.xml);;VELEST observation file " \
"format (*.cnv);;NonLinLoc observation file (*.obs)"
title = 'Save pick data ...' title = 'Save pick data ...'
outformat = settings.value('output/Format')
outformat = outformat[0:4]
if outformat == '.obs':
file_filter = "NonLinLoc observation file (*.obs)"
elif outformat == '.cnv':
file_filter = "VELEST observation file format (*.cnv)"
elif outformat == '.xml':
file_filter = "QuakeML file (*.xml)"
fname, selected_filter = QFileDialog.getSaveFileName(self, fname, selected_filter = QFileDialog.getSaveFileName(self,
title, title,
outpath, outpath,

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

@ -35,7 +35,6 @@ from PySide.QtGui import QAction, QApplication, QCheckBox, QComboBox, \
from PySide.QtCore import QSettings, Qt, QUrl, Signal, Slot from PySide.QtCore import QSettings, Qt, QUrl, Signal, Slot
from PySide.QtWebKit import QWebView from PySide.QtWebKit import QWebView
from obspy import Stream, UTCDateTime from obspy import Stream, UTCDateTime
from obspy.core.util import AttribDict
from pylot.core.io.data import Data from pylot.core.io.data import Data
from pylot.core.io.inputs import FilterOptions, PylotParameter from pylot.core.io.inputs import FilterOptions, PylotParameter
from pylot.core.pick.utils import getSNR, earllatepicker, getnoisewin, \ from pylot.core.pick.utils import getSNR, earllatepicker, getnoisewin, \
@ -1361,9 +1360,7 @@ class PickDlg(QDialog):
'S': ('m', 'm--', 'r-', 'rv', 'r^', 'r', 'm:') 'S': ('m', 'm--', 'r-', 'rv', 'r^', 'r', 'm:')
} }
if self.getPicks(picktype): if self.getPicks(picktype):
if phase is not None: if phase is not None and type(self.getPicks(picktype)[phase]) is dict:
if (type(self.getPicks(picktype)[phase]) is dict
or type(self.getPicks(picktype)[phase]) is AttribDict):
picks = self.getPicks(picktype)[phase] picks = self.getPicks(picktype)[phase]
colors = phase_col[phase[0].upper()] colors = phase_col[phase[0].upper()]
elif phase is None: elif phase is None:
@ -2464,6 +2461,7 @@ class PropertiesDlg(QDialog):
elif setting.startswith('Channel N'): elif setting.startswith('Channel N'):
component = 'N' component = 'N'
compclass.setCompPosition(value, component, False) compclass.setCompPosition(value, component, False)
settings.sync() settings.sync()
@ -2555,7 +2553,7 @@ class OutputsTab(PropTab):
settings = QSettings() settings = QSettings()
curval = settings.value("output/Format", None) curval = settings.value("output/Format", None)
eventOutputLabel = QLabel("event ouput format") eventOutputLabel = QLabel("event/picks ouput format")
self.eventOutputComboBox = QComboBox() self.eventOutputComboBox = QComboBox()
eventoutputformats = OUTPUTFORMATS.keys() eventoutputformats = OUTPUTFORMATS.keys()
self.eventOutputComboBox.addItems(eventoutputformats) self.eventOutputComboBox.addItems(eventoutputformats)