From 97de485c998c8fa3166c2e90ca6165a07c0abbfb Mon Sep 17 00:00:00 2001 From: Marcel Date: Wed, 17 Jan 2018 10:30:38 +0100 Subject: [PATCH] [bugfix] case pg=False: internal change of pylot canvas updated --- PyLoT.py | 8 ++++---- pylot/RELEASE-VERSION | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/PyLoT.py b/PyLoT.py index ef88c010..69327460 100755 --- a/PyLoT.py +++ b/PyLoT.py @@ -2009,7 +2009,7 @@ class MainWindow(QMainWindow): if self._shift: factor = {'up': 1. / 2., 'down': 2.} - xlims = self.dataPlot.getXLims() + xlims = self.dataPlot.getXLims(self.dataPlot.axes[0]) xdiff = xlims[1] - xlims[0] xdiff *= factor[button] xl = x - 0.5 * xdiff @@ -2018,7 +2018,7 @@ class MainWindow(QMainWindow): xl = self._max_xlims[0] if xr > self._max_xlims[1]: xr = self._max_xlims[1] - self.dataPlot.setXLims((xl, xr)) + self.dataPlot.setXLims(self.dataPlot.axes[0], (xl, xr)) self.dataPlot.draw() def pickOnStation(self, gui_event): @@ -2393,7 +2393,7 @@ class MainWindow(QMainWindow): if self.pg: pw = self.getPlotWidget().plotWidget else: - ax = self.getPlotWidget().axes + ax = self.getPlotWidget().axes[0] ylims = np.array([-.5, +.5]) + plotID stat_picks = self.getPicks(type=picktype)[station] @@ -2463,7 +2463,7 @@ class MainWindow(QMainWindow): else: if picktype == 'manual': linestyle_mpp, width_mpp = pick_linestyle_plt(picktype, 'mpp') - color = pick_color_plt(picktype, phase, quality) + color = pick_color_plt(picktype, self.getPhaseID(phase), quality) if picks['epp'] and picks['lpp']: ax.fill_between([epp, lpp], ylims[0], ylims[1], alpha=.25, color=color, label='EPP, LPP') diff --git a/pylot/RELEASE-VERSION b/pylot/RELEASE-VERSION index 878d172c..33a2193d 100644 --- a/pylot/RELEASE-VERSION +++ b/pylot/RELEASE-VERSION @@ -1 +1 @@ -f483-dirty +98f7-dirty