[minor] code cleanup

This commit is contained in:
Marcel Paffrath 2017-08-15 09:49:10 +02:00
parent a9d06790d2
commit ff1ab722df
2 changed files with 0 additions and 13 deletions

View File

@ -1941,11 +1941,6 @@ class MainWindow(QMainWindow):
else: else:
ax = self.getPlotWidget().axes ax = self.getPlotWidget().axes
ylims = np.array([-.5, +.5]) + plotID ylims = np.array([-.5, +.5]) + plotID
if not self.pg:
phase_col = {
'P': ('c', 'c--', 'b-', 'bv', 'b^', 'b'),
'S': ('m', 'm--', 'r-', 'rv', 'r^', 'r')
}
stat_picks = self.getPicks(type=picktype)[station] stat_picks = self.getPicks(type=picktype)[station]
stime = self.getStime() stime = self.getStime()
@ -1961,9 +1956,6 @@ class MainWindow(QMainWindow):
elif phase[0] == 'S': elif phase[0] == 'S':
quality = getQualityfromUncertainty(picks['spe'], self._inputs['timeerrorsS']) quality = getQualityfromUncertainty(picks['spe'], self._inputs['timeerrorsS'])
if not self.pg:
colors = phase_col[phase[0].upper()]
mpp = picks['mpp'] - stime mpp = picks['mpp'] - stime
if picks['epp'] and picks['lpp']: if picks['epp'] and picks['lpp']:
epp = picks['epp'] - stime epp = picks['epp'] - stime

View File

@ -1697,16 +1697,11 @@ class PickDlg(QDialog):
ylims = self.getGlobalLimits('y') ylims = self.getGlobalLimits('y')
else: else:
ylims = self.getPlotWidget().getYLims() ylims = self.getPlotWidget().getYLims()
phase_col = {
'P': ('c', 'c--', 'b-', 'bv', 'b^', 'b', 'c:'),
'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:
if (type(self.getPicks(picktype)[phase]) is dict if (type(self.getPicks(picktype)[phase]) is dict
or type(self.getPicks(picktype)[phase]) is AttribDict): or type(self.getPicks(picktype)[phase]) is AttribDict):
picks = self.getPicks(picktype)[phase] picks = self.getPicks(picktype)[phase]
colors = phase_col[self.getPhaseID(phase)]
elif phase is None: elif phase is None:
for phase in self.getPicks(picktype): for phase in self.getPicks(picktype):
self.drawPicks(phase, picktype, textOnly) self.drawPicks(phase, picktype, textOnly)