From 3f1d11f077b8f78299d147c5a9a144ef35b6515d Mon Sep 17 00:00:00 2001 From: Anders Sandstrom Date: Tue, 8 Aug 2023 19:16:18 +0200 Subject: [PATCH] wIP --- tools/ecmcMotionMainPyQtGraph.py | 68 ++++++++++++++++---------------- 1 file changed, 33 insertions(+), 35 deletions(-) diff --git a/tools/ecmcMotionMainPyQtGraph.py b/tools/ecmcMotionMainPyQtGraph.py index e7b68b0..edd7bb9 100644 --- a/tools/ecmcMotionMainPyQtGraph.py +++ b/tools/ecmcMotionMainPyQtGraph.py @@ -736,23 +736,26 @@ class ecmcMtnMainGui(QtWidgets.QDialog): print("Data null for pv: " + pv) if autozoom: - ymin = np.min(self.data['PosAct-Arr']) - ymax = np.max(self.data['PosAct-Arr']) - # ensure different values - if ymin == ymax: - ymin=ymin-1 - ymax=ymax+1 - range = ymax - ymin - ymax += range * 0.1 - ymin -= range * 0.1 - xmin=minimum_x - xmax = 0 - if xmin == xmax: - xmin = xmin - 1 - xmax = xmax + 1 - range = xmax - xmin - xmax += range * 0.02 - xmin -= range * 0.02 + ymin = np.min(self.data['PosAct-Arr']) + ymax = np.max(self.data['PosAct-Arr']) + # ensure different values + if ymin == ymax: + ymin=ymin-1 + ymax=ymax+1 + range = ymax - ymin + ymax += range * 0.1 + ymin -= range * 0.1 + xmin = minimum_x + xmax = 0 + if xmin == xmax: + xmin = xmin - 1 + xmax = xmax + 1 + range = xmax - xmin + xmax += range * 0.02 + xmin -= range * 0.02 + #self.plotItemAnalog.setYRange(ymin, ymax, padding=0) + self.plotItemAnalog.setXRange(xmin, xmax, padding=0) + self.allowSave = True self.saveBtn.setEnabled(True) @@ -790,24 +793,19 @@ class ecmcMtnMainGui(QtWidgets.QDialog): print("Data null for pv: " + pv) if autozoom: - ymin = -0.1 - ymax = 1.1 - # ensure different values - if ymin == ymax: - ymin=ymin-1 - ymax=ymax+1 - range = ymax - ymin - ymax += range * 0.1 - ymin -= range * 0.1 - xmin=minimum_x - xmax = 0 - if xmin == xmax: - xmin = xmin - 1 - xmax = xmax + 1 - range = xmax - xmin - xmax += range * 0.02 - xmin -= range * 0.02 - + ymin = -0.1 + ymax = 1.1 + xmin = minimum_x + xmax = 0 + if xmin == xmax: + xmin = xmin - 1 + xmax = xmax + 1 + range = xmax - xmin + xmax += range * 0.02 + xmin -= range * 0.02 + self.plotItemBinary.setYRange(ymin, ymax, padding=0) + self.plotItemBinary.setXRange(xmin, xmax, padding=0) + self.allowSave = True self.saveBtn.setEnabled(True)