From 97f54595737c645327de1f067b683fffd87447fa Mon Sep 17 00:00:00 2001 From: KIU Shueng Chuan Date: Sun, 31 Jan 2021 22:12:55 +0800 Subject: [PATCH] regenerate plotConfigTemplate.ui for Qt5 the old ones were using obsoleted method "setMargin" --- .../PlotItem/plotConfigTemplate_pyqt5.py | 44 ++++---- .../PlotItem/plotConfigTemplate_pyside2.py | 100 +++++++++--------- 2 files changed, 72 insertions(+), 72 deletions(-) diff --git a/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt5.py b/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt5.py index 96eaea70..1df75811 100644 --- a/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt5.py +++ b/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyqt5.py @@ -1,14 +1,15 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui' +# Form implementation generated from reading ui file 'plotConfigTemplate.ui' # -# Created: Wed Mar 26 15:09:28 2014 -# by: PyQt5 UI code generator 5.0.1 +# Created by: PyQt5 UI code generator 5.12.3 # # WARNING! All changes made in this file will be lost! + from PyQt5 import QtCore, QtGui, QtWidgets + class Ui_Form(object): def setupUi(self, Form): Form.setObjectName("Form") @@ -73,24 +74,24 @@ class Ui_Form(object): self.transformGroup.setGeometry(QtCore.QRect(10, 10, 171, 101)) self.transformGroup.setObjectName("transformGroup") self.gridLayout = QtWidgets.QGridLayout(self.transformGroup) - self.gridLayout.setObjectName("gridLayout") - self.gridLayout.setMargin(0) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setSpacing(0) - self.logXCheck = QtGui.QCheckBox(self.transformGroup) - self.logXCheck.setObjectName("logXCheck") - self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1) - self.fftCheck = QtGui.QCheckBox(self.transformGroup) - self.fftCheck.setObjectName("fftCheck") - self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1) - self.derivativeCheck = QtGui.QCheckBox(self.transformGroup) - self.derivativeCheck.setObjectName("derivativeCheck") - self.gridLayout.addWidget(self.derivativeCheck, 3, 0, 1, 1) - self.phasemapCheck = QtGui.QCheckBox(self.transformGroup) - self.phasemapCheck.setObjectName("phasemapCheck") - self.gridLayout.addWidget(self.phasemapCheck, 4, 0, 1, 1) + self.gridLayout.setObjectName("gridLayout") self.logYCheck = QtWidgets.QCheckBox(self.transformGroup) self.logYCheck.setObjectName("logYCheck") self.gridLayout.addWidget(self.logYCheck, 2, 0, 1, 1) + self.logXCheck = QtWidgets.QCheckBox(self.transformGroup) + self.logXCheck.setObjectName("logXCheck") + self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1) + self.fftCheck = QtWidgets.QCheckBox(self.transformGroup) + self.fftCheck.setObjectName("fftCheck") + self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1) + self.derivativeCheck = QtWidgets.QCheckBox(self.transformGroup) + self.derivativeCheck.setObjectName("derivativeCheck") + self.gridLayout.addWidget(self.derivativeCheck, 3, 0, 1, 1) + self.phasemapCheck = QtWidgets.QCheckBox(self.transformGroup) + self.phasemapCheck.setObjectName("phasemapCheck") + self.gridLayout.addWidget(self.phasemapCheck, 4, 0, 1, 1) self.pointsGroup = QtWidgets.QGroupBox(Form) self.pointsGroup.setGeometry(QtCore.QRect(10, 550, 234, 58)) self.pointsGroup.setCheckable(True) @@ -164,11 +165,11 @@ class Ui_Form(object): self.autoDownsampleCheck.setText(_translate("Form", "Auto")) self.downsampleSpin.setToolTip(_translate("Form", "Downsample data before plotting. (plot every Nth sample)")) self.downsampleSpin.setSuffix(_translate("Form", "x")) - self.logXCheck.setText(_translate("Form", "Log X", None)) - self.fftCheck.setText(_translate("Form", "Power Spectrum (FFT)", None)) - self.derivativeCheck.setText(_translate("Form", "dy/dx", None)) - self.phasemapCheck.setText(_translate("Form", "Y vs. Y\'", None)) self.logYCheck.setText(_translate("Form", "Log Y")) + self.logXCheck.setText(_translate("Form", "Log X")) + self.fftCheck.setText(_translate("Form", "Power Spectrum (FFT)")) + self.derivativeCheck.setText(_translate("Form", "dy/dx")) + self.phasemapCheck.setText(_translate("Form", "Y vs. Y\'")) self.pointsGroup.setTitle(_translate("Form", "Points")) self.autoPointsCheck.setText(_translate("Form", "Auto")) self.xGridCheck.setText(_translate("Form", "Show X Grid")) @@ -176,4 +177,3 @@ class Ui_Form(object): self.label.setText(_translate("Form", "Opacity")) self.alphaGroup.setTitle(_translate("Form", "Alpha")) self.autoAlphaCheck.setText(_translate("Form", "Auto")) - diff --git a/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyside2.py b/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyside2.py index 34b4911e..d5c59acd 100644 --- a/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyside2.py +++ b/pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate_pyside2.py @@ -1,9 +1,10 @@ # -*- coding: utf-8 -*- -# Form implementation generated from reading ui file './pyqtgraph/graphicsItems/PlotItem/plotConfigTemplate.ui' +# Form implementation generated from reading ui file 'plotConfigTemplate.ui', +# licensing of 'plotConfigTemplate.ui' applies. # -# Created: Wed Mar 26 15:09:28 2014 -# by: PyQt5 UI code generator 5.0.1 +# Created: Sun Jan 31 22:10:16 2021 +# by: pyside2-uic running on PySide2 5.12.6 # # WARNING! All changes made in this file will be lost! @@ -73,24 +74,24 @@ class Ui_Form(object): self.transformGroup.setGeometry(QtCore.QRect(10, 10, 171, 101)) self.transformGroup.setObjectName("transformGroup") self.gridLayout = QtWidgets.QGridLayout(self.transformGroup) - self.gridLayout.setMargin(0) + self.gridLayout.setContentsMargins(0, 0, 0, 0) self.gridLayout.setSpacing(0) self.gridLayout.setObjectName("gridLayout") - self.logXCheck = QtGui.QCheckBox(self.transformGroup) - self.logXCheck.setObjectName("logXCheck") - self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1) - self.fftCheck = QtGui.QCheckBox(self.transformGroup) - self.fftCheck.setObjectName("fftCheck") - self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1) - self.derivativeCheck = QtGui.QCheckBox(self.transformGroup) - self.derivativeCheck.setObjectName("derivativeCheck") - self.gridLayout.addWidget(self.derivativeCheck, 3, 0, 1, 1) - self.phasemapCheck = QtGui.QCheckBox(self.transformGroup) - self.phasemapCheck.setObjectName("phasemapCheck") - self.gridLayout.addWidget(self.phasemapCheck, 4, 0, 1, 1) self.logYCheck = QtWidgets.QCheckBox(self.transformGroup) self.logYCheck.setObjectName("logYCheck") self.gridLayout.addWidget(self.logYCheck, 2, 0, 1, 1) + self.logXCheck = QtWidgets.QCheckBox(self.transformGroup) + self.logXCheck.setObjectName("logXCheck") + self.gridLayout.addWidget(self.logXCheck, 1, 0, 1, 1) + self.fftCheck = QtWidgets.QCheckBox(self.transformGroup) + self.fftCheck.setObjectName("fftCheck") + self.gridLayout.addWidget(self.fftCheck, 0, 0, 1, 1) + self.derivativeCheck = QtWidgets.QCheckBox(self.transformGroup) + self.derivativeCheck.setObjectName("derivativeCheck") + self.gridLayout.addWidget(self.derivativeCheck, 3, 0, 1, 1) + self.phasemapCheck = QtWidgets.QCheckBox(self.transformGroup) + self.phasemapCheck.setObjectName("phasemapCheck") + self.gridLayout.addWidget(self.phasemapCheck, 4, 0, 1, 1) self.pointsGroup = QtWidgets.QGroupBox(Form) self.pointsGroup.setGeometry(QtCore.QRect(10, 550, 234, 58)) self.pointsGroup.setCheckable(True) @@ -142,38 +143,37 @@ class Ui_Form(object): QtCore.QMetaObject.connectSlotsByName(Form) def retranslateUi(self, Form): - _translate = QtCore.QCoreApplication.translate - Form.setWindowTitle(_translate("Form", "Form")) - self.averageGroup.setToolTip(_translate("Form", "Display averages of the curves displayed in this plot. The parameter list allows you to choose parameters to average over (if any are available).")) - self.averageGroup.setTitle(_translate("Form", "Average")) - self.clipToViewCheck.setToolTip(_translate("Form", "Plot only the portion of each curve that is visible. This assumes X values are uniformly spaced.")) - self.clipToViewCheck.setText(_translate("Form", "Clip to View")) - self.maxTracesCheck.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check this box to limit the number of traces that are displayed.")) - self.maxTracesCheck.setText(_translate("Form", "Max Traces:")) - self.downsampleCheck.setText(_translate("Form", "Downsample")) - self.peakRadio.setToolTip(_translate("Form", "Downsample by drawing a saw wave that follows the min and max of the original data. This method produces the best visual representation of the data but is slower.")) - self.peakRadio.setText(_translate("Form", "Peak")) - self.maxTracesSpin.setToolTip(_translate("Form", "If multiple curves are displayed in this plot, check \"Max Traces\" and set this value to limit the number of traces that are displayed.")) - self.forgetTracesCheck.setToolTip(_translate("Form", "If MaxTraces is checked, remove curves from memory after they are hidden (saves memory, but traces can not be un-hidden).")) - self.forgetTracesCheck.setText(_translate("Form", "Forget hidden traces")) - self.meanRadio.setToolTip(_translate("Form", "Downsample by taking the mean of N samples.")) - self.meanRadio.setText(_translate("Form", "Mean")) - self.subsampleRadio.setToolTip(_translate("Form", "Downsample by taking the first of N samples. This method is fastest and least accurate.")) - self.subsampleRadio.setText(_translate("Form", "Subsample")) - self.autoDownsampleCheck.setToolTip(_translate("Form", "Automatically downsample data based on the visible range. This assumes X values are uniformly spaced.")) - self.autoDownsampleCheck.setText(_translate("Form", "Auto")) - self.downsampleSpin.setToolTip(_translate("Form", "Downsample data before plotting. (plot every Nth sample)")) - self.downsampleSpin.setSuffix(_translate("Form", "x")) - self.logXCheck.setText(_translate("Form", "Log X", None)) - self.fftCheck.setText(_translate("Form", "Power Spectrum (FFT)", None)) - self.derivativeCheck.setText(_translate("Form", "dy/dx", None)) - self.phasemapCheck.setText(_translate("Form", "Y vs. Y\'", None)) - self.logYCheck.setText(_translate("Form", "Log Y")) - self.pointsGroup.setTitle(_translate("Form", "Points")) - self.autoPointsCheck.setText(_translate("Form", "Auto")) - self.xGridCheck.setText(_translate("Form", "Show X Grid")) - self.yGridCheck.setText(_translate("Form", "Show Y Grid")) - self.label.setText(_translate("Form", "Opacity")) - self.alphaGroup.setTitle(_translate("Form", "Alpha")) - self.autoAlphaCheck.setText(_translate("Form", "Auto")) + Form.setWindowTitle(QtWidgets.QApplication.translate("Form", "PyQtGraph", None, -1)) + self.averageGroup.setToolTip(QtWidgets.QApplication.translate("Form", "Display averages of the curves displayed in this plot. The parameter list allows you to choose parameters to average over (if any are available).", None, -1)) + self.averageGroup.setTitle(QtWidgets.QApplication.translate("Form", "Average", None, -1)) + self.clipToViewCheck.setToolTip(QtWidgets.QApplication.translate("Form", "Plot only the portion of each curve that is visible. This assumes X values are uniformly spaced.", None, -1)) + self.clipToViewCheck.setText(QtWidgets.QApplication.translate("Form", "Clip to View", None, -1)) + self.maxTracesCheck.setToolTip(QtWidgets.QApplication.translate("Form", "If multiple curves are displayed in this plot, check this box to limit the number of traces that are displayed.", None, -1)) + self.maxTracesCheck.setText(QtWidgets.QApplication.translate("Form", "Max Traces:", None, -1)) + self.downsampleCheck.setText(QtWidgets.QApplication.translate("Form", "Downsample", None, -1)) + self.peakRadio.setToolTip(QtWidgets.QApplication.translate("Form", "Downsample by drawing a saw wave that follows the min and max of the original data. This method produces the best visual representation of the data but is slower.", None, -1)) + self.peakRadio.setText(QtWidgets.QApplication.translate("Form", "Peak", None, -1)) + self.maxTracesSpin.setToolTip(QtWidgets.QApplication.translate("Form", "If multiple curves are displayed in this plot, check \"Max Traces\" and set this value to limit the number of traces that are displayed.", None, -1)) + self.forgetTracesCheck.setToolTip(QtWidgets.QApplication.translate("Form", "If MaxTraces is checked, remove curves from memory after they are hidden (saves memory, but traces can not be un-hidden).", None, -1)) + self.forgetTracesCheck.setText(QtWidgets.QApplication.translate("Form", "Forget hidden traces", None, -1)) + self.meanRadio.setToolTip(QtWidgets.QApplication.translate("Form", "Downsample by taking the mean of N samples.", None, -1)) + self.meanRadio.setText(QtWidgets.QApplication.translate("Form", "Mean", None, -1)) + self.subsampleRadio.setToolTip(QtWidgets.QApplication.translate("Form", "Downsample by taking the first of N samples. This method is fastest and least accurate.", None, -1)) + self.subsampleRadio.setText(QtWidgets.QApplication.translate("Form", "Subsample", None, -1)) + self.autoDownsampleCheck.setToolTip(QtWidgets.QApplication.translate("Form", "Automatically downsample data based on the visible range. This assumes X values are uniformly spaced.", None, -1)) + self.autoDownsampleCheck.setText(QtWidgets.QApplication.translate("Form", "Auto", None, -1)) + self.downsampleSpin.setToolTip(QtWidgets.QApplication.translate("Form", "Downsample data before plotting. (plot every Nth sample)", None, -1)) + self.downsampleSpin.setSuffix(QtWidgets.QApplication.translate("Form", "x", None, -1)) + self.logYCheck.setText(QtWidgets.QApplication.translate("Form", "Log Y", None, -1)) + self.logXCheck.setText(QtWidgets.QApplication.translate("Form", "Log X", None, -1)) + self.fftCheck.setText(QtWidgets.QApplication.translate("Form", "Power Spectrum (FFT)", None, -1)) + self.derivativeCheck.setText(QtWidgets.QApplication.translate("Form", "dy/dx", None, -1)) + self.phasemapCheck.setText(QtWidgets.QApplication.translate("Form", "Y vs. Y\'", None, -1)) + self.pointsGroup.setTitle(QtWidgets.QApplication.translate("Form", "Points", None, -1)) + self.autoPointsCheck.setText(QtWidgets.QApplication.translate("Form", "Auto", None, -1)) + self.xGridCheck.setText(QtWidgets.QApplication.translate("Form", "Show X Grid", None, -1)) + self.yGridCheck.setText(QtWidgets.QApplication.translate("Form", "Show Y Grid", None, -1)) + self.label.setText(QtWidgets.QApplication.translate("Form", "Opacity", None, -1)) + self.alphaGroup.setTitle(QtWidgets.QApplication.translate("Form", "Alpha", None, -1)) + self.autoAlphaCheck.setText(QtWidgets.QApplication.translate("Form", "Auto", None, -1))