Skip to content

Commit a289a31

Browse files
committed
Pendeing: PySide2はpyqtgraphに対応していない
1 parent f5aebfa commit a289a31

File tree

3 files changed

+14
-70
lines changed

3 files changed

+14
-70
lines changed

Python/UI/Ui_Dialog.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,17 @@
11
# -*- coding: utf-8 -*-
22

33
################################################################################
4-
## Form generated from reading UI file 'connection.ui'
4+
## Form generated from reading UI file 'Ui_Dialog.ui'
55
##
6-
## Created by: Qt User Interface Compiler version 6.4.1
6+
## Created by: Qt User Interface Compiler version 5.15.2
77
##
88
## WARNING! All changes made in this file will be lost when recompiling UI file!
99
################################################################################
1010

11-
from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale,
12-
QMetaObject, QObject, QPoint, QRect,
13-
QSize, QTime, QUrl, Qt)
14-
from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor,
15-
QFont, QFontDatabase, QGradient, QIcon,
16-
QImage, QKeySequence, QLinearGradient, QPainter,
17-
QPalette, QPixmap, QRadialGradient, QTransform)
18-
from PySide6.QtWidgets import (QApplication, QComboBox, QDialog, QGridLayout,
19-
QHBoxLayout, QLabel, QPushButton, QSizePolicy,
20-
QSpacerItem, QWidget)
11+
from PySide2.QtCore import *
12+
from PySide2.QtGui import *
13+
from PySide2.QtWidgets import *
14+
2115

2216
class Ui_Dialog(object):
2317
def setupUi(self, Dialog):

Python/UI/Ui_MainWindow.py

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -3,65 +3,15 @@
33
################################################################################
44
## Form generated from reading UI file 'Ui_MainWindow.ui'
55
##
6-
## Created by: Qt User Interface Compiler version 6.4.1
6+
## Created by: Qt User Interface Compiler version 5.15.2
77
##
88
## WARNING! All changes made in this file will be lost when recompiling UI file!
99
################################################################################
1010

1111
from pyqtgraph import GraphicsLayoutWidget
12-
from PySide6.QtCore import (
13-
QCoreApplication,
14-
QDate,
15-
QDateTime,
16-
QLocale,
17-
QMetaObject,
18-
QObject,
19-
QPoint,
20-
QRect,
21-
QSize,
22-
Qt,
23-
QTime,
24-
QUrl,
25-
)
26-
from PySide6.QtGui import (
27-
QBrush,
28-
QColor,
29-
QConicalGradient,
30-
QCursor,
31-
QFont,
32-
QFontDatabase,
33-
QGradient,
34-
QIcon,
35-
QImage,
36-
QKeySequence,
37-
QLinearGradient,
38-
QPainter,
39-
QPalette,
40-
QPixmap,
41-
QRadialGradient,
42-
QTransform,
43-
)
44-
from PySide6.QtWidgets import (
45-
QApplication,
46-
QDoubleSpinBox,
47-
QFormLayout,
48-
QGridLayout,
49-
QGroupBox,
50-
QHBoxLayout,
51-
QLabel,
52-
QLayout,
53-
QLineEdit,
54-
QMainWindow,
55-
QMenuBar,
56-
QPlainTextEdit,
57-
QPushButton,
58-
QSizePolicy,
59-
QSpacerItem,
60-
QSpinBox,
61-
QStatusBar,
62-
QVBoxLayout,
63-
QWidget,
64-
)
12+
from PySide2.QtCore import *
13+
from PySide2.QtGui import *
14+
from PySide2.QtWidgets import *
6515

6616

6717
class Ui_MainWindow(object):
@@ -463,7 +413,7 @@ def setupUi(self, MainWindow):
463413
self.InputPurpose.setSizePolicy(sizePolicy5)
464414
self.InputPurpose.setMinimumSize(QSize(0, 25))
465415
self.InputPurpose.setMaximumSize(QSize(16777215, 50))
466-
# self.InputPurpose.setTabStopWidth(80)
416+
self.InputPurpose.setTabStopWidth(80)
467417

468418
self.verticalLayout_2.addWidget(self.InputPurpose)
469419

Python/main.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import numpy as np
1010
import pyqtgraph as pg
1111
import serial
12-
from PySide6 import QtCore, QtWidgets
13-
from PySide6.QtCore import Signal
12+
from PySide2 import QtCore, QtWidgets
13+
from PySide2.QtCore import Signal
1414

1515
import tools
1616
from UI.Ui_Dialog import Ui_Dialog
@@ -562,4 +562,4 @@ def stop(self):
562562
app = QtWidgets.QApplication(sys.argv)
563563
myWin = MainWindow()
564564
myWin.show_windows()
565-
sys.exit(app.exec())
565+
sys.exit(app.exec_())

0 commit comments

Comments
 (0)