Skip to content

Commit 3832ca2

Browse files
patricevpatricev
committed
changes
1 parent de03ccb commit 3832ca2

File tree

730 files changed

+103385
-9398
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

730 files changed

+103385
-9398
lines changed

‎.vscode/settings.json

+2
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,6 @@
55
"git.ignoreLimitWarning": true,
66
"http.proxyStrictSSL": false,
77
"restructuredtext.confPath": "${workspaceFolder}\\doc\\source_fr",
8+
"esbonio.server.enabled": true,
9+
"esbonio.sphinx.confDir": "${workspaceFolder}\\doc\\source_fr",
810
}

‎api/libs/pyqtgraph/GraphicsScene/GraphicsScene.py

+157-176
Large diffs are not rendered by default.

‎api/libs/pyqtgraph/GraphicsScene/exportDialog.py

+33-27
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,36 @@
1-
from ..Qt import QtCore, QtGui, USE_PYSIDE, USE_PYQT5
1+
import importlib
2+
23
from .. import exporters as exporters
34
from .. import functions as fn
4-
from ..graphicsItems.ViewBox import ViewBox
55
from ..graphicsItems.PlotItem import PlotItem
6+
from ..graphicsItems.ViewBox import ViewBox
7+
from ..Qt import QT_LIB, QtCore, QtWidgets
8+
9+
ui_template = importlib.import_module(
10+
f'.exportDialogTemplate_{QT_LIB.lower()}', package=__package__)
11+
612

7-
if USE_PYSIDE:
8-
from . import exportDialogTemplate_pyside as exportDialogTemplate
9-
elif USE_PYQT5:
10-
from . import exportDialogTemplate_pyqt5 as exportDialogTemplate
11-
else:
12-
from . import exportDialogTemplate_pyqt as exportDialogTemplate
13+
class FormatExportListWidgetItem(QtWidgets.QListWidgetItem):
14+
def __init__(self, expClass, *args, **kwargs):
15+
QtWidgets.QListWidgetItem.__init__(self, *args, **kwargs)
16+
self.expClass = expClass
1317

1418

15-
class ExportDialog(QtGui.QWidget):
19+
class ExportDialog(QtWidgets.QWidget):
1620
def __init__(self, scene):
17-
QtGui.QWidget.__init__(self)
21+
QtWidgets.QWidget.__init__(self)
1822
self.setVisible(False)
1923
self.setWindowTitle("Export")
2024
self.shown = False
2125
self.currentExporter = None
2226
self.scene = scene
23-
24-
self.selectBox = QtGui.QGraphicsRectItem()
25-
self.selectBox.setPen(fn.mkPen('y', width=3, style=QtCore.Qt.DashLine))
27+
28+
self.selectBox = QtWidgets.QGraphicsRectItem()
29+
self.selectBox.setPen(fn.mkPen('y', width=3, style=QtCore.Qt.PenStyle.DashLine))
2630
self.selectBox.hide()
2731
self.scene.addItem(self.selectBox)
2832

29-
self.ui = exportDialogTemplate.Ui_Form()
33+
self.ui = ui_template.Ui_Form()
3034
self.ui.setupUi(self)
3135

3236
self.ui.closeBtn.clicked.connect(self.close)
@@ -53,11 +57,13 @@ def show(self, item=None):
5357
if not self.shown:
5458
self.shown = True
5559
vcenter = self.scene.getViewWidget().geometry().center()
56-
self.setGeometry(vcenter.x()-self.width()/2, vcenter.y()-self.height()/2, self.width(), self.height())
60+
self.setGeometry(int(vcenter.x() - self.width() / 2),
61+
int(vcenter.y() - self.height() / 2),
62+
self.width(), self.height())
5763

5864
def updateItemList(self, select=None):
5965
self.ui.itemTree.clear()
60-
si = QtGui.QTreeWidgetItem(["Entire Scene"])
66+
si = QtWidgets.QTreeWidgetItem(["Entire Scene"])
6167
si.gitem = self.scene
6268
self.ui.itemTree.addTopLevelItem(si)
6369
self.ui.itemTree.setCurrentItem(si)
@@ -69,9 +75,9 @@ def updateItemList(self, select=None):
6975
def updateItemTree(self, item, treeItem, select=None):
7076
si = None
7177
if isinstance(item, ViewBox):
72-
si = QtGui.QTreeWidgetItem(['ViewBox'])
78+
si = QtWidgets.QTreeWidgetItem(['ViewBox'])
7379
elif isinstance(item, PlotItem):
74-
si = QtGui.QTreeWidgetItem(['Plot'])
80+
si = QtWidgets.QTreeWidgetItem(['Plot'])
7581

7682
if si is not None:
7783
si.gitem = item
@@ -97,16 +103,14 @@ def exportItemChanged(self, item, prev):
97103

98104
def updateFormatList(self):
99105
current = self.ui.formatList.currentItem()
100-
if current is not None:
101-
current = str(current.text())
106+
102107
self.ui.formatList.clear()
103-
self.exporterClasses = {}
104108
gotCurrent = False
105109
for exp in exporters.listExporters():
106-
self.ui.formatList.addItem(exp.Name)
107-
self.exporterClasses[exp.Name] = exp
108-
if exp.Name == current:
109-
self.ui.formatList.setCurrentRow(self.ui.formatList.count()-1)
110+
item = FormatExportListWidgetItem(exp, QtCore.QCoreApplication.translate('Exporter', exp.Name))
111+
self.ui.formatList.addItem(item)
112+
if item == current:
113+
self.ui.formatList.setCurrentRow(self.ui.formatList.count() - 1)
110114
gotCurrent = True
111115

112116
if not gotCurrent:
@@ -117,9 +121,11 @@ def exportFormatChanged(self, item, prev):
117121
self.currentExporter = None
118122
self.ui.paramTree.clear()
119123
return
120-
expClass = self.exporterClasses[str(item.text())]
124+
expClass = item.expClass
121125
exp = expClass(item=self.ui.itemTree.currentItem().gitem)
126+
122127
params = exp.parameters()
128+
123129
if params is None:
124130
self.ui.paramTree.clear()
125131
else:
@@ -141,4 +147,4 @@ def close(self):
141147

142148
def closeEvent(self, event):
143149
self.close()
144-
QtGui.QWidget.closeEvent(self, event)
150+
super().closeEvent(event)

‎api/libs/pyqtgraph/GraphicsScene/exportDialogTemplate.ui

+3
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@
6262
</item>
6363
<item row="5" column="0" colspan="3">
6464
<widget class="ParameterTree" name="paramTree">
65+
<property name="columnCount">
66+
<number>2</number>
67+
</property>
6568
<attribute name="headerVisible">
6669
<bool>false</bool>
6770
</attribute>

‎api/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt5.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
# -*- coding: utf-8 -*-
21

3-
# Form implementation generated from reading ui file './pyqtgraph/GraphicsScene/exportDialogTemplate.ui'
2+
# Form implementation generated from reading ui file '.\exportDialogTemplate.ui'
43
#
5-
# Created: Wed Mar 26 15:09:29 2014
6-
# by: PyQt5 UI code generator 5.0.1
4+
# Created by: PyQt5 UI code generator 5.15.4
75
#
8-
# WARNING! All changes made in this file will be lost!
6+
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
7+
# run again. Do not edit this file unless you know what you are doing.
8+
99

1010
from PyQt5 import QtCore, QtGui, QtWidgets
1111

12+
1213
class Ui_Form(object):
1314
def setupUi(self, Form):
1415
Form.setObjectName("Form")
@@ -37,6 +38,7 @@ def setupUi(self, Form):
3738
self.closeBtn.setObjectName("closeBtn")
3839
self.gridLayout.addWidget(self.closeBtn, 6, 2, 1, 1)
3940
self.paramTree = ParameterTree(Form)
41+
self.paramTree.setColumnCount(2)
4042
self.paramTree.setObjectName("paramTree")
4143
self.paramTree.headerItem().setText(0, "1")
4244
self.paramTree.header().setVisible(False)
@@ -60,5 +62,4 @@ def retranslateUi(self, Form):
6062
self.closeBtn.setText(_translate("Form", "Close"))
6163
self.label_3.setText(_translate("Form", "Export options"))
6264
self.copyBtn.setText(_translate("Form", "Copy"))
63-
6465
from ..parametertree import ParameterTree

‎api/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyqt6.py

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# Form implementation generated from reading ui file '../pyqtgraph/GraphicsScene/exportDialogTemplate.ui'
2+
#
3+
# Created by: PyQt6 UI code generator 6.1.0
4+
#
5+
# WARNING: Any manual changes made to this file will be lost when pyuic6 is
6+
# run again. Do not edit this file unless you know what you are doing.
7+
8+
9+
from PyQt6 import QtCore, QtGui, QtWidgets
10+
11+
12+
class Ui_Form(object):
13+
def setupUi(self, Form):
14+
Form.setObjectName("Form")
15+
Form.resize(241, 367)
16+
self.gridLayout = QtWidgets.QGridLayout(Form)
17+
self.gridLayout.setSpacing(0)
18+
self.gridLayout.setObjectName("gridLayout")
19+
self.label = QtWidgets.QLabel(Form)
20+
self.label.setObjectName("label")
21+
self.gridLayout.addWidget(self.label, 0, 0, 1, 3)
22+
self.itemTree = QtWidgets.QTreeWidget(Form)
23+
self.itemTree.setObjectName("itemTree")
24+
self.itemTree.headerItem().setText(0, "1")
25+
self.itemTree.header().setVisible(False)
26+
self.gridLayout.addWidget(self.itemTree, 1, 0, 1, 3)
27+
self.label_2 = QtWidgets.QLabel(Form)
28+
self.label_2.setObjectName("label_2")
29+
self.gridLayout.addWidget(self.label_2, 2, 0, 1, 3)
30+
self.formatList = QtWidgets.QListWidget(Form)
31+
self.formatList.setObjectName("formatList")
32+
self.gridLayout.addWidget(self.formatList, 3, 0, 1, 3)
33+
self.exportBtn = QtWidgets.QPushButton(Form)
34+
self.exportBtn.setObjectName("exportBtn")
35+
self.gridLayout.addWidget(self.exportBtn, 6, 1, 1, 1)
36+
self.closeBtn = QtWidgets.QPushButton(Form)
37+
self.closeBtn.setObjectName("closeBtn")
38+
self.gridLayout.addWidget(self.closeBtn, 6, 2, 1, 1)
39+
self.paramTree = ParameterTree(Form)
40+
self.paramTree.setColumnCount(2)
41+
self.paramTree.setObjectName("paramTree")
42+
self.paramTree.headerItem().setText(0, "1")
43+
self.paramTree.header().setVisible(False)
44+
self.gridLayout.addWidget(self.paramTree, 5, 0, 1, 3)
45+
self.label_3 = QtWidgets.QLabel(Form)
46+
self.label_3.setObjectName("label_3")
47+
self.gridLayout.addWidget(self.label_3, 4, 0, 1, 3)
48+
self.copyBtn = QtWidgets.QPushButton(Form)
49+
self.copyBtn.setObjectName("copyBtn")
50+
self.gridLayout.addWidget(self.copyBtn, 6, 0, 1, 1)
51+
52+
self.retranslateUi(Form)
53+
QtCore.QMetaObject.connectSlotsByName(Form)
54+
55+
def retranslateUi(self, Form):
56+
_translate = QtCore.QCoreApplication.translate
57+
Form.setWindowTitle(_translate("Form", "Export"))
58+
self.label.setText(_translate("Form", "Item to export:"))
59+
self.label_2.setText(_translate("Form", "Export format"))
60+
self.exportBtn.setText(_translate("Form", "Export"))
61+
self.closeBtn.setText(_translate("Form", "Close"))
62+
self.label_3.setText(_translate("Form", "Export options"))
63+
self.copyBtn.setText(_translate("Form", "Copy"))
64+
from ..parametertree import ParameterTree

‎api/libs/pyqtgraph/GraphicsScene/exportDialogTemplate_pyside2.py

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
2+
################################################################################
3+
## Form generated from reading UI file 'exportDialogTemplate.ui'
4+
##
5+
## Created by: Qt User Interface Compiler version 5.15.2
6+
##
7+
## WARNING! All changes made in this file will be lost when recompiling UI file!
8+
################################################################################
9+
10+
from PySide2.QtCore import *
11+
from PySide2.QtGui import *
12+
from PySide2.QtWidgets import *
13+
14+
from ..parametertree import ParameterTree
15+
16+
17+
class Ui_Form(object):
18+
def setupUi(self, Form):
19+
if not Form.objectName():
20+
Form.setObjectName(u"Form")
21+
Form.resize(241, 367)
22+
self.gridLayout = QGridLayout(Form)
23+
self.gridLayout.setSpacing(0)
24+
self.gridLayout.setObjectName(u"gridLayout")
25+
self.label = QLabel(Form)
26+
self.label.setObjectName(u"label")
27+
28+
self.gridLayout.addWidget(self.label, 0, 0, 1, 3)
29+
30+
self.itemTree = QTreeWidget(Form)
31+
__qtreewidgetitem = QTreeWidgetItem()
32+
__qtreewidgetitem.setText(0, u"1");
33+
self.itemTree.setHeaderItem(__qtreewidgetitem)
34+
self.itemTree.setObjectName(u"itemTree")
35+
self.itemTree.header().setVisible(False)
36+
37+
self.gridLayout.addWidget(self.itemTree, 1, 0, 1, 3)
38+
39+
self.label_2 = QLabel(Form)
40+
self.label_2.setObjectName(u"label_2")
41+
42+
self.gridLayout.addWidget(self.label_2, 2, 0, 1, 3)
43+
44+
self.formatList = QListWidget(Form)
45+
self.formatList.setObjectName(u"formatList")
46+
47+
self.gridLayout.addWidget(self.formatList, 3, 0, 1, 3)
48+
49+
self.exportBtn = QPushButton(Form)
50+
self.exportBtn.setObjectName(u"exportBtn")
51+
52+
self.gridLayout.addWidget(self.exportBtn, 6, 1, 1, 1)
53+
54+
self.closeBtn = QPushButton(Form)
55+
self.closeBtn.setObjectName(u"closeBtn")
56+
57+
self.gridLayout.addWidget(self.closeBtn, 6, 2, 1, 1)
58+
59+
self.paramTree = ParameterTree(Form)
60+
__qtreewidgetitem1 = QTreeWidgetItem()
61+
__qtreewidgetitem1.setText(0, u"1");
62+
self.paramTree.setHeaderItem(__qtreewidgetitem1)
63+
self.paramTree.setObjectName(u"paramTree")
64+
self.paramTree.setColumnCount(2)
65+
self.paramTree.header().setVisible(False)
66+
67+
self.gridLayout.addWidget(self.paramTree, 5, 0, 1, 3)
68+
69+
self.label_3 = QLabel(Form)
70+
self.label_3.setObjectName(u"label_3")
71+
72+
self.gridLayout.addWidget(self.label_3, 4, 0, 1, 3)
73+
74+
self.copyBtn = QPushButton(Form)
75+
self.copyBtn.setObjectName(u"copyBtn")
76+
77+
self.gridLayout.addWidget(self.copyBtn, 6, 0, 1, 1)
78+
79+
80+
self.retranslateUi(Form)
81+
82+
QMetaObject.connectSlotsByName(Form)
83+
# setupUi
84+
85+
def retranslateUi(self, Form):
86+
Form.setWindowTitle(QCoreApplication.translate("Form", u"Export", None))
87+
self.label.setText(QCoreApplication.translate("Form", u"Item to export:", None))
88+
self.label_2.setText(QCoreApplication.translate("Form", u"Export format", None))
89+
self.exportBtn.setText(QCoreApplication.translate("Form", u"Export", None))
90+
self.closeBtn.setText(QCoreApplication.translate("Form", u"Close", None))
91+
self.label_3.setText(QCoreApplication.translate("Form", u"Export options", None))
92+
self.copyBtn.setText(QCoreApplication.translate("Form", u"Copy", None))
93+
# retranslateUi

0 commit comments

Comments
 (0)