From 98f7ff84063261f14787c895855a4e294882bece Mon Sep 17 00:00:00 2001 From: Marcel Date: Tue, 16 Jan 2018 16:17:18 +0100 Subject: [PATCH] [update] resetZoom after picking --- pylot/RELEASE-VERSION | 2 +- pylot/core/util/widgets.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 6ddcab46..9a645abe 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -c520-dirty +f463-dirty diff --git a/pylot/core/util/widgets.py b/pylot/core/util/widgets.py index 4de95be1..053de0a3 100644 --- a/pylot/core/util/widgets.py +++ b/pylot/core/util/widgets.py @@ -1449,7 +1449,7 @@ class PickDlg(QDialog): _dialtoolbar.addWidget(QtGui.QLabel('Compare to channel: ')) _dialtoolbar.addWidget(self.compareChannel) _dialtoolbar.addSeparator() - _dialtoolbar.addWidget(QtGui.QLabel('Scale: ')) + _dialtoolbar.addWidget(QtGui.QLabel('Scale by: ')) _dialtoolbar.addWidget(self.scaleChannel) # layout the innermost widget @@ -2166,6 +2166,7 @@ class PickDlg(QDialog): self.enable_ar_buttons() self.zoomAction.setEnabled(True) #self.pick_block = self.togglPickBlocker() + self.resetZoom() self.leave_picking_mode() def savePick(self, phase, phasepicks): @@ -2547,8 +2548,8 @@ class PickDlg(QDialog): def resetZoom(self): ax = self.multicompfig.axes[0] - self.setXLims(self.multicompfig.getGlobalLimits(ax, 'x')) - self.setYLims(self.multicompfig.getGlobalLimits(ax, 'y')) + self.multicompfig.setXLims(ax, self.multicompfig.getGlobalLimits(ax, 'x')) + self.multicompfig.setYLims(ax, self.multicompfig.getGlobalLimits(ax, 'y')) if not self.zoomAction.isChecked(): self.multicompfig.connectEvents()