Commit a289a31

committed

Pendeing: PySide2はpyqtgraphに対応していない

1 parent f5aebfa commit a289a31Copy full SHA for a289a31

File tree

3 files changed

+14

-70

lines changed

Python
- UI
  - Ui_Dialog.py
  - Ui_MainWindow.py
- main.py

3 files changed

+14

-70

lines changed

`‎Python/UI/Ui_Dialog.py‎`

Lines changed: 6 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,23 +1,17 @@`
`1`	`1`	`# -- coding: utf-8 --`
`2`	`2`
`3`	`3`	`################################################################################`
`4`		`-## Form generated from reading UI file 'connection.ui'`
	`4`	`+## Form generated from reading UI file 'Ui_Dialog.ui'`
`5`	`5`	`##`
`6`		`-## Created by: Qt User Interface Compiler version 6.4.1`
	`6`	`+## Created by: Qt User Interface Compiler version 5.15.2`
`7`	`7`	`##`
`8`	`8`	`## WARNING! All changes made in this file will be lost when recompiling UI file!`
`9`	`9`	`################################################################################`
`10`	`10`
`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`	`+`
`21`	`15`
`22`	`16`	`class Ui_Dialog(object):`
`23`	`17`	`def setupUi(self, Dialog):`

`‎Python/UI/Ui_MainWindow.py‎`

Lines changed: 5 additions & 55 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,65 +3,15 @@`
`3`	`3`	`################################################################################`
`4`	`4`	`## Form generated from reading UI file 'Ui_MainWindow.ui'`
`5`	`5`	`##`
`6`		`-## Created by: Qt User Interface Compiler version 6.4.1`
	`6`	`+## Created by: Qt User Interface Compiler version 5.15.2`
`7`	`7`	`##`
`8`	`8`	`## WARNING! All changes made in this file will be lost when recompiling UI file!`
`9`	`9`	`################################################################################`
`10`	`10`
`11`	`11`	`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 *`
`65`	`15`
`66`	`16`
`67`	`17`	`class Ui_MainWindow(object):`
`@@ -463,7 +413,7 @@ def setupUi(self, MainWindow):`
`463`	`413`	`self.InputPurpose.setSizePolicy(sizePolicy5)`
`464`	`414`	`self.InputPurpose.setMinimumSize(QSize(0, 25))`
`465`	`415`	`self.InputPurpose.setMaximumSize(QSize(16777215, 50))`
`466`		`- # self.InputPurpose.setTabStopWidth(80)`
	`416`	`+ self.InputPurpose.setTabStopWidth(80)`
`467`	`417`
`468`	`418`	`self.verticalLayout_2.addWidget(self.InputPurpose)`
`469`	`419`

`‎Python/main.py‎`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`	`import numpy as np`
`10`	`10`	`import pyqtgraph as pg`
`11`	`11`	`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`
`14`	`14`
`15`	`15`	`import tools`
`16`	`16`	`from UI.Ui_Dialog import Ui_Dialog`
`@@ -562,4 +562,4 @@ def stop(self):`
`562`	`562`	`app = QtWidgets.QApplication(sys.argv)`
`563`	`563`	`myWin = MainWindow()`
`564`	`564`	`myWin.show_windows()`
`565`		`- sys.exit(app.exec())`
	`565`	`+ sys.exit(app.exec_())`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit a289a31

File tree

3 files changed

3 files changed

`‎Python/UI/Ui_Dialog.py‎`

`‎Python/UI/Ui_MainWindow.py‎`

`‎Python/main.py‎`

0 commit comments