From 8c8304082d2a1db66fed6ffdb5a97e67004af16d Mon Sep 17 00:00:00 2001 From: kiyu-git <47422498+kiyu-git@users.noreply.github.com> Date: Sun, 8 Jan 2023 15:39:52 +0900 Subject: [PATCH 1/5] =?UTF-8?q?Update:=20PyQt=E3=82=92PySide=E3=81=AB?= =?UTF-8?q?=E7=BD=AE=E3=81=8D=E6=8F=9B=E3=81=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Python/UI/Ui_Dialog.py | 70 +++ Python/UI/{connection.ui => Ui_Dialog.ui} | 0 Python/UI/Ui_MainWindow.py | 595 ++++++++++++++++++ .../UI/{main_window.ui => Ui_MainWindow.ui} | 2 +- Python/UI/__init__.py | 0 Python/main.py | 213 ++++--- 6 files changed, 777 insertions(+), 103 deletions(-) create mode 100644 Python/UI/Ui_Dialog.py rename Python/UI/{connection.ui => Ui_Dialog.ui} (100%) create mode 100644 Python/UI/Ui_MainWindow.py rename Python/UI/{main_window.ui => Ui_MainWindow.ui} (99%) create mode 100644 Python/UI/__init__.py diff --git a/Python/UI/Ui_Dialog.py b/Python/UI/Ui_Dialog.py new file mode 100644 index 0000000..191a8cc --- /dev/null +++ b/Python/UI/Ui_Dialog.py @@ -0,0 +1,70 @@ +# -*- coding: utf-8 -*- + +################################################################################ +## Form generated from reading UI file 'connection.ui' +## +## Created by: Qt User Interface Compiler version 6.4.1 +## +## WARNING! All changes made in this file will be lost when recompiling UI file! +################################################################################ + +from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, + QMetaObject, QObject, QPoint, QRect, + QSize, QTime, QUrl, Qt) +from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, + QFont, QFontDatabase, QGradient, QIcon, + QImage, QKeySequence, QLinearGradient, QPainter, + QPalette, QPixmap, QRadialGradient, QTransform) +from PySide6.QtWidgets import (QApplication, QComboBox, QDialog, QGridLayout, + QHBoxLayout, QLabel, QPushButton, QSizePolicy, + QSpacerItem, QWidget) + +class Ui_Dialog(object): + def setupUi(self, Dialog): + if not Dialog.objectName(): + Dialog.setObjectName(u"Dialog") + Dialog.resize(361, 136) + self.gridLayout = QGridLayout(Dialog) + self.gridLayout.setObjectName(u"gridLayout") + self.label = QLabel(Dialog) + self.label.setObjectName(u"label") + + self.gridLayout.addWidget(self.label, 0, 0, 1, 1) + + self.horizontalLayout = QHBoxLayout() + self.horizontalLayout.setObjectName(u"horizontalLayout") + self.InputSerialPorts = QComboBox(Dialog) + self.InputSerialPorts.setObjectName(u"InputSerialPorts") + + self.horizontalLayout.addWidget(self.InputSerialPorts) + + + self.gridLayout.addLayout(self.horizontalLayout, 1, 0, 1, 1) + + self.horizontalLayout_2 = QHBoxLayout() + self.horizontalLayout_2.setObjectName(u"horizontalLayout_2") + self.horizontalSpacer = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) + + self.horizontalLayout_2.addItem(self.horizontalSpacer) + + self.InputSelect = QPushButton(Dialog) + self.InputSelect.setObjectName(u"InputSelect") + self.InputSelect.setCheckable(False) + + self.horizontalLayout_2.addWidget(self.InputSelect) + + + self.gridLayout.addLayout(self.horizontalLayout_2, 2, 0, 1, 1) + + + self.retranslateUi(Dialog) + + QMetaObject.connectSlotsByName(Dialog) + # setupUi + + def retranslateUi(self, Dialog): + Dialog.setWindowTitle(QCoreApplication.translate("Dialog", u"Dialog", None)) + self.label.setText(QCoreApplication.translate("Dialog", u"Please select serial port", None)) + self.InputSelect.setText(QCoreApplication.translate("Dialog", u"select", None)) + # retranslateUi + diff --git a/Python/UI/connection.ui b/Python/UI/Ui_Dialog.ui similarity index 100% rename from Python/UI/connection.ui rename to Python/UI/Ui_Dialog.ui diff --git a/Python/UI/Ui_MainWindow.py b/Python/UI/Ui_MainWindow.py new file mode 100644 index 0000000..ccb2cbd --- /dev/null +++ b/Python/UI/Ui_MainWindow.py @@ -0,0 +1,595 @@ +# -*- coding: utf-8 -*- + +################################################################################ +## Form generated from reading UI file 'main_window.ui' +## +## Created by: Qt User Interface Compiler version 6.4.1 +## +## WARNING! All changes made in this file will be lost when recompiling UI file! +################################################################################ + +from pyqtgraph import GraphicsLayoutWidget +from PySide6.QtCore import ( + QCoreApplication, + QDate, + QDateTime, + QLocale, + QMetaObject, + QObject, + QPoint, + QRect, + QSize, + Qt, + QTime, + QUrl, +) +from PySide6.QtGui import ( + QBrush, + QColor, + QConicalGradient, + QCursor, + QFont, + QFontDatabase, + QGradient, + QIcon, + QImage, + QKeySequence, + QLinearGradient, + QPainter, + QPalette, + QPixmap, + QRadialGradient, + QTransform, +) +from PySide6.QtWidgets import ( + QApplication, + QDoubleSpinBox, + QFormLayout, + QGridLayout, + QGroupBox, + QHBoxLayout, + QLabel, + QLineEdit, + QMainWindow, + QMenuBar, + QPlainTextEdit, + QPushButton, + QSizePolicy, + QSpacerItem, + QSpinBox, + QStatusBar, + QVBoxLayout, + QWidget, +) + + +class Ui_MainWindow(object): + def setupUi(self, MainWindow): + if not MainWindow.objectName(): + MainWindow.setObjectName("MainWindow") + MainWindow.resize(1086, 916) + self.centralwidget = QWidget(MainWindow) + self.centralwidget.setObjectName("centralwidget") + self.gridLayout = QGridLayout(self.centralwidget) + self.gridLayout.setObjectName("gridLayout") + self.horizontalSpacer_2 = QSpacerItem( + 7, 20, QSizePolicy.Expanding, QSizePolicy.Minimum + ) + + self.gridLayout.addItem(self.horizontalSpacer_2, 0, 0, 1, 1) + + self.verticalLayout = QVBoxLayout() + self.verticalLayout.setObjectName("verticalLayout") + self.MesaurementSettingsBox = QGroupBox(self.centralwidget) + self.MesaurementSettingsBox.setObjectName("MesaurementSettingsBox") + sizePolicy = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth( + self.MesaurementSettingsBox.sizePolicy().hasHeightForWidth() + ) + self.MesaurementSettingsBox.setSizePolicy(sizePolicy) + self.MesaurementSettingsBox.setMinimumSize(QSize(242, 150)) + self.MesaurementSettingsBox.setFlat(False) + self.MesaurementSettingsBox.setCheckable(False) + self.gridLayout_3 = QGridLayout(self.MesaurementSettingsBox) + self.gridLayout_3.setObjectName("gridLayout_3") + self.gridLayout_3.setHorizontalSpacing(-1) + self.gridLayout_3.setVerticalSpacing(0) + self.gridLayout_3.setContentsMargins(0, 0, 0, 0) + self.horizontalLayout = QHBoxLayout() + self.horizontalLayout.setObjectName("horizontalLayout") + self.horizontalLayout.setContentsMargins(7, -1, 7, -1) + self.label = QLabel(self.MesaurementSettingsBox) + self.label.setObjectName("label") + + self.horizontalLayout.addWidget(self.label) + + self.horizontalSpacer_3 = QSpacerItem( + 5, 20, QSizePolicy.MinimumExpanding, QSizePolicy.Minimum + ) + + self.horizontalLayout.addItem(self.horizontalSpacer_3) + + self.InputSerialPort = QLabel(self.MesaurementSettingsBox) + self.InputSerialPort.setObjectName("InputSerialPort") + + self.horizontalLayout.addWidget(self.InputSerialPort) + + self.gridLayout_3.addLayout(self.horizontalLayout, 0, 0, 1, 1) + + self.formLayout = QFormLayout() + self.formLayout.setObjectName("formLayout") + self.formLayout.setLabelAlignment( + Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter + ) + self.formLayout.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) + self.formLayout.setHorizontalSpacing(-1) + self.formLayout.setVerticalSpacing(0) + self.formLayout.setContentsMargins(7, -1, -1, -1) + self.InputChgSerialPort = QPushButton(self.MesaurementSettingsBox) + self.InputChgSerialPort.setObjectName("InputChgSerialPort") + + self.formLayout.setWidget(1, QFormLayout.FieldRole, self.InputChgSerialPort) + + self.label_2 = QLabel(self.MesaurementSettingsBox) + self.label_2.setObjectName("label_2") + + self.formLayout.setWidget(2, QFormLayout.LabelRole, self.label_2) + + self.InputNumChannels = QSpinBox(self.MesaurementSettingsBox) + self.InputNumChannels.setObjectName("InputNumChannels") + + self.formLayout.setWidget(2, QFormLayout.FieldRole, self.InputNumChannels) + + self.label_3 = QLabel(self.MesaurementSettingsBox) + self.label_3.setObjectName("label_3") + + self.formLayout.setWidget(3, QFormLayout.LabelRole, self.label_3) + + self.InputSamplingRate = QSpinBox(self.MesaurementSettingsBox) + self.InputSamplingRate.setObjectName("InputSamplingRate") + + self.formLayout.setWidget(3, QFormLayout.FieldRole, self.InputSamplingRate) + + self.label_5 = QLabel(self.MesaurementSettingsBox) + self.label_5.setObjectName("label_5") + + self.formLayout.setWidget(5, QFormLayout.LabelRole, self.label_5) + + self.InputDisplayDuration = QSpinBox(self.MesaurementSettingsBox) + self.InputDisplayDuration.setObjectName("InputDisplayDuration") + + self.formLayout.setWidget(5, QFormLayout.FieldRole, self.InputDisplayDuration) + + self.gridLayout_3.addLayout(self.formLayout, 1, 0, 1, 1) + + self.verticalLayout.addWidget(self.MesaurementSettingsBox) + + self.Measurement = QGroupBox(self.centralwidget) + self.Measurement.setObjectName("Measurement") + sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) + sizePolicy1.setHorizontalStretch(0) + sizePolicy1.setVerticalStretch(0) + sizePolicy1.setHeightForWidth(self.Measurement.sizePolicy().hasHeightForWidth()) + self.Measurement.setSizePolicy(sizePolicy1) + self.Measurement.setMinimumSize(QSize(271, 50)) + self.layoutWidget = QWidget(self.Measurement) + self.layoutWidget.setObjectName("layoutWidget") + self.layoutWidget.setGeometry(QRect(0, 20, 271, 31)) + self.formLayout_6 = QFormLayout(self.layoutWidget) + self.formLayout_6.setObjectName("formLayout_6") + self.formLayout_6.setLabelAlignment(Qt.AlignCenter) + self.formLayout_6.setFormAlignment( + Qt.AlignRight | Qt.AlignTop | Qt.AlignTrailing + ) + self.formLayout_6.setContentsMargins(7, 3, 14, 3) + self.InputMeasureStart = QPushButton(self.layoutWidget) + self.InputMeasureStart.setObjectName("InputMeasureStart") + + self.formLayout_6.setWidget(0, QFormLayout.LabelRole, self.InputMeasureStart) + + self.InputMeasureStop = QPushButton(self.layoutWidget) + self.InputMeasureStop.setObjectName("InputMeasureStop") + + self.formLayout_6.setWidget(0, QFormLayout.FieldRole, self.InputMeasureStop) + + self.verticalLayout.addWidget(self.Measurement) + + self.RecordSettings = QGroupBox(self.centralwidget) + self.RecordSettings.setObjectName("RecordSettings") + sizePolicy2 = QSizePolicy(QSizePolicy.Maximum, QSizePolicy.Fixed) + sizePolicy2.setHorizontalStretch(0) + sizePolicy2.setVerticalStretch(0) + sizePolicy2.setHeightForWidth( + self.RecordSettings.sizePolicy().hasHeightForWidth() + ) + self.RecordSettings.setSizePolicy(sizePolicy2) + self.RecordSettings.setMinimumSize(QSize(0, 95)) + self.RecordSettings.setMaximumSize(QSize(300, 16777215)) + self.gridLayout_2 = QGridLayout(self.RecordSettings) + self.gridLayout_2.setObjectName("gridLayout_2") + self.gridLayout_2.setVerticalSpacing(0) + self.gridLayout_2.setContentsMargins(0, 0, 0, 0) + self.formLayout_7 = QFormLayout() + self.formLayout_7.setObjectName("formLayout_7") + self.formLayout_7.setLabelAlignment( + Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter + ) + self.formLayout_7.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) + self.formLayout_7.setVerticalSpacing(0) + self.formLayout_7.setContentsMargins(7, -1, 7, -1) + self.label_4 = QLabel(self.RecordSettings) + self.label_4.setObjectName("label_4") + + self.formLayout_7.setWidget(0, QFormLayout.LabelRole, self.label_4) + + self.InputRecordInterval = QSpinBox(self.RecordSettings) + self.InputRecordInterval.setObjectName("InputRecordInterval") + + self.formLayout_7.setWidget(0, QFormLayout.FieldRole, self.InputRecordInterval) + + self.label_16 = QLabel(self.RecordSettings) + self.label_16.setObjectName("label_16") + + self.formLayout_7.setWidget(1, QFormLayout.LabelRole, self.label_16) + + self.InputSaveDirPath = QLabel(self.RecordSettings) + self.InputSaveDirPath.setObjectName("InputSaveDirPath") + self.InputSaveDirPath.setAlignment( + Qt.AlignRight | Qt.AlignTrailing | Qt.AlignVCenter + ) + + self.formLayout_7.setWidget(1, QFormLayout.FieldRole, self.InputSaveDirPath) + + self.InputChgSaveFolder = QPushButton(self.RecordSettings) + self.InputChgSaveFolder.setObjectName("InputChgSaveFolder") + + self.formLayout_7.setWidget(2, QFormLayout.FieldRole, self.InputChgSaveFolder) + + self.gridLayout_2.addLayout(self.formLayout_7, 1, 0, 1, 1) + + self.verticalLayout.addWidget(self.RecordSettings) + + self.Record = QGroupBox(self.centralwidget) + self.Record.setObjectName("Record") + sizePolicy1.setHeightForWidth(self.Record.sizePolicy().hasHeightForWidth()) + self.Record.setSizePolicy(sizePolicy1) + self.Record.setMinimumSize(QSize(271, 135)) + self.layoutWidget1 = QWidget(self.Record) + self.layoutWidget1.setObjectName("layoutWidget1") + self.layoutWidget1.setGeometry(QRect(0, 20, 275, 280)) + self.formLayout_3 = QFormLayout(self.layoutWidget1) + self.formLayout_3.setObjectName("formLayout_3") + self.formLayout_3.setLabelAlignment( + Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter + ) + self.formLayout_3.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) + self.formLayout_3.setVerticalSpacing(0) + self.formLayout_3.setContentsMargins(7, 0, 7, 0) + self.label_7 = QLabel(self.layoutWidget1) + self.label_7.setObjectName("label_7") + + self.formLayout_3.setWidget(3, QFormLayout.LabelRole, self.label_7) + + self.InputElapsedTime = QLabel(self.layoutWidget1) + self.InputElapsedTime.setObjectName("InputElapsedTime") + + self.formLayout_3.setWidget(3, QFormLayout.FieldRole, self.InputElapsedTime) + + self.label_8 = QLabel(self.layoutWidget1) + self.label_8.setObjectName("label_8") + + self.formLayout_3.setWidget(4, QFormLayout.LabelRole, self.label_8) + + self.InputNumSamples = QLabel(self.layoutWidget1) + self.InputNumSamples.setObjectName("InputNumSamples") + + self.formLayout_3.setWidget(4, QFormLayout.FieldRole, self.InputNumSamples) + + self.label_9 = QLabel(self.layoutWidget1) + self.label_9.setObjectName("label_9") + + self.formLayout_3.setWidget(5, QFormLayout.LabelRole, self.label_9) + + self.InputFolderSize = QLabel(self.layoutWidget1) + self.InputFolderSize.setObjectName("InputFolderSize") + + self.formLayout_3.setWidget(5, QFormLayout.FieldRole, self.InputFolderSize) + + self.label_6 = QLabel(self.layoutWidget1) + self.label_6.setObjectName("label_6") + sizePolicy3 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred) + sizePolicy3.setHorizontalStretch(0) + sizePolicy3.setVerticalStretch(0) + sizePolicy3.setHeightForWidth(self.label_6.sizePolicy().hasHeightForWidth()) + self.label_6.setSizePolicy(sizePolicy3) + + self.formLayout_3.setWidget(1, QFormLayout.LabelRole, self.label_6) + + self.InputOpenFolder = QPushButton(self.layoutWidget1) + self.InputOpenFolder.setObjectName("InputOpenFolder") + sizePolicy4 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) + sizePolicy4.setHorizontalStretch(0) + sizePolicy4.setVerticalStretch(0) + sizePolicy4.setHeightForWidth( + self.InputOpenFolder.sizePolicy().hasHeightForWidth() + ) + self.InputOpenFolder.setSizePolicy(sizePolicy4) + + self.formLayout_3.setWidget(6, QFormLayout.FieldRole, self.InputOpenFolder) + + self.formLayout_2 = QFormLayout() + self.formLayout_2.setObjectName("formLayout_2") + self.formLayout_2.setLabelAlignment(Qt.AlignCenter) + self.formLayout_2.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) + self.formLayout_2.setContentsMargins(7, 0, 7, 5) + self.InputRecordStart = QPushButton(self.layoutWidget1) + self.InputRecordStart.setObjectName("InputRecordStart") + sizePolicy5 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum) + sizePolicy5.setHorizontalStretch(0) + sizePolicy5.setVerticalStretch(0) + sizePolicy5.setHeightForWidth( + self.InputRecordStart.sizePolicy().hasHeightForWidth() + ) + self.InputRecordStart.setSizePolicy(sizePolicy5) + self.InputRecordStart.setMinimumSize(QSize(30, 10)) + + self.formLayout_2.setWidget(0, QFormLayout.LabelRole, self.InputRecordStart) + + self.InputRecordStop = QPushButton(self.layoutWidget1) + self.InputRecordStop.setObjectName("InputRecordStop") + sizePolicy5.setHeightForWidth( + self.InputRecordStop.sizePolicy().hasHeightForWidth() + ) + self.InputRecordStop.setSizePolicy(sizePolicy5) + self.InputRecordStop.setMinimumSize(QSize(10, 30)) + + self.formLayout_2.setWidget(0, QFormLayout.FieldRole, self.InputRecordStop) + + self.formLayout_3.setLayout(0, QFormLayout.FieldRole, self.formLayout_2) + + self.InputSaveDir = QLabel(self.layoutWidget1) + self.InputSaveDir.setObjectName("InputSaveDir") + sizePolicy6 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) + sizePolicy6.setHorizontalStretch(0) + sizePolicy6.setVerticalStretch(0) + sizePolicy6.setHeightForWidth( + self.InputSaveDir.sizePolicy().hasHeightForWidth() + ) + self.InputSaveDir.setSizePolicy(sizePolicy6) + + self.formLayout_3.setWidget(1, QFormLayout.FieldRole, self.InputSaveDir) + + self.verticalLayout.addWidget(self.Record) + + self.NoteBox = QGroupBox(self.centralwidget) + self.NoteBox.setObjectName("NoteBox") + self.gridLayout_4 = QGridLayout(self.NoteBox) + self.gridLayout_4.setObjectName("gridLayout_4") + self.gridLayout_4.setVerticalSpacing(0) + self.gridLayout_4.setContentsMargins(7, 0, 0, 0) + self.formLayout_4 = QFormLayout() + self.formLayout_4.setObjectName("formLayout_4") + self.formLayout_4.setLabelAlignment( + Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter + ) + self.formLayout_4.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) + self.formLayout_4.setVerticalSpacing(0) + self.label_11 = QLabel(self.NoteBox) + self.label_11.setObjectName("label_11") + + self.formLayout_4.setWidget(0, QFormLayout.LabelRole, self.label_11) + + self.InputPlace = QLineEdit(self.NoteBox) + self.InputPlace.setObjectName("InputPlace") + + self.formLayout_4.setWidget(0, QFormLayout.FieldRole, self.InputPlace) + + self.label_12 = QLabel(self.NoteBox) + self.label_12.setObjectName("label_12") + + self.formLayout_4.setWidget(1, QFormLayout.LabelRole, self.label_12) + + self.InputTemperature = QDoubleSpinBox(self.NoteBox) + self.InputTemperature.setObjectName("InputTemperature") + + self.formLayout_4.setWidget(1, QFormLayout.FieldRole, self.InputTemperature) + + self.label_13 = QLabel(self.NoteBox) + self.label_13.setObjectName("label_13") + + self.formLayout_4.setWidget(2, QFormLayout.LabelRole, self.label_13) + + self.InputHumidity = QSpinBox(self.NoteBox) + self.InputHumidity.setObjectName("InputHumidity") + + self.formLayout_4.setWidget(2, QFormLayout.FieldRole, self.InputHumidity) + + self.gridLayout_4.addLayout(self.formLayout_4, 0, 0, 1, 1) + + self.verticalLayout_3 = QVBoxLayout() + self.verticalLayout_3.setSpacing(0) + self.verticalLayout_3.setObjectName("verticalLayout_3") + self.label_15 = QLabel(self.NoteBox) + self.label_15.setObjectName("label_15") + + self.verticalLayout_3.addWidget(self.label_15) + + self.InputNote = QPlainTextEdit(self.NoteBox) + self.InputNote.setObjectName("InputNote") + sizePolicy7 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.MinimumExpanding) + sizePolicy7.setHorizontalStretch(0) + sizePolicy7.setVerticalStretch(50) + sizePolicy7.setHeightForWidth(self.InputNote.sizePolicy().hasHeightForWidth()) + self.InputNote.setSizePolicy(sizePolicy7) + self.InputNote.setMinimumSize(QSize(0, 25)) + + self.verticalLayout_3.addWidget(self.InputNote) + + self.verticalSpacer = QSpacerItem( + 20, 40, QSizePolicy.Minimum, QSizePolicy.Expanding + ) + + self.verticalLayout_3.addItem(self.verticalSpacer) + + self.gridLayout_4.addLayout(self.verticalLayout_3, 3, 0, 1, 1) + + self.verticalLayout_2 = QVBoxLayout() + self.verticalLayout_2.setSpacing(0) + self.verticalLayout_2.setObjectName("verticalLayout_2") + self.label_14 = QLabel(self.NoteBox) + self.label_14.setObjectName("label_14") + + self.verticalLayout_2.addWidget(self.label_14) + + self.InputPurpose = QPlainTextEdit(self.NoteBox) + self.InputPurpose.setObjectName("InputPurpose") + sizePolicy8 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) + sizePolicy8.setHorizontalStretch(0) + sizePolicy8.setVerticalStretch(0) + sizePolicy8.setHeightForWidth( + self.InputPurpose.sizePolicy().hasHeightForWidth() + ) + self.InputPurpose.setSizePolicy(sizePolicy8) + self.InputPurpose.setMinimumSize(QSize(0, 25)) + self.InputPurpose.setMaximumSize(QSize(16777215, 50)) + # self.InputPurpose.setTabStopWidth(80) + + self.verticalLayout_2.addWidget(self.InputPurpose) + + self.gridLayout_4.addLayout(self.verticalLayout_2, 2, 0, 1, 1) + + self.horizontalLayout_2 = QHBoxLayout() + self.horizontalLayout_2.setObjectName("horizontalLayout_2") + self.label_10 = QLabel(self.NoteBox) + self.label_10.setObjectName("label_10") + + self.horizontalLayout_2.addWidget(self.label_10) + + self.InputPlant = QLineEdit(self.NoteBox) + self.InputPlant.setObjectName("InputPlant") + + self.horizontalLayout_2.addWidget(self.InputPlant) + + self.gridLayout_4.addLayout(self.horizontalLayout_2, 1, 0, 1, 1) + + self.verticalLayout.addWidget(self.NoteBox) + + self.gridLayout.addLayout(self.verticalLayout, 0, 1, 1, 1) + + self.GraphicsLayoutWidget = GraphicsLayoutWidget(self.centralwidget) + self.GraphicsLayoutWidget.setObjectName("GraphicsLayoutWidget") + sizePolicy9 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy9.setHorizontalStretch(1) + sizePolicy9.setVerticalStretch(0) + sizePolicy9.setHeightForWidth( + self.GraphicsLayoutWidget.sizePolicy().hasHeightForWidth() + ) + self.GraphicsLayoutWidget.setSizePolicy(sizePolicy9) + + self.gridLayout.addWidget(self.GraphicsLayoutWidget, 0, 2, 1, 1) + + self.horizontalSpacer = QSpacerItem( + 7, 20, QSizePolicy.Expanding, QSizePolicy.Minimum + ) + + self.gridLayout.addItem(self.horizontalSpacer, 0, 3, 1, 1) + + MainWindow.setCentralWidget(self.centralwidget) + self.menubar = QMenuBar(MainWindow) + self.menubar.setObjectName("menubar") + self.menubar.setGeometry(QRect(0, 0, 1086, 37)) + MainWindow.setMenuBar(self.menubar) + self.statusbar = QStatusBar(MainWindow) + self.statusbar.setObjectName("statusbar") + MainWindow.setStatusBar(self.statusbar) + + self.retranslateUi(MainWindow) + + QMetaObject.connectSlotsByName(MainWindow) + + # setupUi + + def retranslateUi(self, MainWindow): + MainWindow.setWindowTitle( + QCoreApplication.translate("MainWindow", "MainWindow", None) + ) + self.MesaurementSettingsBox.setTitle( + QCoreApplication.translate("MainWindow", "Measurement Settings", None) + ) + self.label.setText( + QCoreApplication.translate("MainWindow", "serial port", None) + ) + self.InputSerialPort.setText("") + self.InputChgSerialPort.setText( + QCoreApplication.translate("MainWindow", "show ports", None) + ) + self.label_2.setText( + QCoreApplication.translate("MainWindow", "number of channels", None) + ) + self.label_3.setText( + QCoreApplication.translate("MainWindow", "sampting rate [Hz]", None) + ) + self.label_5.setText( + QCoreApplication.translate("MainWindow", "display duration [s]", None) + ) + self.Measurement.setTitle( + QCoreApplication.translate("MainWindow", "Measurement", None) + ) + self.InputMeasureStart.setText( + QCoreApplication.translate("MainWindow", "start", None) + ) + self.InputMeasureStop.setText( + QCoreApplication.translate("MainWindow", "stop", None) + ) + self.RecordSettings.setTitle( + QCoreApplication.translate("MainWindow", "Record Settings", None) + ) + self.label_4.setText( + QCoreApplication.translate("MainWindow", "record interval [s] ", None) + ) + self.label_16.setText( + QCoreApplication.translate("MainWindow", "save path", None) + ) + self.InputSaveDirPath.setText("") + self.InputChgSaveFolder.setText( + QCoreApplication.translate("MainWindow", "change folder", None) + ) + self.Record.setTitle(QCoreApplication.translate("MainWindow", "Record", None)) + self.label_7.setText( + QCoreApplication.translate("MainWindow", "elapsed time", None) + ) + self.InputElapsedTime.setText("") + self.label_8.setText( + QCoreApplication.translate("MainWindow", "nubmer of samples", None) + ) + self.InputNumSamples.setText("") + self.label_9.setText( + QCoreApplication.translate("MainWindow", "folder size", None) + ) + self.InputFolderSize.setText("") + self.label_6.setText(QCoreApplication.translate("MainWindow", "start", None)) + self.InputOpenFolder.setText( + QCoreApplication.translate("MainWindow", "open folder", None) + ) + self.InputRecordStart.setText( + QCoreApplication.translate("MainWindow", "start", None) + ) + self.InputRecordStop.setText( + QCoreApplication.translate("MainWindow", "stop", None) + ) + self.InputSaveDir.setText("") + self.NoteBox.setTitle(QCoreApplication.translate("MainWindow", "Note", None)) + self.label_11.setText(QCoreApplication.translate("MainWindow", "place", None)) + self.label_12.setText( + QCoreApplication.translate("MainWindow", "temperature [\u2103]", None) + ) + self.label_13.setText( + QCoreApplication.translate("MainWindow", "humidity", None) + ) + self.label_15.setText(QCoreApplication.translate("MainWindow", "note", None)) + self.label_14.setText(QCoreApplication.translate("MainWindow", "purpose", None)) + self.label_10.setText(QCoreApplication.translate("MainWindow", "plant", None)) + + # retranslateUi diff --git a/Python/UI/main_window.ui b/Python/UI/Ui_MainWindow.ui similarity index 99% rename from Python/UI/main_window.ui rename to Python/UI/Ui_MainWindow.ui index 87f6f9a..481f36c 100644 --- a/Python/UI/main_window.ui +++ b/Python/UI/Ui_MainWindow.ui @@ -346,7 +346,7 @@ Record - + 0 diff --git a/Python/UI/__init__.py b/Python/UI/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Python/main.py b/Python/main.py index 5823626..e4243ff 100644 --- a/Python/main.py +++ b/Python/main.py @@ -9,10 +9,15 @@ import numpy as np import pyqtgraph as pg import serial -from PyQt5 import QtCore, QtWidgets, uic -from PyQt5.QtCore import pyqtSignal +from PySide6 import QtCore, QtWidgets +from PySide6.QtCore import Signal import tools +from UI.Ui_Dialog import Ui_Dialog + +# from PyQt5 import QtCore, QtWidgets, uic +# from PyQt5.QtCore import pyqtSignal +from UI.Ui_MainWindow import Ui_MainWindow """ Set Logger @@ -62,101 +67,103 @@ class MainWindow(QtWidgets.QMainWindow): def __init__(self, parent=None, *args, **kwargs): super(MainWindow, self).__init__(parent, *args, **kwargs) - uic.loadUi("./UI/main_window.ui", self) # uic.loadUi("./UI/main_window.ui", self) + self.ui = Ui_MainWindow() + self.ui.setupUi(self) + self.setWindowTitle("Measurement") - self.InputMeasureStop.setEnabled(False) - self.InputOpenFolder.setEnabled(False) - self.RecordSettings.setEnabled(False) - self.Record.setEnabled(False) - self.NoteBox.setEnabled(False) + self.ui.InputMeasureStop.setEnabled(False) + self.ui.InputOpenFolder.setEnabled(False) + self.ui.RecordSettings.setEnabled(False) + self.ui.Record.setEnabled(False) + self.ui.NoteBox.setEnabled(False) # variable home = expanduser("~") default_save_dir = "Documents/PlantAnalysis/" self.path_save_base_folder = os.path.join(home, default_save_dir) - self.InputSaveDirPath.setText(self.path_save_base_folder) + self.ui.InputSaveDirPath.setText(self.path_save_base_folder) # logger - dashLoggerHandler = DashLoggerHandler(self.statusbar) + dashLoggerHandler = DashLoggerHandler(self.ui.statusbar) logger.addHandler(dashLoggerHandler) # button events self.cw = ConnectionWindow(parent=self) - self.InputChgSerialPort.clicked.connect( + self.ui.InputChgSerialPort.clicked.connect( lambda: self.cw.show_window(self.serial_port) ) - self.InputMeasureStart.clicked.connect(lambda: self.measure_start()) - self.InputMeasureStop.clicked.connect(lambda: self.measure_stop()) + self.ui.InputMeasureStart.clicked.connect(lambda: self.measure_start()) + self.ui.InputMeasureStop.clicked.connect(lambda: self.measure_stop()) - self.InputChgSaveFolder.clicked.connect(lambda: self.get_folder()) + self.ui.InputChgSaveFolder.clicked.connect(lambda: self.get_folder()) - self.InputRecordStart.clicked.connect(lambda: self.record_start()) - self.InputRecordStop.clicked.connect(lambda: self.record_stop()) + self.ui.InputRecordStart.clicked.connect(lambda: self.record_start()) + self.ui.InputRecordStop.clicked.connect(lambda: self.record_stop()) self.settings = self.init_ui(self.settings) def init_ui(self, settings): - self.InputNumChannels.setValue(settings["num_channels"]) - self.InputNumChannels.setMinimum(1) - self.InputNumChannels.valueChanged.connect( + self.ui.InputNumChannels.setValue(settings["num_channels"]) + self.ui.InputNumChannels.setMinimum(1) + self.ui.InputNumChannels.valueChanged.connect( lambda value: self.chg_settings("num_channels", value) ) - self.InputSamplingRate.setRange(1, 1000) - self.InputSamplingRate.setValue(settings["sampling_rate"]) - self.InputSamplingRate.setSingleStep(10) - self.InputSamplingRate.valueChanged.connect( + self.ui.InputSamplingRate.setRange(1, 1000) + self.ui.InputSamplingRate.setValue(settings["sampling_rate"]) + self.ui.InputSamplingRate.setSingleStep(10) + self.ui.InputSamplingRate.valueChanged.connect( lambda value: self.chg_settings("sampling_rate", value) ) - self.InputRecordInterval.setValue(settings["log_interval"]) - self.InputRecordInterval.setRange(1, settings["display_duration"]) - self.InputRecordInterval.valueChanged.connect( + self.ui.InputRecordInterval.setValue(settings["log_interval"]) + self.ui.InputRecordInterval.setRange(1, settings["display_duration"]) + self.ui.InputRecordInterval.valueChanged.connect( lambda value: self.chg_settings("log_interval", value) ) - self.InputRecordInterval.valueChanged.connect( - lambda value: self.InputDisplayDuration.setMinimum(value) + self.ui.InputRecordInterval.valueChanged.connect( + lambda value: self.ui.InputDisplayDuration.setMinimum(value) ) - self.InputDisplayDuration.setValue(settings["display_duration"]) - self.InputDisplayDuration.setMinimum(settings["log_interval"]) - self.InputDisplayDuration.setSingleStep(5) - self.InputDisplayDuration.valueChanged.connect( + self.ui.InputDisplayDuration.setValue(settings["display_duration"]) + self.ui.InputDisplayDuration.setMinimum(settings["log_interval"]) + self.ui.InputDisplayDuration.setSingleStep(5) + self.ui.InputDisplayDuration.valueChanged.connect( lambda value: self.chg_settings("display_duration", value) ) - self.InputDisplayDuration.valueChanged.connect( - lambda value: self.InputRecordInterval.setMaximum(value) + self.ui.InputDisplayDuration.valueChanged.connect( + lambda value: self.ui.InputRecordInterval.setMaximum(value) ) - self.InputPlace.setText(settings["place"]) - self.InputPlace.textChanged.connect( + self.ui.InputPlace.setText(settings["place"]) + self.ui.InputPlace.textChanged.connect( lambda value: self.chg_settings("place", value) ) - self.InputTemperature.setValue(settings["temperature"]) - self.InputTemperature.valueChanged.connect( + self.ui.InputTemperature.setValue(settings["temperature"]) + self.ui.InputTemperature.valueChanged.connect( lambda value: self.chg_settings("temperature", value) ) - self.InputHumidity.setValue(settings["humidity"]) - self.InputHumidity.valueChanged.connect( + self.ui.InputHumidity.setValue(settings["humidity"]) + self.ui.InputHumidity.valueChanged.connect( lambda value: self.chg_settings("humidity", value) ) - self.InputPlant.setText(settings["plant"]) - self.InputPlant.textChanged.connect( + self.ui.InputPlant.setText(settings["plant"]) + self.ui.InputPlant.textChanged.connect( lambda value: self.chg_settings("plant", value) ) - self.InputPurpose.setPlainText(settings["purpose"]) - self.InputPurpose.textChanged.connect( - lambda: self.chg_settings("purpose", self.InputPurpose.toPlainText()) + self.ui.InputPurpose.setPlainText(settings["purpose"]) + self.ui.InputPurpose.textChanged.connect( + lambda: self.chg_settings("purpose", self.ui.InputPurpose.toPlainText()) ) - self.InputNote.setPlainText(settings["note"]) - self.InputNote.textChanged.connect( - lambda: self.chg_settings("note", self.InputNote.toPlainText()) + self.ui.InputNote.setPlainText(settings["note"]) + self.ui.InputNote.textChanged.connect( + lambda: self.chg_settings("note", self.ui.InputNote.toPlainText()) ) return settings @@ -172,7 +179,7 @@ def show_windows(self): def set_serial_port(self, serial_port): self.serial_port = serial_port - self.InputSerialPort.setText(serial_port) + self.ui.InputSerialPort.setText(serial_port) def measure_start(self): try: @@ -186,16 +193,16 @@ def measure_start(self): self.store_data.start() self.draw_graph = DrawGraph( - self.GraphicsLayoutWidget, self.store_data, self.settings + self.ui.GraphicsLayoutWidget, self.store_data, self.settings ) - self.InputMeasureStart.setEnabled(False) - self.InputMeasureStop.setEnabled(True) - self.MesaurementSettingsBox.setEnabled(False) - self.RecordSettings.setEnabled(True) - self.InputRecordStop.setEnabled(False) - self.Record.setEnabled(True) - self.InputOpenFolder.setEnabled(False) + self.ui.InputMeasureStart.setEnabled(False) + self.ui.InputMeasureStop.setEnabled(True) + self.ui.MesaurementSettingsBox.setEnabled(False) + self.ui.RecordSettings.setEnabled(True) + self.ui.InputRecordStop.setEnabled(False) + self.ui.Record.setEnabled(True) + self.ui.InputOpenFolder.setEnabled(False) except serial.SerialException: logger.info(f"指定されたシリアルポートが見つかりません。USB接続を確認してください。") self.cw.show_window(self.serial_port) @@ -208,61 +215,61 @@ def measure_stop(self): if hasattr(self, "save_data"): self.record_stop() logger.info("測定を停止しました。") - self.InputMeasureStart.setEnabled(True) - self.InputMeasureStop.setEnabled(False) - self.MesaurementSettingsBox.setEnabled(True) - self.RecordSettings.setEnabled(False) - self.Record.setEnabled(False) + self.ui.InputMeasureStart.setEnabled(True) + self.ui.InputMeasureStop.setEnabled(False) + self.ui.MesaurementSettingsBox.setEnabled(True) + self.ui.RecordSettings.setEnabled(False) + self.ui.Record.setEnabled(False) def record_start(self): self.save_data = SaveData( - self.GraphicsLayoutWidget, + self.ui.GraphicsLayoutWidget, self.store_data, self.settings, self.path_save_base_folder, ) self.save_data.console.connect(lambda msg: logger.info(msg)) self.save_data.run() - self.InputSaveDir.setText(self.save_data.get_folder_name()) - self.InputOpenFolder.clicked.connect( + self.ui.InputSaveDir.setText(self.save_data.get_folder_name()) + self.ui.InputOpenFolder.clicked.connect( lambda: self.open_folder(self.save_data.get_folder_path()) ) self.save_data.save_settings(self.settings) self.save_data.singal.connect(lambda data: self.update_record_info(data)) settings = self.init_settings.copy() - self.InputPlace.setText(settings["place"]) - self.InputTemperature.setValue(settings["temperature"]) - self.InputHumidity.setValue(settings["humidity"]) - self.InputPlant.setText(settings["plant"]) - self.InputPurpose.setPlainText(settings["purpose"]) - self.InputNote.setPlainText(settings["note"]) - - self.InputRecordStart.setEnabled(False) - self.InputRecordStop.setEnabled(True) - self.InputOpenFolder.setEnabled(True) - self.NoteBox.setEnabled(True) + self.ui.InputPlace.setText(settings["place"]) + self.ui.InputTemperature.setValue(settings["temperature"]) + self.ui.InputHumidity.setValue(settings["humidity"]) + self.ui.InputPlant.setText(settings["plant"]) + self.ui.InputPurpose.setPlainText(settings["purpose"]) + self.ui.InputNote.setPlainText(settings["note"]) + + self.ui.InputRecordStart.setEnabled(False) + self.ui.InputRecordStop.setEnabled(True) + self.ui.InputOpenFolder.setEnabled(True) + self.ui.NoteBox.setEnabled(True) def record_stop(self): self.save_data.stop() - self.InputElapsedTime.setText("") - self.InputNumSamples.setText("") - self.InputFolderSize.setText("") - self.InputSaveDir.setText("") + self.ui.InputElapsedTime.setText("") + self.ui.InputNumSamples.setText("") + self.ui.InputFolderSize.setText("") + self.ui.InputSaveDir.setText("") - self.InputRecordStart.setEnabled(True) - self.InputRecordStop.setEnabled(False) - self.InputOpenFolder.setEnabled(False) - self.NoteBox.setEnabled(False) + self.ui.InputRecordStart.setEnabled(True) + self.ui.InputRecordStop.setEnabled(False) + self.ui.InputOpenFolder.setEnabled(False) + self.ui.NoteBox.setEnabled(False) def lost_usb_connection(self): self.measure_stop() self.cw.show_window(self.serial_port) def update_record_info(self, data): - self.InputElapsedTime.setText(data["elapsed_time"]) - self.InputNumSamples.setText(data["num_samples"]) - self.InputFolderSize.setText(data["folder_size"]) + self.ui.InputElapsedTime.setText(data["elapsed_time"]) + self.ui.InputNumSamples.setText(data["num_samples"]) + self.ui.InputFolderSize.setText(data["folder_size"]) def open_folder(self, path): os.system(f"open {path}") @@ -273,7 +280,7 @@ def get_folder(self): ) if path_save_base_folder != "": self.path_save_base_folder = path_save_base_folder - self.InputSaveDirPath.setText(self.path_save_base_folder) + self.ui.InputSaveDirPath.setText(self.path_save_base_folder) def on_error(self, _error_code): if _error_code == "01": @@ -292,24 +299,26 @@ class ConnectionWindow(QtWidgets.QDialog): def __init__(self, parent=None, *args, **kwargs): super(ConnectionWindow, self).__init__(parent, *args, **kwargs) self.parent = parent - uic.loadUi("./UI/connection.ui", self) # uic.loadUi("./UI/connection.ui", self) + self.ui = Ui_Dialog() + self.ui.setupUi(self) + self.setWindowTitle("") self.setModal(True) - self.InputSelect.clicked.connect(lambda: self.select()) - self.InputSerialPorts.currentTextChanged.connect( + self.ui.InputSelect.clicked.connect(lambda: self.select()) + self.ui.InputSerialPorts.currentTextChanged.connect( lambda text: self.reload_serial_port(text) ) def show_window(self, current_serial_port): serial_ports = tools.get_serial_ports() - self.InputSerialPorts.clear() - self.InputSerialPorts.addItems(serial_ports) - self.InputSerialPorts.addItem("[Research serial ports]") + self.ui.InputSerialPorts.clear() + self.ui.InputSerialPorts.addItems(serial_ports) + self.ui.InputSerialPorts.addItem("[Research serial ports]") if current_serial_port in serial_ports: - self.InputSerialPorts.setCurrentText(current_serial_port) + self.ui.InputSerialPorts.setCurrentText(current_serial_port) else: - self.InputSerialPorts.setCurrentText(serial_ports[0]) + self.ui.InputSerialPorts.setCurrentText(serial_ports[0]) self.show() def reload_serial_port(self, text): @@ -317,7 +326,7 @@ def reload_serial_port(self, text): self.show_window("") def select(self): - self.parent.set_serial_port(self.InputSerialPorts.currentText()) + self.parent.set_serial_port(self.ui.InputSerialPorts.currentText()) self.close() def closeEvent(self, event): @@ -335,8 +344,8 @@ def closeEvent(self, event): class StoreData(QtCore.QThread): # singal = QtCore.Signal(str) # console = QtCore.Signal(str) - singal = pyqtSignal(str) - console = pyqtSignal(str) + singal = Signal(str) + console = Signal(str) def __init__(self, arduino, settings, parent=None): QtCore.QThread.__init__(self, parent) @@ -473,8 +482,8 @@ def stop(self): class SaveData(QtCore.QObject): start_flg = False num_sample_points = 0 - singal = pyqtSignal(dict) - console = pyqtSignal(str) + singal = Signal(dict) + console = Signal(str) def __init__(self, parent, store_data_class, settings, _path_save_base_folder): QtCore.QObject.__init__(self) @@ -553,4 +562,4 @@ def stop(self): app = QtWidgets.QApplication(sys.argv) myWin = MainWindow() myWin.show_windows() - sys.exit(app.exec_()) + sys.exit(app.exec()) From 9ad0fab88dbcf8c4ed24e01c4b8a9a76868af0bc Mon Sep 17 00:00:00 2001 From: kiyu - raspberrypi Date: Sun, 8 Jan 2023 17:46:57 +0900 Subject: [PATCH 2/5] Update: ui layput --- Python/UI/main_window.ui | 507 +++++++++++++++++++++------------------ 1 file changed, 273 insertions(+), 234 deletions(-) diff --git a/Python/UI/main_window.ui b/Python/UI/main_window.ui index 87f6f9a..5914f14 100644 --- a/Python/UI/main_window.ui +++ b/Python/UI/main_window.ui @@ -33,7 +33,7 @@ - + 0 0 @@ -61,13 +61,13 @@ 0 - 0 + 6 0 - -1 + 6 0 @@ -75,10 +75,10 @@ - 7 + 0 - 7 + 0 @@ -121,13 +121,13 @@ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - -1 + 6 0 - 7 + 0 @@ -174,7 +174,7 @@ - + 0 0 @@ -182,62 +182,76 @@ 271 - 50 + 60 Measurement - - - - 0 - 20 - 271 - 31 - + + + 6 + + + 0 + + + 6 - - - Qt::AlignCenter - - - Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing - - - 7 - - - 3 - - - 14 - - - 3 - - - - - start - - - - - - - stop - - - - - + + 0 + + + + + + 0 + 0 + + + + + 30 + 10 + + + + stop + + + + + + + + 0 + 0 + + + + + 30 + 10 + + + + + 300 + 16777215 + + + + start + + + + - + 0 0 @@ -245,7 +259,7 @@ 0 - 95 + 100 @@ -259,13 +273,13 @@ - 0 + 6 0 - 0 + 6 0 @@ -285,10 +299,10 @@ 0 - 7 + 0 - 7 + 0 @@ -319,6 +333,12 @@ + + + 0 + 0 + + change folder @@ -332,7 +352,7 @@ - + 0 0 @@ -340,199 +360,211 @@ 271 - 135 + 180 Record - - - - 0 - 20 - 275 - 280 - + + + 0 + + + 6 - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - 0 - - - 7 - - - 7 - - - 0 - - - - - elapsed time - - - - - - - - - - - - - - nubmer of samples - - - - - - - - - - - - - - folder size - - - - - - - - - - - - - - - 0 - 0 - - - - start - - - - - - - - 0 - 0 - - - - open folder - - - - - - - Qt::AlignCenter - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - 7 - - - 0 - - - 7 - - - 5 - - - - - - 0 - 0 - - - - - 30 - 10 - - - - start - - - - - - - - 0 - 0 - - - - - 10 - 30 - - - - stop - - - - - - - - - - 0 - 0 - - - - - - - - - + + 0 + + + 6 + + + 0 + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + 30 + 10 + + + + start + + + + + + + + 0 + 0 + + + + + 10 + 30 + + + + stop + + + + + + + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + 0 + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 0 + 0 + + + + + + + + + + + + 0 + 0 + + + + start + + + + + + + + + + + + + + elapsed time + + + + + + + + + + + + + + nubmer of samples + + + + + + + + + + + + + + folder size + + + + + + + + 0 + 0 + + + + open folder + + + + + + + + + 0 + 0 + + Note - 7 + 6 0 - 0 + 6 0 @@ -675,7 +707,14 @@ - + + + + 0 + 0 + + + @@ -715,7 +754,7 @@ 0 0 1086 - 37 + 27 From f35e7bf0b69d5abbd66b10d204c600d39bb7bbbe Mon Sep 17 00:00:00 2001 From: kiyu-git <47422498+kiyu-git@users.noreply.github.com> Date: Sun, 8 Jan 2023 18:23:04 +0900 Subject: [PATCH 3/5] Update: UI --- Python/UI/Ui_MainWindow.py | 302 +++++++++++++++++++------------------ Python/UI/Ui_MainWindow.ui | 37 ++++- 2 files changed, 187 insertions(+), 152 deletions(-) diff --git a/Python/UI/Ui_MainWindow.py b/Python/UI/Ui_MainWindow.py index ccb2cbd..37ec755 100644 --- a/Python/UI/Ui_MainWindow.py +++ b/Python/UI/Ui_MainWindow.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ################################################################################ -## Form generated from reading UI file 'main_window.ui' +## Form generated from reading UI file 'Ui_MainWindow.ui' ## ## Created by: Qt User Interface Compiler version 6.4.1 ## @@ -49,6 +49,7 @@ QGroupBox, QHBoxLayout, QLabel, + QLayout, QLineEdit, QMainWindow, QMenuBar, @@ -79,10 +80,11 @@ def setupUi(self, MainWindow): self.gridLayout.addItem(self.horizontalSpacer_2, 0, 0, 1, 1) self.verticalLayout = QVBoxLayout() + self.verticalLayout.setSpacing(6) self.verticalLayout.setObjectName("verticalLayout") self.MesaurementSettingsBox = QGroupBox(self.centralwidget) self.MesaurementSettingsBox.setObjectName("MesaurementSettingsBox") - sizePolicy = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Fixed) + sizePolicy = QSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Preferred) sizePolicy.setHorizontalStretch(0) sizePolicy.setVerticalStretch(0) sizePolicy.setHeightForWidth( @@ -94,12 +96,12 @@ def setupUi(self, MainWindow): self.MesaurementSettingsBox.setCheckable(False) self.gridLayout_3 = QGridLayout(self.MesaurementSettingsBox) self.gridLayout_3.setObjectName("gridLayout_3") - self.gridLayout_3.setHorizontalSpacing(-1) + self.gridLayout_3.setHorizontalSpacing(6) self.gridLayout_3.setVerticalSpacing(0) - self.gridLayout_3.setContentsMargins(0, 0, 0, 0) + self.gridLayout_3.setContentsMargins(0, 0, 6, 0) self.horizontalLayout = QHBoxLayout() self.horizontalLayout.setObjectName("horizontalLayout") - self.horizontalLayout.setContentsMargins(7, -1, 7, -1) + self.horizontalLayout.setContentsMargins(0, -1, 0, -1) self.label = QLabel(self.MesaurementSettingsBox) self.label.setObjectName("label") @@ -124,9 +126,9 @@ def setupUi(self, MainWindow): Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter ) self.formLayout.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) - self.formLayout.setHorizontalSpacing(-1) + self.formLayout.setHorizontalSpacing(6) self.formLayout.setVerticalSpacing(0) - self.formLayout.setContentsMargins(7, -1, -1, -1) + self.formLayout.setContentsMargins(0, -1, -1, -1) self.InputChgSerialPort = QPushButton(self.MesaurementSettingsBox) self.InputChgSerialPort.setObjectName("InputChgSerialPort") @@ -168,49 +170,50 @@ def setupUi(self, MainWindow): self.Measurement = QGroupBox(self.centralwidget) self.Measurement.setObjectName("Measurement") - sizePolicy1 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Minimum) + sizePolicy.setHeightForWidth(self.Measurement.sizePolicy().hasHeightForWidth()) + self.Measurement.setSizePolicy(sizePolicy) + self.Measurement.setMinimumSize(QSize(271, 60)) + self.horizontalLayout_4 = QHBoxLayout(self.Measurement) + self.horizontalLayout_4.setObjectName("horizontalLayout_4") + self.horizontalLayout_4.setContentsMargins(6, 0, 6, 0) + self.InputMeasureStop = QPushButton(self.Measurement) + self.InputMeasureStop.setObjectName("InputMeasureStop") + sizePolicy1 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum) sizePolicy1.setHorizontalStretch(0) sizePolicy1.setVerticalStretch(0) - sizePolicy1.setHeightForWidth(self.Measurement.sizePolicy().hasHeightForWidth()) - self.Measurement.setSizePolicy(sizePolicy1) - self.Measurement.setMinimumSize(QSize(271, 50)) - self.layoutWidget = QWidget(self.Measurement) - self.layoutWidget.setObjectName("layoutWidget") - self.layoutWidget.setGeometry(QRect(0, 20, 271, 31)) - self.formLayout_6 = QFormLayout(self.layoutWidget) - self.formLayout_6.setObjectName("formLayout_6") - self.formLayout_6.setLabelAlignment(Qt.AlignCenter) - self.formLayout_6.setFormAlignment( - Qt.AlignRight | Qt.AlignTop | Qt.AlignTrailing - ) - self.formLayout_6.setContentsMargins(7, 3, 14, 3) - self.InputMeasureStart = QPushButton(self.layoutWidget) - self.InputMeasureStart.setObjectName("InputMeasureStart") + sizePolicy1.setHeightForWidth( + self.InputMeasureStop.sizePolicy().hasHeightForWidth() + ) + self.InputMeasureStop.setSizePolicy(sizePolicy1) + self.InputMeasureStop.setMinimumSize(QSize(30, 10)) - self.formLayout_6.setWidget(0, QFormLayout.LabelRole, self.InputMeasureStart) + self.horizontalLayout_4.addWidget(self.InputMeasureStop) - self.InputMeasureStop = QPushButton(self.layoutWidget) - self.InputMeasureStop.setObjectName("InputMeasureStop") + self.InputMeasureStart = QPushButton(self.Measurement) + self.InputMeasureStart.setObjectName("InputMeasureStart") + sizePolicy1.setHeightForWidth( + self.InputMeasureStart.sizePolicy().hasHeightForWidth() + ) + self.InputMeasureStart.setSizePolicy(sizePolicy1) + self.InputMeasureStart.setMinimumSize(QSize(30, 10)) + self.InputMeasureStart.setMaximumSize(QSize(300, 16777215)) - self.formLayout_6.setWidget(0, QFormLayout.FieldRole, self.InputMeasureStop) + self.horizontalLayout_4.addWidget(self.InputMeasureStart) self.verticalLayout.addWidget(self.Measurement) self.RecordSettings = QGroupBox(self.centralwidget) self.RecordSettings.setObjectName("RecordSettings") - sizePolicy2 = QSizePolicy(QSizePolicy.Maximum, QSizePolicy.Fixed) - sizePolicy2.setHorizontalStretch(0) - sizePolicy2.setVerticalStretch(0) - sizePolicy2.setHeightForWidth( + sizePolicy.setHeightForWidth( self.RecordSettings.sizePolicy().hasHeightForWidth() ) - self.RecordSettings.setSizePolicy(sizePolicy2) - self.RecordSettings.setMinimumSize(QSize(0, 95)) + self.RecordSettings.setSizePolicy(sizePolicy) + self.RecordSettings.setMinimumSize(QSize(0, 90)) self.RecordSettings.setMaximumSize(QSize(300, 16777215)) self.gridLayout_2 = QGridLayout(self.RecordSettings) self.gridLayout_2.setObjectName("gridLayout_2") self.gridLayout_2.setVerticalSpacing(0) - self.gridLayout_2.setContentsMargins(0, 0, 0, 0) + self.gridLayout_2.setContentsMargins(6, 0, 6, 0) self.formLayout_7 = QFormLayout() self.formLayout_7.setObjectName("formLayout_7") self.formLayout_7.setLabelAlignment( @@ -218,7 +221,7 @@ def setupUi(self, MainWindow): ) self.formLayout_7.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) self.formLayout_7.setVerticalSpacing(0) - self.formLayout_7.setContentsMargins(7, -1, 7, -1) + self.formLayout_7.setContentsMargins(0, -1, 0, -1) self.label_4 = QLabel(self.RecordSettings) self.label_4.setObjectName("label_4") @@ -244,6 +247,10 @@ def setupUi(self, MainWindow): self.InputChgSaveFolder = QPushButton(self.RecordSettings) self.InputChgSaveFolder.setObjectName("InputChgSaveFolder") + sizePolicy1.setHeightForWidth( + self.InputChgSaveFolder.sizePolicy().hasHeightForWidth() + ) + self.InputChgSaveFolder.setSizePolicy(sizePolicy1) self.formLayout_7.setWidget(2, QFormLayout.FieldRole, self.InputChgSaveFolder) @@ -253,122 +260,124 @@ def setupUi(self, MainWindow): self.Record = QGroupBox(self.centralwidget) self.Record.setObjectName("Record") - sizePolicy1.setHeightForWidth(self.Record.sizePolicy().hasHeightForWidth()) - self.Record.setSizePolicy(sizePolicy1) - self.Record.setMinimumSize(QSize(271, 135)) - self.layoutWidget1 = QWidget(self.Record) - self.layoutWidget1.setObjectName("layoutWidget1") - self.layoutWidget1.setGeometry(QRect(0, 20, 275, 280)) - self.formLayout_3 = QFormLayout(self.layoutWidget1) + sizePolicy.setHeightForWidth(self.Record.sizePolicy().hasHeightForWidth()) + self.Record.setSizePolicy(sizePolicy) + self.Record.setMinimumSize(QSize(271, 150)) + self.verticalLayout_4 = QVBoxLayout(self.Record) + self.verticalLayout_4.setSpacing(0) + self.verticalLayout_4.setObjectName("verticalLayout_4") + self.verticalLayout_4.setContentsMargins(6, 0, 6, 0) + self.horizontalLayout_3 = QHBoxLayout() + self.horizontalLayout_3.setSpacing(6) + self.horizontalLayout_3.setObjectName("horizontalLayout_3") + self.horizontalLayout_3.setSizeConstraint(QLayout.SetDefaultConstraint) + self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0) + self.InputRecordStart = QPushButton(self.Record) + self.InputRecordStart.setObjectName("InputRecordStart") + sizePolicy1.setHeightForWidth( + self.InputRecordStart.sizePolicy().hasHeightForWidth() + ) + self.InputRecordStart.setSizePolicy(sizePolicy1) + self.InputRecordStart.setMinimumSize(QSize(30, 10)) + self.InputRecordStart.setMaximumSize(QSize(16777215, 16777215)) + + self.horizontalLayout_3.addWidget(self.InputRecordStart) + + self.InputRecordStop = QPushButton(self.Record) + self.InputRecordStop.setObjectName("InputRecordStop") + sizePolicy1.setHeightForWidth( + self.InputRecordStop.sizePolicy().hasHeightForWidth() + ) + self.InputRecordStop.setSizePolicy(sizePolicy1) + self.InputRecordStop.setMinimumSize(QSize(30, 10)) + self.InputRecordStop.setMaximumSize(QSize(16777215, 16777215)) + + self.horizontalLayout_3.addWidget(self.InputRecordStop) + + self.verticalLayout_4.addLayout(self.horizontalLayout_3) + + self.formLayout_3 = QFormLayout() self.formLayout_3.setObjectName("formLayout_3") self.formLayout_3.setLabelAlignment( Qt.AlignLeading | Qt.AlignLeft | Qt.AlignVCenter ) self.formLayout_3.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) + self.formLayout_3.setHorizontalSpacing(0) self.formLayout_3.setVerticalSpacing(0) - self.formLayout_3.setContentsMargins(7, 0, 7, 0) - self.label_7 = QLabel(self.layoutWidget1) - self.label_7.setObjectName("label_7") + self.formLayout_3.setContentsMargins(0, -1, 0, 0) + self.InputSaveDir = QLabel(self.Record) + self.InputSaveDir.setObjectName("InputSaveDir") + sizePolicy2 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) + sizePolicy2.setHorizontalStretch(0) + sizePolicy2.setVerticalStretch(0) + sizePolicy2.setHeightForWidth( + self.InputSaveDir.sizePolicy().hasHeightForWidth() + ) + self.InputSaveDir.setSizePolicy(sizePolicy2) - self.formLayout_3.setWidget(3, QFormLayout.LabelRole, self.label_7) + self.formLayout_3.setWidget(0, QFormLayout.FieldRole, self.InputSaveDir) - self.InputElapsedTime = QLabel(self.layoutWidget1) + self.label_6 = QLabel(self.Record) + self.label_6.setObjectName("label_6") + sizePolicy3 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred) + sizePolicy3.setHorizontalStretch(0) + sizePolicy3.setVerticalStretch(0) + sizePolicy3.setHeightForWidth(self.label_6.sizePolicy().hasHeightForWidth()) + self.label_6.setSizePolicy(sizePolicy3) + + self.formLayout_3.setWidget(0, QFormLayout.LabelRole, self.label_6) + + self.InputElapsedTime = QLabel(self.Record) self.InputElapsedTime.setObjectName("InputElapsedTime") - self.formLayout_3.setWidget(3, QFormLayout.FieldRole, self.InputElapsedTime) + self.formLayout_3.setWidget(1, QFormLayout.FieldRole, self.InputElapsedTime) - self.label_8 = QLabel(self.layoutWidget1) - self.label_8.setObjectName("label_8") + self.label_7 = QLabel(self.Record) + self.label_7.setObjectName("label_7") - self.formLayout_3.setWidget(4, QFormLayout.LabelRole, self.label_8) + self.formLayout_3.setWidget(1, QFormLayout.LabelRole, self.label_7) - self.InputNumSamples = QLabel(self.layoutWidget1) + self.InputNumSamples = QLabel(self.Record) self.InputNumSamples.setObjectName("InputNumSamples") - self.formLayout_3.setWidget(4, QFormLayout.FieldRole, self.InputNumSamples) + self.formLayout_3.setWidget(2, QFormLayout.FieldRole, self.InputNumSamples) - self.label_9 = QLabel(self.layoutWidget1) - self.label_9.setObjectName("label_9") + self.label_8 = QLabel(self.Record) + self.label_8.setObjectName("label_8") - self.formLayout_3.setWidget(5, QFormLayout.LabelRole, self.label_9) + self.formLayout_3.setWidget(2, QFormLayout.LabelRole, self.label_8) - self.InputFolderSize = QLabel(self.layoutWidget1) + self.InputFolderSize = QLabel(self.Record) self.InputFolderSize.setObjectName("InputFolderSize") - self.formLayout_3.setWidget(5, QFormLayout.FieldRole, self.InputFolderSize) + self.formLayout_3.setWidget(3, QFormLayout.FieldRole, self.InputFolderSize) - self.label_6 = QLabel(self.layoutWidget1) - self.label_6.setObjectName("label_6") - sizePolicy3 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred) - sizePolicy3.setHorizontalStretch(0) - sizePolicy3.setVerticalStretch(0) - sizePolicy3.setHeightForWidth(self.label_6.sizePolicy().hasHeightForWidth()) - self.label_6.setSizePolicy(sizePolicy3) + self.label_9 = QLabel(self.Record) + self.label_9.setObjectName("label_9") - self.formLayout_3.setWidget(1, QFormLayout.LabelRole, self.label_6) + self.formLayout_3.setWidget(3, QFormLayout.LabelRole, self.label_9) - self.InputOpenFolder = QPushButton(self.layoutWidget1) + self.InputOpenFolder = QPushButton(self.Record) self.InputOpenFolder.setObjectName("InputOpenFolder") - sizePolicy4 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) - sizePolicy4.setHorizontalStretch(0) - sizePolicy4.setVerticalStretch(0) - sizePolicy4.setHeightForWidth( + sizePolicy1.setHeightForWidth( self.InputOpenFolder.sizePolicy().hasHeightForWidth() ) - self.InputOpenFolder.setSizePolicy(sizePolicy4) - - self.formLayout_3.setWidget(6, QFormLayout.FieldRole, self.InputOpenFolder) - - self.formLayout_2 = QFormLayout() - self.formLayout_2.setObjectName("formLayout_2") - self.formLayout_2.setLabelAlignment(Qt.AlignCenter) - self.formLayout_2.setFormAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop) - self.formLayout_2.setContentsMargins(7, 0, 7, 5) - self.InputRecordStart = QPushButton(self.layoutWidget1) - self.InputRecordStart.setObjectName("InputRecordStart") - sizePolicy5 = QSizePolicy(QSizePolicy.Minimum, QSizePolicy.Minimum) - sizePolicy5.setHorizontalStretch(0) - sizePolicy5.setVerticalStretch(0) - sizePolicy5.setHeightForWidth( - self.InputRecordStart.sizePolicy().hasHeightForWidth() - ) - self.InputRecordStart.setSizePolicy(sizePolicy5) - self.InputRecordStart.setMinimumSize(QSize(30, 10)) - - self.formLayout_2.setWidget(0, QFormLayout.LabelRole, self.InputRecordStart) - - self.InputRecordStop = QPushButton(self.layoutWidget1) - self.InputRecordStop.setObjectName("InputRecordStop") - sizePolicy5.setHeightForWidth( - self.InputRecordStop.sizePolicy().hasHeightForWidth() - ) - self.InputRecordStop.setSizePolicy(sizePolicy5) - self.InputRecordStop.setMinimumSize(QSize(10, 30)) + self.InputOpenFolder.setSizePolicy(sizePolicy1) - self.formLayout_2.setWidget(0, QFormLayout.FieldRole, self.InputRecordStop) + self.formLayout_3.setWidget(4, QFormLayout.FieldRole, self.InputOpenFolder) - self.formLayout_3.setLayout(0, QFormLayout.FieldRole, self.formLayout_2) - - self.InputSaveDir = QLabel(self.layoutWidget1) - self.InputSaveDir.setObjectName("InputSaveDir") - sizePolicy6 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Preferred) - sizePolicy6.setHorizontalStretch(0) - sizePolicy6.setVerticalStretch(0) - sizePolicy6.setHeightForWidth( - self.InputSaveDir.sizePolicy().hasHeightForWidth() - ) - self.InputSaveDir.setSizePolicy(sizePolicy6) - - self.formLayout_3.setWidget(1, QFormLayout.FieldRole, self.InputSaveDir) + self.verticalLayout_4.addLayout(self.formLayout_3) self.verticalLayout.addWidget(self.Record) self.NoteBox = QGroupBox(self.centralwidget) self.NoteBox.setObjectName("NoteBox") + sizePolicy.setHeightForWidth(self.NoteBox.sizePolicy().hasHeightForWidth()) + self.NoteBox.setSizePolicy(sizePolicy) self.gridLayout_4 = QGridLayout(self.NoteBox) self.gridLayout_4.setObjectName("gridLayout_4") self.gridLayout_4.setVerticalSpacing(0) - self.gridLayout_4.setContentsMargins(7, 0, 0, 0) + self.gridLayout_4.setContentsMargins(6, 0, 6, 0) self.formLayout_4 = QFormLayout() self.formLayout_4.setObjectName("formLayout_4") self.formLayout_4.setLabelAlignment( @@ -418,11 +427,11 @@ def setupUi(self, MainWindow): self.InputNote = QPlainTextEdit(self.NoteBox) self.InputNote.setObjectName("InputNote") - sizePolicy7 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.MinimumExpanding) - sizePolicy7.setHorizontalStretch(0) - sizePolicy7.setVerticalStretch(50) - sizePolicy7.setHeightForWidth(self.InputNote.sizePolicy().hasHeightForWidth()) - self.InputNote.setSizePolicy(sizePolicy7) + sizePolicy4 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.MinimumExpanding) + sizePolicy4.setHorizontalStretch(0) + sizePolicy4.setVerticalStretch(50) + sizePolicy4.setHeightForWidth(self.InputNote.sizePolicy().hasHeightForWidth()) + self.InputNote.setSizePolicy(sizePolicy4) self.InputNote.setMinimumSize(QSize(0, 25)) self.verticalLayout_3.addWidget(self.InputNote) @@ -445,13 +454,13 @@ def setupUi(self, MainWindow): self.InputPurpose = QPlainTextEdit(self.NoteBox) self.InputPurpose.setObjectName("InputPurpose") - sizePolicy8 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) - sizePolicy8.setHorizontalStretch(0) - sizePolicy8.setVerticalStretch(0) - sizePolicy8.setHeightForWidth( + sizePolicy5 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed) + sizePolicy5.setHorizontalStretch(0) + sizePolicy5.setVerticalStretch(0) + sizePolicy5.setHeightForWidth( self.InputPurpose.sizePolicy().hasHeightForWidth() ) - self.InputPurpose.setSizePolicy(sizePolicy8) + self.InputPurpose.setSizePolicy(sizePolicy5) self.InputPurpose.setMinimumSize(QSize(0, 25)) self.InputPurpose.setMaximumSize(QSize(16777215, 50)) # self.InputPurpose.setTabStopWidth(80) @@ -469,6 +478,11 @@ def setupUi(self, MainWindow): self.InputPlant = QLineEdit(self.NoteBox) self.InputPlant.setObjectName("InputPlant") + sizePolicy6 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Fixed) + sizePolicy6.setHorizontalStretch(0) + sizePolicy6.setVerticalStretch(0) + sizePolicy6.setHeightForWidth(self.InputPlant.sizePolicy().hasHeightForWidth()) + self.InputPlant.setSizePolicy(sizePolicy6) self.horizontalLayout_2.addWidget(self.InputPlant) @@ -480,13 +494,13 @@ def setupUi(self, MainWindow): self.GraphicsLayoutWidget = GraphicsLayoutWidget(self.centralwidget) self.GraphicsLayoutWidget.setObjectName("GraphicsLayoutWidget") - sizePolicy9 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) - sizePolicy9.setHorizontalStretch(1) - sizePolicy9.setVerticalStretch(0) - sizePolicy9.setHeightForWidth( + sizePolicy7 = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy7.setHorizontalStretch(1) + sizePolicy7.setVerticalStretch(0) + sizePolicy7.setHeightForWidth( self.GraphicsLayoutWidget.sizePolicy().hasHeightForWidth() ) - self.GraphicsLayoutWidget.setSizePolicy(sizePolicy9) + self.GraphicsLayoutWidget.setSizePolicy(sizePolicy7) self.gridLayout.addWidget(self.GraphicsLayoutWidget, 0, 2, 1, 1) @@ -537,12 +551,12 @@ def retranslateUi(self, MainWindow): self.Measurement.setTitle( QCoreApplication.translate("MainWindow", "Measurement", None) ) - self.InputMeasureStart.setText( - QCoreApplication.translate("MainWindow", "start", None) - ) self.InputMeasureStop.setText( QCoreApplication.translate("MainWindow", "stop", None) ) + self.InputMeasureStart.setText( + QCoreApplication.translate("MainWindow", "start", None) + ) self.RecordSettings.setTitle( QCoreApplication.translate("MainWindow", "Record Settings", None) ) @@ -557,29 +571,29 @@ def retranslateUi(self, MainWindow): QCoreApplication.translate("MainWindow", "change folder", None) ) self.Record.setTitle(QCoreApplication.translate("MainWindow", "Record", None)) + self.InputRecordStart.setText( + QCoreApplication.translate("MainWindow", "start", None) + ) + self.InputRecordStop.setText( + QCoreApplication.translate("MainWindow", "stop", None) + ) + self.InputSaveDir.setText("") + self.label_6.setText(QCoreApplication.translate("MainWindow", "start", None)) + self.InputElapsedTime.setText("") self.label_7.setText( QCoreApplication.translate("MainWindow", "elapsed time", None) ) - self.InputElapsedTime.setText("") + self.InputNumSamples.setText("") self.label_8.setText( QCoreApplication.translate("MainWindow", "nubmer of samples", None) ) - self.InputNumSamples.setText("") + self.InputFolderSize.setText("") self.label_9.setText( QCoreApplication.translate("MainWindow", "folder size", None) ) - self.InputFolderSize.setText("") - self.label_6.setText(QCoreApplication.translate("MainWindow", "start", None)) self.InputOpenFolder.setText( QCoreApplication.translate("MainWindow", "open folder", None) ) - self.InputRecordStart.setText( - QCoreApplication.translate("MainWindow", "start", None) - ) - self.InputRecordStop.setText( - QCoreApplication.translate("MainWindow", "stop", None) - ) - self.InputSaveDir.setText("") self.NoteBox.setTitle(QCoreApplication.translate("MainWindow", "Note", None)) self.label_11.setText(QCoreApplication.translate("MainWindow", "place", None)) self.label_12.setText( diff --git a/Python/UI/Ui_MainWindow.ui b/Python/UI/Ui_MainWindow.ui index 5914f14..6bd7377 100644 --- a/Python/UI/Ui_MainWindow.ui +++ b/Python/UI/Ui_MainWindow.ui @@ -30,6 +30,9 @@ + + 6 + @@ -251,7 +254,7 @@ - + 0 0 @@ -259,7 +262,7 @@ 0 - 100 + 90 @@ -352,7 +355,7 @@ - + 0 0 @@ -360,7 +363,7 @@ 271 - 180 + 150 @@ -384,6 +387,12 @@ + + 6 + + + QLayout::SetDefaultConstraint + 0 @@ -410,6 +419,12 @@ 10 + + + 16777215 + 16777215 + + start @@ -425,8 +440,14 @@ - 10 - 30 + 30 + 10 + + + + + 16777215 + 16777215 @@ -548,7 +569,7 @@ - + 0 0 @@ -754,7 +775,7 @@ 0 0 1086 - 27 + 37 From f5aebfa70d0b1258d94788d15f96bc4b9621e8a6 Mon Sep 17 00:00:00 2001 From: kiyu-git <47422498+kiyu-git@users.noreply.github.com> Date: Sun, 8 Jan 2023 19:49:14 +0900 Subject: [PATCH 4/5] Update: gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b7a07f7..aa64969 100644 --- a/.gitignore +++ b/.gitignore @@ -131,6 +131,7 @@ venv/ ENV/ env.bak/ venv.bak/ +env_pyside2/ # Spyder project settings .spyderproject @@ -167,3 +168,4 @@ cython_debug/ Data/ **/.DS_Store + From a289a3171f4df5cf003ba7ed97fea61dd52357cf Mon Sep 17 00:00:00 2001 From: kiyu-git <47422498+kiyu-git@users.noreply.github.com> Date: Sun, 8 Jan 2023 19:50:38 +0900 Subject: [PATCH 5/5] =?UTF-8?q?Pendeing:=20PySide2=E3=81=AFpyqtgraph?= =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=97=E3=81=A6=E3=81=84=E3=81=AA?= =?UTF-8?q?=E3=81=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Python/UI/Ui_Dialog.py | 18 ++++-------- Python/UI/Ui_MainWindow.py | 60 ++++---------------------------------- Python/main.py | 6 ++-- 3 files changed, 14 insertions(+), 70 deletions(-) diff --git a/Python/UI/Ui_Dialog.py b/Python/UI/Ui_Dialog.py index 191a8cc..9cd1716 100644 --- a/Python/UI/Ui_Dialog.py +++ b/Python/UI/Ui_Dialog.py @@ -1,23 +1,17 @@ # -*- coding: utf-8 -*- ################################################################################ -## Form generated from reading UI file 'connection.ui' +## Form generated from reading UI file 'Ui_Dialog.ui' ## -## Created by: Qt User Interface Compiler version 6.4.1 +## Created by: Qt User Interface Compiler version 5.15.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ -from PySide6.QtCore import (QCoreApplication, QDate, QDateTime, QLocale, - QMetaObject, QObject, QPoint, QRect, - QSize, QTime, QUrl, Qt) -from PySide6.QtGui import (QBrush, QColor, QConicalGradient, QCursor, - QFont, QFontDatabase, QGradient, QIcon, - QImage, QKeySequence, QLinearGradient, QPainter, - QPalette, QPixmap, QRadialGradient, QTransform) -from PySide6.QtWidgets import (QApplication, QComboBox, QDialog, QGridLayout, - QHBoxLayout, QLabel, QPushButton, QSizePolicy, - QSpacerItem, QWidget) +from PySide2.QtCore import * +from PySide2.QtGui import * +from PySide2.QtWidgets import * + class Ui_Dialog(object): def setupUi(self, Dialog): diff --git a/Python/UI/Ui_MainWindow.py b/Python/UI/Ui_MainWindow.py index 37ec755..be59a27 100644 --- a/Python/UI/Ui_MainWindow.py +++ b/Python/UI/Ui_MainWindow.py @@ -3,65 +3,15 @@ ################################################################################ ## Form generated from reading UI file 'Ui_MainWindow.ui' ## -## Created by: Qt User Interface Compiler version 6.4.1 +## Created by: Qt User Interface Compiler version 5.15.2 ## ## WARNING! All changes made in this file will be lost when recompiling UI file! ################################################################################ from pyqtgraph import GraphicsLayoutWidget -from PySide6.QtCore import ( - QCoreApplication, - QDate, - QDateTime, - QLocale, - QMetaObject, - QObject, - QPoint, - QRect, - QSize, - Qt, - QTime, - QUrl, -) -from PySide6.QtGui import ( - QBrush, - QColor, - QConicalGradient, - QCursor, - QFont, - QFontDatabase, - QGradient, - QIcon, - QImage, - QKeySequence, - QLinearGradient, - QPainter, - QPalette, - QPixmap, - QRadialGradient, - QTransform, -) -from PySide6.QtWidgets import ( - QApplication, - QDoubleSpinBox, - QFormLayout, - QGridLayout, - QGroupBox, - QHBoxLayout, - QLabel, - QLayout, - QLineEdit, - QMainWindow, - QMenuBar, - QPlainTextEdit, - QPushButton, - QSizePolicy, - QSpacerItem, - QSpinBox, - QStatusBar, - QVBoxLayout, - QWidget, -) +from PySide2.QtCore import * +from PySide2.QtGui import * +from PySide2.QtWidgets import * class Ui_MainWindow(object): @@ -463,7 +413,7 @@ def setupUi(self, MainWindow): self.InputPurpose.setSizePolicy(sizePolicy5) self.InputPurpose.setMinimumSize(QSize(0, 25)) self.InputPurpose.setMaximumSize(QSize(16777215, 50)) - # self.InputPurpose.setTabStopWidth(80) + self.InputPurpose.setTabStopWidth(80) self.verticalLayout_2.addWidget(self.InputPurpose) diff --git a/Python/main.py b/Python/main.py index e4243ff..1dc8ca7 100644 --- a/Python/main.py +++ b/Python/main.py @@ -9,8 +9,8 @@ import numpy as np import pyqtgraph as pg import serial -from PySide6 import QtCore, QtWidgets -from PySide6.QtCore import Signal +from PySide2 import QtCore, QtWidgets +from PySide2.QtCore import Signal import tools from UI.Ui_Dialog import Ui_Dialog @@ -562,4 +562,4 @@ def stop(self): app = QtWidgets.QApplication(sys.argv) myWin = MainWindow() myWin.show_windows() - sys.exit(app.exec()) + sys.exit(app.exec_())

AltStyle によって変換されたページ (->オリジナル) /