Merge pull request #414 from campagnola/canvas-fixes

Fix canvas classes for PyQt5 and PySide

CONTRIBUTING.txt

@@ -3,12 +3,10 @@ Contributions to pyqtgraph are welcome!
 Please use the following guidelines when preparing changes:
 
 * The preferred method for submitting changes is by github pull request
-  against the "develop" branch. If this is inconvenient, don't hesitate to 
+  against the "develop" branch. 
-  submit by other means.
 
 * Pull requests should include only a focused and related set of changes. 
-  Mixed features and unrelated changes (such as .gitignore) will usually be
+  Mixed features and unrelated changes may be rejected.
-  rejected.
 
 * For major changes, it is recommended to discuss your plans on the mailing 
   list or in a github issue before putting in too much effort.

pyqtgraph/canvas/Canvas.py

@@ -4,15 +4,17 @@ if __name__ == '__main__':
     md = os.path.dirname(os.path.abspath(__file__))
     sys.path = [os.path.dirname(md), os.path.join(md, '..', '..', '..')] + sys.path
 
-from ..Qt import QtGui, QtCore, USE_PYSIDE
+from ..Qt import QtGui, QtCore, QT_LIB
 from ..graphicsItems.ROI import ROI
 from ..graphicsItems.ViewBox import ViewBox
 from ..graphicsItems.GridItem import GridItem
 
-if USE_PYSIDE:
+if QT_LIB == 'PySide':
     from .CanvasTemplate_pyside import *
-else:
+elif QT_LIB == 'PyQt4':
     from .CanvasTemplate_pyqt import *
+elif QT_LIB == 'PyQt5':
+    from .CanvasTemplate_pyqt5 import *
     
 import numpy as np
 from .. import debug
@@ -378,7 +380,7 @@ class Canvas(QtGui.QWidget):
         z = citem.zValue()
         if z is None:
             zvals = [i.zValue() for i in siblings]
-            if parent == self.itemList.invisibleRootItem():
+            if parent is self.itemList.invisibleRootItem():
                 if len(zvals) == 0:
                     z = 0
                 else:

pyqtgraph/canvas/CanvasItem.py

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
-from ..Qt import QtGui, QtCore, QtSvg, USE_PYSIDE
+from ..Qt import QtGui, QtCore, QtSvg, QT_LIB
 from ..graphicsItems.ROI import ROI
 from .. import SRTTransform, ItemGroup
-if USE_PYSIDE:
+if QT_LIB == 'PySide':
     from . import TransformGuiTemplate_pyside as TransformGuiTemplate
-else:
+elif QT_LIB == 'PyQt4':
     from . import TransformGuiTemplate_pyqt as TransformGuiTemplate
+elif QT_LIB == 'PyQt5':
+    from . import TransformGuiTemplate_pyqt5 as TransformGuiTemplate
 
 from .. import debug
 

pyqtgraph/canvas/CanvasTemplate.ui

@@ -127,7 +127,7 @@
   <customwidget>
    <class>CanvasCombo</class>
    <extends>QComboBox</extends>
-   <header>CanvasManager</header>
+   <header>.CanvasManager</header>
   </customwidget>
  </customwidgets>
  <resources/>

pyqtgraph/canvas/CanvasTemplate_pyqt.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file 'acq4/pyqtgraph/canvas/CanvasTemplate.ui'
+# Form implementation generated from reading ui file 'pyqtgraph/canvas/CanvasTemplate.ui'
 #
-# Created: Thu Jan  2 11:13:07 2014
+# Created by: PyQt4 UI code generator 4.11.4
-#      by: PyQt4 UI code generator 4.9
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,7 +11,16 @@ from PyQt4 import QtCore, QtGui
 try:
     _fromUtf8 = QtCore.QString.fromUtf8
 except AttributeError:
-    _fromUtf8 = lambda s: s
+    def _fromUtf8(s):
+        return s
+
+try:
+    _encoding = QtGui.QApplication.UnicodeUTF8
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig, _encoding)
+except AttributeError:
+    def _translate(context, text, disambig):
+        return QtGui.QApplication.translate(context, text, disambig)
 
 class Ui_Form(object):
     def setupUi(self, Form):
@@ -30,7 +38,6 @@ class Ui_Form(object):
         self.layoutWidget = QtGui.QWidget(self.splitter)
         self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
         self.gridLayout_2 = QtGui.QGridLayout(self.layoutWidget)
-        self.gridLayout_2.setMargin(0)
         self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
         self.autoRangeBtn = QtGui.QPushButton(self.layoutWidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
@@ -79,14 +86,14 @@ class Ui_Form(object):
         QtCore.QMetaObject.connectSlotsByName(Form)
 
     def retranslateUi(self, Form):
-        Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
+        Form.setWindowTitle(_translate("Form", "Form", None))
-        self.autoRangeBtn.setText(QtGui.QApplication.translate("Form", "Auto Range", None, QtGui.QApplication.UnicodeUTF8))
+        self.autoRangeBtn.setText(_translate("Form", "Auto Range", None))
-        self.redirectCheck.setToolTip(QtGui.QApplication.translate("Form", "Check to display all local items in a remote canvas.", None, QtGui.QApplication.UnicodeUTF8))
+        self.redirectCheck.setToolTip(_translate("Form", "Check to display all local items in a remote canvas.", None))
-        self.redirectCheck.setText(QtGui.QApplication.translate("Form", "Redirect", None, QtGui.QApplication.UnicodeUTF8))
+        self.redirectCheck.setText(_translate("Form", "Redirect", None))
-        self.resetTransformsBtn.setText(QtGui.QApplication.translate("Form", "Reset Transforms", None, QtGui.QApplication.UnicodeUTF8))
+        self.resetTransformsBtn.setText(_translate("Form", "Reset Transforms", None))
-        self.mirrorSelectionBtn.setText(QtGui.QApplication.translate("Form", "Mirror Selection", None, QtGui.QApplication.UnicodeUTF8))
+        self.mirrorSelectionBtn.setText(_translate("Form", "Mirror Selection", None))
-        self.reflectSelectionBtn.setText(QtGui.QApplication.translate("Form", "MirrorXY", None, QtGui.QApplication.UnicodeUTF8))
+        self.reflectSelectionBtn.setText(_translate("Form", "MirrorXY", None))
 
-from ..widgets.TreeWidget import TreeWidget
-from CanvasManager import CanvasCombo
 from ..widgets.GraphicsView import GraphicsView
+from ..widgets.TreeWidget import TreeWidget
+from .CanvasManager import CanvasCombo

pyqtgraph/canvas/CanvasTemplate_pyqt5.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './pyqtgraph/canvas/CanvasTemplate.ui'
+# Form implementation generated from reading ui file 'pyqtgraph/canvas/CanvasTemplate.ui'
 #
-# Created: Wed Mar 26 15:09:28 2014
+# Created by: PyQt5 UI code generator 5.5.1
-#      by: PyQt5 UI code generator 5.0.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -25,14 +24,7 @@ class Ui_Form(object):
         self.layoutWidget = QtWidgets.QWidget(self.splitter)
         self.layoutWidget.setObjectName("layoutWidget")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.layoutWidget)
-        self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.storeSvgBtn = QtWidgets.QPushButton(self.layoutWidget)
-        self.storeSvgBtn.setObjectName("storeSvgBtn")
-        self.gridLayout_2.addWidget(self.storeSvgBtn, 1, 0, 1, 1)
-        self.storePngBtn = QtWidgets.QPushButton(self.layoutWidget)
-        self.storePngBtn.setObjectName("storePngBtn")
-        self.gridLayout_2.addWidget(self.storePngBtn, 1, 1, 1, 1)
         self.autoRangeBtn = QtWidgets.QPushButton(self.layoutWidget)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -40,7 +32,7 @@ class Ui_Form(object):
         sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
         self.autoRangeBtn.setSizePolicy(sizePolicy)
         self.autoRangeBtn.setObjectName("autoRangeBtn")
-        self.gridLayout_2.addWidget(self.autoRangeBtn, 3, 0, 1, 2)
+        self.gridLayout_2.addWidget(self.autoRangeBtn, 2, 0, 1, 2)
         self.horizontalLayout = QtWidgets.QHBoxLayout()
         self.horizontalLayout.setSpacing(0)
         self.horizontalLayout.setObjectName("horizontalLayout")
@@ -50,7 +42,7 @@ class Ui_Form(object):
         self.redirectCombo = CanvasCombo(self.layoutWidget)
         self.redirectCombo.setObjectName("redirectCombo")
         self.horizontalLayout.addWidget(self.redirectCombo)
-        self.gridLayout_2.addLayout(self.horizontalLayout, 6, 0, 1, 2)
+        self.gridLayout_2.addLayout(self.horizontalLayout, 5, 0, 1, 2)
         self.itemList = TreeWidget(self.layoutWidget)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
@@ -60,20 +52,20 @@ class Ui_Form(object):
         self.itemList.setHeaderHidden(True)
         self.itemList.setObjectName("itemList")
         self.itemList.headerItem().setText(0, "1")
-        self.gridLayout_2.addWidget(self.itemList, 7, 0, 1, 2)
+        self.gridLayout_2.addWidget(self.itemList, 6, 0, 1, 2)
         self.ctrlLayout = QtWidgets.QGridLayout()
         self.ctrlLayout.setSpacing(0)
         self.ctrlLayout.setObjectName("ctrlLayout")
-        self.gridLayout_2.addLayout(self.ctrlLayout, 11, 0, 1, 2)
+        self.gridLayout_2.addLayout(self.ctrlLayout, 10, 0, 1, 2)
         self.resetTransformsBtn = QtWidgets.QPushButton(self.layoutWidget)
         self.resetTransformsBtn.setObjectName("resetTransformsBtn")
-        self.gridLayout_2.addWidget(self.resetTransformsBtn, 8, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.resetTransformsBtn, 7, 0, 1, 1)
         self.mirrorSelectionBtn = QtWidgets.QPushButton(self.layoutWidget)
         self.mirrorSelectionBtn.setObjectName("mirrorSelectionBtn")
-        self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 4, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 3, 0, 1, 1)
         self.reflectSelectionBtn = QtWidgets.QPushButton(self.layoutWidget)
         self.reflectSelectionBtn.setObjectName("reflectSelectionBtn")
-        self.gridLayout_2.addWidget(self.reflectSelectionBtn, 4, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.reflectSelectionBtn, 3, 1, 1, 1)
         self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
 
         self.retranslateUi(Form)
@@ -82,8 +74,6 @@ class Ui_Form(object):
     def retranslateUi(self, Form):
         _translate = QtCore.QCoreApplication.translate
         Form.setWindowTitle(_translate("Form", "Form"))
-        self.storeSvgBtn.setText(_translate("Form", "Store SVG"))
-        self.storePngBtn.setText(_translate("Form", "Store PNG"))
         self.autoRangeBtn.setText(_translate("Form", "Auto Range"))
         self.redirectCheck.setToolTip(_translate("Form", "Check to display all local items in a remote canvas."))
         self.redirectCheck.setText(_translate("Form", "Redirect"))
@@ -93,4 +83,4 @@ class Ui_Form(object):
 
 from ..widgets.GraphicsView import GraphicsView
 from ..widgets.TreeWidget import TreeWidget
-from CanvasManager import CanvasCombo
+from .CanvasManager import CanvasCombo

pyqtgraph/canvas/CanvasTemplate_pyside.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './pyqtgraph/canvas/CanvasTemplate.ui'
+# Form implementation generated from reading ui file 'pyqtgraph/canvas/CanvasTemplate.ui'
 #
-# Created: Mon Dec 23 10:10:52 2013
+# Created: Wed Nov  9 18:02:00 2016
-#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -27,12 +27,6 @@ class Ui_Form(object):
         self.gridLayout_2 = QtGui.QGridLayout(self.layoutWidget)
         self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
         self.gridLayout_2.setObjectName("gridLayout_2")
-        self.storeSvgBtn = QtGui.QPushButton(self.layoutWidget)
-        self.storeSvgBtn.setObjectName("storeSvgBtn")
-        self.gridLayout_2.addWidget(self.storeSvgBtn, 1, 0, 1, 1)
-        self.storePngBtn = QtGui.QPushButton(self.layoutWidget)
-        self.storePngBtn.setObjectName("storePngBtn")
-        self.gridLayout_2.addWidget(self.storePngBtn, 1, 1, 1, 1)
         self.autoRangeBtn = QtGui.QPushButton(self.layoutWidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -40,7 +34,7 @@ class Ui_Form(object):
         sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
         self.autoRangeBtn.setSizePolicy(sizePolicy)
         self.autoRangeBtn.setObjectName("autoRangeBtn")
-        self.gridLayout_2.addWidget(self.autoRangeBtn, 3, 0, 1, 2)
+        self.gridLayout_2.addWidget(self.autoRangeBtn, 2, 0, 1, 2)
         self.horizontalLayout = QtGui.QHBoxLayout()
         self.horizontalLayout.setSpacing(0)
         self.horizontalLayout.setObjectName("horizontalLayout")
@@ -50,7 +44,7 @@ class Ui_Form(object):
         self.redirectCombo = CanvasCombo(self.layoutWidget)
         self.redirectCombo.setObjectName("redirectCombo")
         self.horizontalLayout.addWidget(self.redirectCombo)
-        self.gridLayout_2.addLayout(self.horizontalLayout, 6, 0, 1, 2)
+        self.gridLayout_2.addLayout(self.horizontalLayout, 5, 0, 1, 2)
         self.itemList = TreeWidget(self.layoutWidget)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
@@ -60,20 +54,20 @@ class Ui_Form(object):
         self.itemList.setHeaderHidden(True)
         self.itemList.setObjectName("itemList")
         self.itemList.headerItem().setText(0, "1")
-        self.gridLayout_2.addWidget(self.itemList, 7, 0, 1, 2)
+        self.gridLayout_2.addWidget(self.itemList, 6, 0, 1, 2)
         self.ctrlLayout = QtGui.QGridLayout()
         self.ctrlLayout.setSpacing(0)
         self.ctrlLayout.setObjectName("ctrlLayout")
-        self.gridLayout_2.addLayout(self.ctrlLayout, 11, 0, 1, 2)
+        self.gridLayout_2.addLayout(self.ctrlLayout, 10, 0, 1, 2)
         self.resetTransformsBtn = QtGui.QPushButton(self.layoutWidget)
         self.resetTransformsBtn.setObjectName("resetTransformsBtn")
-        self.gridLayout_2.addWidget(self.resetTransformsBtn, 8, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.resetTransformsBtn, 7, 0, 1, 1)
         self.mirrorSelectionBtn = QtGui.QPushButton(self.layoutWidget)
         self.mirrorSelectionBtn.setObjectName("mirrorSelectionBtn")
-        self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 4, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 3, 0, 1, 1)
         self.reflectSelectionBtn = QtGui.QPushButton(self.layoutWidget)
         self.reflectSelectionBtn.setObjectName("reflectSelectionBtn")
-        self.gridLayout_2.addWidget(self.reflectSelectionBtn, 4, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.reflectSelectionBtn, 3, 1, 1, 1)
         self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
 
         self.retranslateUi(Form)
@@ -81,8 +75,6 @@ class Ui_Form(object):
 
     def retranslateUi(self, Form):
         Form.setWindowTitle(QtGui.QApplication.translate("Form", "Form", None, QtGui.QApplication.UnicodeUTF8))
-        self.storeSvgBtn.setText(QtGui.QApplication.translate("Form", "Store SVG", None, QtGui.QApplication.UnicodeUTF8))
-        self.storePngBtn.setText(QtGui.QApplication.translate("Form", "Store PNG", None, QtGui.QApplication.UnicodeUTF8))
         self.autoRangeBtn.setText(QtGui.QApplication.translate("Form", "Auto Range", None, QtGui.QApplication.UnicodeUTF8))
         self.redirectCheck.setToolTip(QtGui.QApplication.translate("Form", "Check to display all local items in a remote canvas.", None, QtGui.QApplication.UnicodeUTF8))
         self.redirectCheck.setText(QtGui.QApplication.translate("Form", "Redirect", None, QtGui.QApplication.UnicodeUTF8))
@@ -90,6 +82,6 @@ class Ui_Form(object):
         self.mirrorSelectionBtn.setText(QtGui.QApplication.translate("Form", "Mirror Selection", None, QtGui.QApplication.UnicodeUTF8))
         self.reflectSelectionBtn.setText(QtGui.QApplication.translate("Form", "MirrorXY", None, QtGui.QApplication.UnicodeUTF8))
 
+from .CanvasManager import CanvasCombo
 from ..widgets.TreeWidget import TreeWidget
-from CanvasManager import CanvasCombo
 from ..widgets.GraphicsView import GraphicsView

pyqtgraph/canvas/TransformGuiTemplate_pyqt.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './pyqtgraph/canvas/TransformGuiTemplate.ui'
+# Form implementation generated from reading ui file 'pyqtgraph/canvas/TransformGuiTemplate.ui'
 #
-# Created: Mon Dec 23 10:10:52 2013
+# Created by: PyQt4 UI code generator 4.11.4
-#      by: PyQt4 UI code generator 4.10
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -33,8 +32,8 @@ class Ui_Form(object):
         sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
         Form.setSizePolicy(sizePolicy)
         self.verticalLayout = QtGui.QVBoxLayout(Form)
-        self.verticalLayout.setSpacing(1)
         self.verticalLayout.setMargin(0)
+        self.verticalLayout.setSpacing(1)
         self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
         self.translateLabel = QtGui.QLabel(Form)
         self.translateLabel.setObjectName(_fromUtf8("translateLabel"))

pyqtgraph/canvas/TransformGuiTemplate_pyqt5.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './pyqtgraph/canvas/TransformGuiTemplate.ui'
+# Form implementation generated from reading ui file 'pyqtgraph/canvas/TransformGuiTemplate.ui'
 #
-# Created: Wed Mar 26 15:09:28 2014
+# Created by: PyQt5 UI code generator 5.5.1
-#      by: PyQt5 UI code generator 5.0.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -19,8 +18,8 @@ class Ui_Form(object):
         sizePolicy.setHeightForWidth(Form.sizePolicy().hasHeightForWidth())
         Form.setSizePolicy(sizePolicy)
         self.verticalLayout = QtWidgets.QVBoxLayout(Form)
-        self.verticalLayout.setSpacing(1)
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
+        self.verticalLayout.setSpacing(1)
         self.verticalLayout.setObjectName("verticalLayout")
         self.translateLabel = QtWidgets.QLabel(Form)
         self.translateLabel.setObjectName("translateLabel")

pyqtgraph/canvas/TransformGuiTemplate_pyside.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
-# Form implementation generated from reading ui file './pyqtgraph/canvas/TransformGuiTemplate.ui'
+# Form implementation generated from reading ui file 'pyqtgraph/canvas/TransformGuiTemplate.ui'
 #
-# Created: Mon Dec 23 10:10:52 2013
+# Created: Wed Nov  9 17:57:16 2016
-#      by: pyside-uic 0.2.14 running on PySide 1.1.2
+#      by: pyside-uic 0.2.15 running on PySide 1.2.2
 #
 # WARNING! All changes made in this file will be lost!
 

tools/rebuildUi.py

@@ -1,3 +1,4 @@
+#!/usr/bin/python
 """
 Script for compiling Qt Designer .ui files to .py
 
@@ -12,16 +13,24 @@ pyqt5uic = 'pyuic5'
 
 usage = """Compile .ui files to .py for all supported pyqt/pyside versions.
 
-  Usage: python rebuildUi.py [.ui files|search paths]
+  Usage: python rebuildUi.py [--force] [.ui files|search paths]
 
   May specify a list of .ui files and/or directories to search recursively for .ui files.
 """
 
 args = sys.argv[1:]
+
+if '--force' in args:
+    force = True
+    args.remove('--force')
+else:
+    force = False
+
 if len(args) == 0:
     print(usage)
     sys.exit(-1)
 
+    
 uifiles = []
 for arg in args:
     if os.path.isfile(arg) and arg.endswith('.ui'):
@@ -42,7 +51,7 @@ for ui in uifiles:
     base, _ = os.path.splitext(ui)
     for compiler, ext in [(pyqtuic, '_pyqt.py'), (pysideuic, '_pyside.py'), (pyqt5uic, '_pyqt5.py')]:
         py = base + ext
-        if os.path.exists(py) and os.stat(ui).st_mtime <= os.stat(py).st_mtime:
+        if not force and os.path.exists(py) and os.stat(ui).st_mtime <= os.stat(py).st_mtime:
             print("Skipping %s; already compiled." % py)
         else:
             cmd = '%s %s > %s' % (compiler, ui, py)