[bugfix] rectangle zoom connection

This commit is contained in:
Marcel Paffrath 2018-01-09 13:46:21 +01:00
parent 440c2c7bf3
commit 39e048cf2f
2 changed files with 7 additions and 5 deletions

View File

@ -1 +1 @@
7be9-dirty 440c-dirty

View File

@ -1283,7 +1283,7 @@ class PickDlg(QDialog):
tip='Zoom into waveform', tip='Zoom into waveform',
checkable=True) checkable=True)
self.resetZoomAction = createAction(parent=self, text='Home', self.resetZoomAction = createAction(parent=self, text='Home',
slot=self.resetZoom, icon=home_icon, slot=self.resetPlot, icon=home_icon,
tip='Reset zoom to original limits') tip='Reset zoom to original limits')
self.resetPicksAction = createAction(parent=self, text='Delete Picks', self.resetPicksAction = createAction(parent=self, text='Delete Picks',
slot=self.delPicks, icon=del_icon, slot=self.delPicks, icon=del_icon,
@ -2223,8 +2223,9 @@ class PickDlg(QDialog):
settings.setValue('autoFilter', self.autoFilterAction.isChecked()) settings.setValue('autoFilter', self.autoFilterAction.isChecked())
def resetPlot(self): def resetPlot(self):
self.filterActionP.setChecked(False) if self.autoFilterAction.isChecked():
self.filterActionS.setChecked(False) self.filterActionP.setChecked(False)
self.filterActionS.setChecked(False)
self.resetZoom() self.resetZoom()
data = self.getWFData().copy() data = self.getWFData().copy()
#title = self.multicompfig.axes[0].get_title() #title = self.multicompfig.axes[0].get_title()
@ -2240,7 +2241,8 @@ class PickDlg(QDialog):
ax = self.multicompfig.axes[0] ax = self.multicompfig.axes[0]
self.setXLims(self.multicompfig.getGlobalLimits(ax, 'x')) self.setXLims(self.multicompfig.getGlobalLimits(ax, 'x'))
self.setYLims(self.multicompfig.getGlobalLimits(ax, 'y')) self.setYLims(self.multicompfig.getGlobalLimits(ax, 'y'))
self.multicompfig.connectEvents() if not self.zoomAction.isChecked():
self.multicompfig.connectEvents()
def setPlotLabels(self): def setPlotLabels(self):