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

[closes #178] makes use of the new status variable pick_block introduced as filter_block to solve #174

Browse Source
This commit is contained in:
Sebastian Wehling-Benatelli 2016-03-29 07:58:20 +02:00
parent a1c79b554a
commit cee48146d0
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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