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

[bugfix] reintroduced previous bugfix

Browse Source
This commit is contained in:
Marcel Paffrath 2017-06-29 17:02:05 +02:00
parent 5fc83459e2
commit 9e6b376c62
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ 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, \
@ -1360,9 +1361,11 @@ 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 and type(self.getPicks(picktype)[phase]) is dict: if phase is not None:
+ picks = self.getPicks(picktype)[phase] if (type(self.getPicks(picktype)[phase]) is dict
+ colors = phase_col[phase[0].upper()] or type(self.getPicks(picktype)[phase]) is AttribDict):
picks = self.getPicks(picktype)[phase]
colors = phase_col[phase[0].upper()]
elif phase is None: elif phase is None:
for phase in self.getPicks(picktype): for phase in self.getPicks(picktype):
self.drawPicks(phase, picktype) self.drawPicks(phase, picktype)