diff --git a/pyqtgraph/canvas/CanvasTemplate.ui b/pyqtgraph/canvas/CanvasTemplate.ui
index b05c11cd..bfdacf38 100644
--- a/pyqtgraph/canvas/CanvasTemplate.ui
+++ b/pyqtgraph/canvas/CanvasTemplate.ui
@@ -6,14 +6,14 @@
0
0
- 490
- 414
+ 821
+ 578
Form
-
+
0
@@ -26,88 +26,96 @@
Qt::Horizontal
-
-
- -
-
-
-
- 0
- 1
-
-
-
- Auto Range
-
-
-
- -
-
-
- 0
-
-
-
-
-
- Check to display all local items in a remote canvas.
-
-
- Redirect
-
-
-
- -
-
-
-
-
- -
-
-
-
- 0
- 100
-
-
-
- true
-
-
-
- 1
+
+
+ Qt::Vertical
+
+
+
+
-
+
+
+
+ 0
+ 1
+
-
-
-
- -
-
-
- 0
-
-
-
- -
-
-
- Reset Transforms
-
-
-
- -
-
-
- Mirror Selection
-
-
-
- -
-
-
- MirrorXY
-
-
-
-
+
+ Auto Range
+
+
+
+ -
+
+
+ 0
+
+
-
+
+
+ Check to display all local items in a remote canvas.
+
+
+ Redirect
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+ 0
+ 100
+
+
+
+ true
+
+
+
+ 1
+
+
+
+
+ -
+
+
+ Reset Transforms
+
+
+
+ -
+
+
+ Mirror Selection
+
+
+
+ -
+
+
+ MirrorXY
+
+
+
+
+
+
+
+
+ 0
+
+
+ 0
+
+
+
diff --git a/pyqtgraph/canvas/CanvasTemplate_pyqt.py b/pyqtgraph/canvas/CanvasTemplate_pyqt.py
index b65ef465..3569c8e7 100644
--- a/pyqtgraph/canvas/CanvasTemplate_pyqt.py
+++ b/pyqtgraph/canvas/CanvasTemplate_pyqt.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file 'pyqtgraph/canvas/CanvasTemplate.ui'
+# Form implementation generated from reading ui file 'CanvasTemplate.ui'
#
# Created by: PyQt4 UI code generator 4.11.4
#
@@ -25,39 +25,42 @@ except AttributeError:
class Ui_Form(object):
def setupUi(self, Form):
Form.setObjectName(_fromUtf8("Form"))
- Form.resize(490, 414)
- self.gridLayout = QtGui.QGridLayout(Form)
- self.gridLayout.setMargin(0)
- self.gridLayout.setSpacing(0)
- self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+ Form.resize(821, 578)
+ self.gridLayout_2 = QtGui.QGridLayout(Form)
+ self.gridLayout_2.setMargin(0)
+ self.gridLayout_2.setSpacing(0)
+ self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
self.splitter = QtGui.QSplitter(Form)
self.splitter.setOrientation(QtCore.Qt.Horizontal)
self.splitter.setObjectName(_fromUtf8("splitter"))
self.view = GraphicsView(self.splitter)
self.view.setObjectName(_fromUtf8("view"))
- self.layoutWidget = QtGui.QWidget(self.splitter)
- self.layoutWidget.setObjectName(_fromUtf8("layoutWidget"))
- self.gridLayout_2 = QtGui.QGridLayout(self.layoutWidget)
- self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
- self.autoRangeBtn = QtGui.QPushButton(self.layoutWidget)
+ self.vsplitter = QtGui.QSplitter(self.splitter)
+ self.vsplitter.setOrientation(QtCore.Qt.Vertical)
+ self.vsplitter.setObjectName(_fromUtf8("vsplitter"))
+ self.canvasCtrlWidget = QtGui.QWidget(self.vsplitter)
+ self.canvasCtrlWidget.setObjectName(_fromUtf8("canvasCtrlWidget"))
+ self.gridLayout = QtGui.QGridLayout(self.canvasCtrlWidget)
+ self.gridLayout.setObjectName(_fromUtf8("gridLayout"))
+ self.autoRangeBtn = QtGui.QPushButton(self.canvasCtrlWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(1)
sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
self.autoRangeBtn.setSizePolicy(sizePolicy)
self.autoRangeBtn.setObjectName(_fromUtf8("autoRangeBtn"))
- self.gridLayout_2.addWidget(self.autoRangeBtn, 2, 0, 1, 2)
+ self.gridLayout.addWidget(self.autoRangeBtn, 0, 0, 1, 2)
self.horizontalLayout = QtGui.QHBoxLayout()
self.horizontalLayout.setSpacing(0)
self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
- self.redirectCheck = QtGui.QCheckBox(self.layoutWidget)
+ self.redirectCheck = QtGui.QCheckBox(self.canvasCtrlWidget)
self.redirectCheck.setObjectName(_fromUtf8("redirectCheck"))
self.horizontalLayout.addWidget(self.redirectCheck)
- self.redirectCombo = CanvasCombo(self.layoutWidget)
+ self.redirectCombo = CanvasCombo(self.canvasCtrlWidget)
self.redirectCombo.setObjectName(_fromUtf8("redirectCombo"))
self.horizontalLayout.addWidget(self.redirectCombo)
- self.gridLayout_2.addLayout(self.horizontalLayout, 5, 0, 1, 2)
- self.itemList = TreeWidget(self.layoutWidget)
+ self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 2)
+ self.itemList = TreeWidget(self.canvasCtrlWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(100)
@@ -66,21 +69,23 @@ class Ui_Form(object):
self.itemList.setHeaderHidden(True)
self.itemList.setObjectName(_fromUtf8("itemList"))
self.itemList.headerItem().setText(0, _fromUtf8("1"))
- self.gridLayout_2.addWidget(self.itemList, 6, 0, 1, 2)
- self.ctrlLayout = QtGui.QGridLayout()
+ self.gridLayout.addWidget(self.itemList, 2, 0, 1, 2)
+ self.resetTransformsBtn = QtGui.QPushButton(self.canvasCtrlWidget)
+ self.resetTransformsBtn.setObjectName(_fromUtf8("resetTransformsBtn"))
+ self.gridLayout.addWidget(self.resetTransformsBtn, 3, 0, 1, 2)
+ self.mirrorSelectionBtn = QtGui.QPushButton(self.canvasCtrlWidget)
+ self.mirrorSelectionBtn.setObjectName(_fromUtf8("mirrorSelectionBtn"))
+ self.gridLayout.addWidget(self.mirrorSelectionBtn, 4, 0, 1, 1)
+ self.reflectSelectionBtn = QtGui.QPushButton(self.canvasCtrlWidget)
+ self.reflectSelectionBtn.setObjectName(_fromUtf8("reflectSelectionBtn"))
+ self.gridLayout.addWidget(self.reflectSelectionBtn, 4, 1, 1, 1)
+ self.canvasItemCtrl = QtGui.QWidget(self.vsplitter)
+ self.canvasItemCtrl.setObjectName(_fromUtf8("canvasItemCtrl"))
+ self.ctrlLayout = QtGui.QGridLayout(self.canvasItemCtrl)
+ self.ctrlLayout.setMargin(0)
self.ctrlLayout.setSpacing(0)
self.ctrlLayout.setObjectName(_fromUtf8("ctrlLayout"))
- self.gridLayout_2.addLayout(self.ctrlLayout, 10, 0, 1, 2)
- self.resetTransformsBtn = QtGui.QPushButton(self.layoutWidget)
- self.resetTransformsBtn.setObjectName(_fromUtf8("resetTransformsBtn"))
- self.gridLayout_2.addWidget(self.resetTransformsBtn, 7, 0, 1, 1)
- self.mirrorSelectionBtn = QtGui.QPushButton(self.layoutWidget)
- self.mirrorSelectionBtn.setObjectName(_fromUtf8("mirrorSelectionBtn"))
- self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 3, 0, 1, 1)
- self.reflectSelectionBtn = QtGui.QPushButton(self.layoutWidget)
- self.reflectSelectionBtn.setObjectName(_fromUtf8("reflectSelectionBtn"))
- self.gridLayout_2.addWidget(self.reflectSelectionBtn, 3, 1, 1, 1)
- self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+ self.gridLayout_2.addWidget(self.splitter, 0, 0, 1, 1)
self.retranslateUi(Form)
QtCore.QMetaObject.connectSlotsByName(Form)
diff --git a/pyqtgraph/canvas/CanvasTemplate_pyqt5.py b/pyqtgraph/canvas/CanvasTemplate_pyqt5.py
index 20f5e339..03310d39 100644
--- a/pyqtgraph/canvas/CanvasTemplate_pyqt5.py
+++ b/pyqtgraph/canvas/CanvasTemplate_pyqt5.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file 'pyqtgraph/canvas/CanvasTemplate.ui'
+# Form implementation generated from reading ui file 'CanvasTemplate.ui'
#
-# Created by: PyQt5 UI code generator 5.5.1
+# Created by: PyQt5 UI code generator 5.7.1
#
# WARNING! All changes made in this file will be lost!
@@ -11,39 +11,43 @@ from PyQt5 import QtCore, QtGui, QtWidgets
class Ui_Form(object):
def setupUi(self, Form):
Form.setObjectName("Form")
- Form.resize(490, 414)
- self.gridLayout = QtWidgets.QGridLayout(Form)
- self.gridLayout.setContentsMargins(0, 0, 0, 0)
- self.gridLayout.setSpacing(0)
- self.gridLayout.setObjectName("gridLayout")
+ Form.resize(821, 578)
+ self.gridLayout_2 = QtWidgets.QGridLayout(Form)
+ self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
+ self.gridLayout_2.setSpacing(0)
+ self.gridLayout_2.setObjectName("gridLayout_2")
self.splitter = QtWidgets.QSplitter(Form)
self.splitter.setOrientation(QtCore.Qt.Horizontal)
self.splitter.setObjectName("splitter")
self.view = GraphicsView(self.splitter)
self.view.setObjectName("view")
- self.layoutWidget = QtWidgets.QWidget(self.splitter)
- self.layoutWidget.setObjectName("layoutWidget")
- self.gridLayout_2 = QtWidgets.QGridLayout(self.layoutWidget)
- self.gridLayout_2.setObjectName("gridLayout_2")
- self.autoRangeBtn = QtWidgets.QPushButton(self.layoutWidget)
+ self.vsplitter = QtWidgets.QSplitter(self.splitter)
+ self.vsplitter.setOrientation(QtCore.Qt.Vertical)
+ self.vsplitter.setObjectName("vsplitter")
+ self.canvasCtrlWidget = QtWidgets.QWidget(self.vsplitter)
+ self.canvasCtrlWidget.setObjectName("canvasCtrlWidget")
+ self.gridLayout = QtWidgets.QGridLayout(self.canvasCtrlWidget)
+ self.gridLayout.setContentsMargins(0, 0, 0, 0)
+ self.gridLayout.setObjectName("gridLayout")
+ self.autoRangeBtn = QtWidgets.QPushButton(self.canvasCtrlWidget)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(1)
sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
self.autoRangeBtn.setSizePolicy(sizePolicy)
self.autoRangeBtn.setObjectName("autoRangeBtn")
- self.gridLayout_2.addWidget(self.autoRangeBtn, 2, 0, 1, 2)
+ self.gridLayout.addWidget(self.autoRangeBtn, 0, 0, 1, 2)
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setSpacing(0)
self.horizontalLayout.setObjectName("horizontalLayout")
- self.redirectCheck = QtWidgets.QCheckBox(self.layoutWidget)
+ self.redirectCheck = QtWidgets.QCheckBox(self.canvasCtrlWidget)
self.redirectCheck.setObjectName("redirectCheck")
self.horizontalLayout.addWidget(self.redirectCheck)
- self.redirectCombo = CanvasCombo(self.layoutWidget)
+ self.redirectCombo = CanvasCombo(self.canvasCtrlWidget)
self.redirectCombo.setObjectName("redirectCombo")
self.horizontalLayout.addWidget(self.redirectCombo)
- self.gridLayout_2.addLayout(self.horizontalLayout, 5, 0, 1, 2)
- self.itemList = TreeWidget(self.layoutWidget)
+ self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 2)
+ self.itemList = TreeWidget(self.canvasCtrlWidget)
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(100)
@@ -52,21 +56,23 @@ class Ui_Form(object):
self.itemList.setHeaderHidden(True)
self.itemList.setObjectName("itemList")
self.itemList.headerItem().setText(0, "1")
- self.gridLayout_2.addWidget(self.itemList, 6, 0, 1, 2)
- self.ctrlLayout = QtWidgets.QGridLayout()
+ self.gridLayout.addWidget(self.itemList, 2, 0, 1, 2)
+ self.resetTransformsBtn = QtWidgets.QPushButton(self.canvasCtrlWidget)
+ self.resetTransformsBtn.setObjectName("resetTransformsBtn")
+ self.gridLayout.addWidget(self.resetTransformsBtn, 3, 0, 1, 2)
+ self.mirrorSelectionBtn = QtWidgets.QPushButton(self.canvasCtrlWidget)
+ self.mirrorSelectionBtn.setObjectName("mirrorSelectionBtn")
+ self.gridLayout.addWidget(self.mirrorSelectionBtn, 4, 0, 1, 1)
+ self.reflectSelectionBtn = QtWidgets.QPushButton(self.canvasCtrlWidget)
+ self.reflectSelectionBtn.setObjectName("reflectSelectionBtn")
+ self.gridLayout.addWidget(self.reflectSelectionBtn, 4, 1, 1, 1)
+ self.canvasItemCtrl = QtWidgets.QWidget(self.vsplitter)
+ self.canvasItemCtrl.setObjectName("canvasItemCtrl")
+ self.ctrlLayout = QtWidgets.QGridLayout(self.canvasItemCtrl)
+ self.ctrlLayout.setContentsMargins(0, 0, 0, 0)
self.ctrlLayout.setSpacing(0)
self.ctrlLayout.setObjectName("ctrlLayout")
- 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, 7, 0, 1, 1)
- self.mirrorSelectionBtn = QtWidgets.QPushButton(self.layoutWidget)
- self.mirrorSelectionBtn.setObjectName("mirrorSelectionBtn")
- 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, 3, 1, 1, 1)
- self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+ self.gridLayout_2.addWidget(self.splitter, 0, 0, 1, 1)
self.retranslateUi(Form)
QtCore.QMetaObject.connectSlotsByName(Form)
diff --git a/pyqtgraph/canvas/CanvasTemplate_pyside.py b/pyqtgraph/canvas/CanvasTemplate_pyside.py
index b0e05a07..570d5bd1 100644
--- a/pyqtgraph/canvas/CanvasTemplate_pyside.py
+++ b/pyqtgraph/canvas/CanvasTemplate_pyside.py
@@ -1,8 +1,8 @@
# -*- coding: utf-8 -*-
-# Form implementation generated from reading ui file 'pyqtgraph/canvas/CanvasTemplate.ui'
+# Form implementation generated from reading ui file 'CanvasTemplate.ui'
#
-# Created: Wed Nov 9 18:02:00 2016
+# Created: Fri Mar 24 16:09:39 2017
# by: pyside-uic 0.2.15 running on PySide 1.2.2
#
# WARNING! All changes made in this file will be lost!
@@ -12,40 +12,43 @@ from PySide import QtCore, QtGui
class Ui_Form(object):
def setupUi(self, Form):
Form.setObjectName("Form")
- Form.resize(490, 414)
- self.gridLayout = QtGui.QGridLayout(Form)
- self.gridLayout.setContentsMargins(0, 0, 0, 0)
- self.gridLayout.setSpacing(0)
- self.gridLayout.setObjectName("gridLayout")
+ Form.resize(821, 578)
+ self.gridLayout_2 = QtGui.QGridLayout(Form)
+ self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
+ self.gridLayout_2.setSpacing(0)
+ self.gridLayout_2.setObjectName("gridLayout_2")
self.splitter = QtGui.QSplitter(Form)
self.splitter.setOrientation(QtCore.Qt.Horizontal)
self.splitter.setObjectName("splitter")
self.view = GraphicsView(self.splitter)
self.view.setObjectName("view")
- self.layoutWidget = QtGui.QWidget(self.splitter)
- self.layoutWidget.setObjectName("layoutWidget")
- self.gridLayout_2 = QtGui.QGridLayout(self.layoutWidget)
- self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
- self.gridLayout_2.setObjectName("gridLayout_2")
- self.autoRangeBtn = QtGui.QPushButton(self.layoutWidget)
+ self.vsplitter = QtGui.QSplitter(self.splitter)
+ self.vsplitter.setOrientation(QtCore.Qt.Vertical)
+ self.vsplitter.setObjectName("vsplitter")
+ self.canvasCtrlWidget = QtGui.QWidget(self.vsplitter)
+ self.canvasCtrlWidget.setObjectName("canvasCtrlWidget")
+ self.gridLayout = QtGui.QGridLayout(self.canvasCtrlWidget)
+ self.gridLayout.setContentsMargins(0, 0, 0, 0)
+ self.gridLayout.setObjectName("gridLayout")
+ self.autoRangeBtn = QtGui.QPushButton(self.canvasCtrlWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Fixed)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(1)
sizePolicy.setHeightForWidth(self.autoRangeBtn.sizePolicy().hasHeightForWidth())
self.autoRangeBtn.setSizePolicy(sizePolicy)
self.autoRangeBtn.setObjectName("autoRangeBtn")
- self.gridLayout_2.addWidget(self.autoRangeBtn, 2, 0, 1, 2)
+ self.gridLayout.addWidget(self.autoRangeBtn, 0, 0, 1, 2)
self.horizontalLayout = QtGui.QHBoxLayout()
self.horizontalLayout.setSpacing(0)
self.horizontalLayout.setObjectName("horizontalLayout")
- self.redirectCheck = QtGui.QCheckBox(self.layoutWidget)
+ self.redirectCheck = QtGui.QCheckBox(self.canvasCtrlWidget)
self.redirectCheck.setObjectName("redirectCheck")
self.horizontalLayout.addWidget(self.redirectCheck)
- self.redirectCombo = CanvasCombo(self.layoutWidget)
+ self.redirectCombo = CanvasCombo(self.canvasCtrlWidget)
self.redirectCombo.setObjectName("redirectCombo")
self.horizontalLayout.addWidget(self.redirectCombo)
- self.gridLayout_2.addLayout(self.horizontalLayout, 5, 0, 1, 2)
- self.itemList = TreeWidget(self.layoutWidget)
+ self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 2)
+ self.itemList = TreeWidget(self.canvasCtrlWidget)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
sizePolicy.setHorizontalStretch(0)
sizePolicy.setVerticalStretch(100)
@@ -54,21 +57,24 @@ class Ui_Form(object):
self.itemList.setHeaderHidden(True)
self.itemList.setObjectName("itemList")
self.itemList.headerItem().setText(0, "1")
- 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, 10, 0, 1, 2)
- self.resetTransformsBtn = QtGui.QPushButton(self.layoutWidget)
+ self.gridLayout.addWidget(self.itemList, 2, 0, 1, 2)
+ self.resetTransformsBtn = QtGui.QPushButton(self.canvasCtrlWidget)
self.resetTransformsBtn.setObjectName("resetTransformsBtn")
- self.gridLayout_2.addWidget(self.resetTransformsBtn, 7, 0, 1, 1)
- self.mirrorSelectionBtn = QtGui.QPushButton(self.layoutWidget)
+ self.gridLayout.addWidget(self.resetTransformsBtn, 3, 0, 1, 2)
+ self.mirrorSelectionBtn = QtGui.QPushButton(self.canvasCtrlWidget)
self.mirrorSelectionBtn.setObjectName("mirrorSelectionBtn")
- self.gridLayout_2.addWidget(self.mirrorSelectionBtn, 3, 0, 1, 1)
- self.reflectSelectionBtn = QtGui.QPushButton(self.layoutWidget)
+ self.gridLayout.addWidget(self.mirrorSelectionBtn, 4, 0, 1, 1)
+ self.reflectSelectionBtn = QtGui.QPushButton(self.canvasCtrlWidget)
self.reflectSelectionBtn.setObjectName("reflectSelectionBtn")
- self.gridLayout_2.addWidget(self.reflectSelectionBtn, 3, 1, 1, 1)
- self.gridLayout.addWidget(self.splitter, 0, 0, 1, 1)
+ self.gridLayout.addWidget(self.reflectSelectionBtn, 4, 1, 1, 1)
+ self.canvasItemCtrl = QtGui.QWidget(self.vsplitter)
+ self.canvasItemCtrl.setObjectName("canvasItemCtrl")
+ self.ctrlLayout = QtGui.QGridLayout(self.canvasItemCtrl)
+ self.ctrlLayout.setContentsMargins(0, 0, 0, 0)
+ self.ctrlLayout.setSpacing(0)
+ self.ctrlLayout.setContentsMargins(0, 0, 0, 0)
+ self.ctrlLayout.setObjectName("ctrlLayout")
+ self.gridLayout_2.addWidget(self.splitter, 0, 0, 1, 1)
self.retranslateUi(Form)
QtCore.QMetaObject.connectSlotsByName(Form)