Merged branch develop into 190

This commit is contained in:
Sebastian Wehling-Benatelli 2016-03-29 08:47:20 +02:00
commit e164b1f168
2 changed files with 15 additions and 8 deletions

View File

@ -3,6 +3,7 @@
import os
import glob
import warnings
from obspy.io.xseed import Parser
from obspy.core import read, Stream, UTCDateTime
from obspy import read_events, read_inventory
@ -421,7 +422,11 @@ class Data(object):
epp = phase['epp']
lpp = phase['lpp']
error = phase['spe']
picker = phase['picker']
try:
picker = phase['picker']
except KeyError as e:
warnings.warn(str(e), Warning)
picker = 'Unknown'
pick = Pick()
pick.time = onset
pick.time_errors.lower_uncertainty = onset - epp

View File

@ -64,7 +64,7 @@ class MPLWidget(FigureCanvas):
# clear axes each time plot is called
self.axes.hold(True)
# initialize super class
FigureCanvas.__init__(self, self.figure)
super(MPLWidget, self).__init__(self.figure)
# add an cursor for station selection
self.multiCursor = MultiCursor(self.figure.canvas, (self.axes,),
horizOn=True,
@ -182,7 +182,7 @@ class PickDlg(QDialog):
else:
self.picks = {}
self.filteroptions = FILTERDEFAULTS
self.filt_block = False
self.pick_block = False
# initialize panning attributes
self.press = None
@ -356,7 +356,7 @@ class PickDlg(QDialog):
self.disconnectPressEvent()
self.cidpress = self.connectPressEvent(self.setIniPick)
self.filterWFData()
self.filt_block = self.toggleFilterBlocker()
self.pick_block = self.togglePickBlocker()
else:
self.disconnectPressEvent()
self.cidpress = self.connectPressEvent(self.panPress)
@ -708,11 +708,11 @@ class PickDlg(QDialog):
ax.figure.canvas.draw()
def toggleFilterBlocker(self):
return not self.filt_block
def togglePickBlocker(self):
return not self.pick_block
def filterWFData(self):
if self.filt_block:
if self.pick_block:
return
self.updateCurrentLimits()
data = self.getWFData().copy()
@ -768,7 +768,9 @@ class PickDlg(QDialog):
self.getPlotWidget().setYLims(self.getYLims())
def zoom(self):
if self.zoomAction.isChecked():
if self.zoomAction.isChecked() and self.pick_block:
self.zoomAction.setChecked(False)
elif self.zoomAction.isChecked():
self.disconnectPressEvent()
self.disconnectMotionEvent()
self.disconnectReleaseEvent()