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

[fixes #172] now also in overview all horizontals are plotted

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2016-03-29 14:06:57 +02:00
parent 4409a9c3ce
commit 2d66248cf9
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
QtPyLoT.py
View File

@ -44,7 +44,7 @@ from pylot.core.read.data import Data
from pylot.core.read.inputs import FilterOptions, AutoPickParameter from pylot.core.read.inputs import FilterOptions, AutoPickParameter
from pylot.core.pick.autopick import autopickevent from pylot.core.pick.autopick import autopickevent
from pylot.core.loc.nll import locate as locateNll from pylot.core.loc.nll import locate as locateNll
from pylot.core.util.defaults import FILTERDEFAULTS from pylot.core.util.defaults import FILTERDEFAULTS, COMPNAME_MAP
from pylot.core.util.errors import FormatError, DatastructureError, \ from pylot.core.util.errors import FormatError, DatastructureError, \
OverwriteError OverwriteError
from pylot.core.util.connection import checkurl from pylot.core.util.connection import checkurl
@ -545,7 +545,9 @@ class MainWindow(QMainWindow):
zne_text = {'Z': 'vertical', 'N': 'north-south', 'E': 'east-west'} zne_text = {'Z': 'vertical', 'N': 'north-south', 'E': 'east-west'}
comp = self.getComponent() comp = self.getComponent()
title = 'section: {0} components'.format(zne_text[comp]) title = 'section: {0} components'.format(zne_text[comp])
alter_comp = COMPNAME_MAP[comp]
wfst = self.getData().getWFData().select(component=comp) wfst = self.getData().getWFData().select(component=comp)
wfst += self.getData().getWFData().select(component=alter_comp)
self.getPlotWidget().plotWFData(wfdata=wfst, title=title, mapping=False) self.getPlotWidget().plotWFData(wfdata=wfst, title=title, mapping=False)
self.draw() self.draw()
plotDict = self.getPlotWidget().getPlotDict() plotDict = self.getPlotWidget().getPlotDict()

9
pylot/core/util/defaults.py
View File

@ -47,6 +47,9 @@ OUTPUTFORMATS = {'.xml':'QUAKEML',
LOCTOOLS = dict(nll = nll, hsat = hsat, velest = velest) LOCTOOLS = dict(nll = nll, hsat = hsat, velest = velest)
COMPONENTS_MAPPING = dict(Z = 2, N = 1, E = 0) COMPPOSITION_MAP = dict(Z = 2, N = 1, E = 0)
COMPONENTS_MAPPING['1'] = 1 COMPPOSITION_MAP['1'] = 1
COMPONENTS_MAPPING['2'] = 0 COMPPOSITION_MAP['2'] = 0
COMPPOSITION_MAP['3'] = 2
COMPNAME_MAP = dict(Z = '3', N = '1', E = '2')

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

@ -26,7 +26,7 @@ from pylot.core.read.inputs import FilterOptions
from pylot.core.pick.utils import getSNR, earllatepicker, getnoisewin,\ from pylot.core.pick.utils import getSNR, earllatepicker, getnoisewin,\
getResolutionWindow getResolutionWindow
from pylot.core.util.defaults import OUTPUTFORMATS, FILTERDEFAULTS, LOCTOOLS,\ from pylot.core.util.defaults import OUTPUTFORMATS, FILTERDEFAULTS, LOCTOOLS,\
COMPONENTS_MAPPING COMPPOSITION_MAP
from pylot.core.util.utils import prepTimeAxis, getGlobalTimes, scaleWFData, \ from pylot.core.util.utils import prepTimeAxis, getGlobalTimes, scaleWFData, \
demeanTrace, isSorted, findComboBoxIndex demeanTrace, isSorted, findComboBoxIndex
@ -98,7 +98,7 @@ class MPLWidget(FigureCanvas):
station = trace.stats.station station = trace.stats.station
if mapping: if mapping:
comp = channel[-1] comp = channel[-1]
n = COMPONENTS_MAPPING[comp] n = COMPPOSITION_MAP[comp]
if n > nmax: if n > nmax:
nmax = n nmax = n
msg = 'plotting %s channel of station %s' % (channel, station) msg = 'plotting %s channel of station %s' % (channel, station)