diff --git a/camera.cpp b/camera.cpp index de8d35b..2090d52 100644 --- a/camera.cpp +++ b/camera.cpp @@ -1356,4 +1356,4 @@ std::vector> expandMaskHorizontally( } return expanded_mask; -} \ No newline at end of file +} diff --git a/cotton_double2.pro.user b/cotton_double2.pro.user index e85474f..bd7523d 100644 --- a/cotton_double2.pro.user +++ b/cotton_double2.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/ui_widget.h b/ui_widget.h index 1f3d31f..6c46fc5 100644 --- a/ui_widget.h +++ b/ui_widget.h @@ -80,16 +80,16 @@ public: QLabel *label_title_3; QGroupBox *groupBox_4; QPushButton *btn_set_lower; - QWidget *layoutWidget; - QVBoxLayout *verticalLayout_4; - QSpinBox *spinbox_delaytime; - QSpinBox *spinbox_encoder; - QSpinBox *spinbox_valve; - QWidget *layoutWidget1; + QFrame *frame_3; + QHBoxLayout *horizontalLayout_6; QVBoxLayout *verticalLayout_5; QLabel *label_delaytime; QLabel *label_encoder; QLabel *label_encoder_2; + QVBoxLayout *verticalLayout_4; + QSpinBox *spinbox_delaytime; + QSpinBox *spinbox_encoder; + QSpinBox *spinbox_valve; QLabel *label_title_4; QGroupBox *groupBox_2; QLabel *label_explosure_2; @@ -105,7 +105,7 @@ public: { if (Widget->objectName().isEmpty()) Widget->setObjectName("Widget"); - Widget->resize(1920, 1080); + Widget->resize(1817, 1047); horizontalLayout = new QHBoxLayout(Widget); horizontalLayout->setObjectName("horizontalLayout"); tabWidget = new QTabWidget(Widget); @@ -192,6 +192,7 @@ public: horizontalLayout_3->setObjectName("horizontalLayout_3"); groupBox_7 = new QGroupBox(tab_2); groupBox_7->setObjectName("groupBox_7"); + groupBox_7->setMinimumSize(QSize(450, 0)); verticalLayout_3 = new QVBoxLayout(groupBox_7); verticalLayout_3->setSpacing(20); verticalLayout_3->setObjectName("verticalLayout_3"); @@ -246,8 +247,7 @@ public: verticalLayout_2->setObjectName("verticalLayout_2"); frame = new QFrame(frame_6); frame->setObjectName("frame"); - frame->setFrameShape(QFrame::Shape::StyledPanel); - frame->setFrameShadow(QFrame::Shadow::Raised); + frame->setFrameShape(QFrame::Shape::NoFrame); horizontalLayout_4 = new QHBoxLayout(frame); horizontalLayout_4->setObjectName("horizontalLayout_4"); label_2 = new QLabel(frame); @@ -256,7 +256,7 @@ public: horizontalLayout_4->addWidget(label_2); - horizontalSpacer = new QSpacerItem(864, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum); + horizontalSpacer = new QSpacerItem(864, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding); horizontalLayout_4->addItem(horizontalSpacer); @@ -268,7 +268,7 @@ public: tra_enable_1 = new QCheckBox(frame); tra_enable_1->setObjectName("tra_enable_1"); - tra_enable_1->setEnabled(false); + tra_enable_1->setEnabled(true); tra_enable_1->setStyleSheet(QString::fromUtf8("font: 12pt \"Microsoft YaHei UI\";")); horizontalLayout_4->addWidget(tra_enable_1); @@ -311,8 +311,7 @@ public: frame_2 = new QFrame(frame_6); frame_2->setObjectName("frame_2"); - frame_2->setFrameShape(QFrame::Shape::StyledPanel); - frame_2->setFrameShadow(QFrame::Shadow::Raised); + frame_2->setFrameShape(QFrame::Shape::NoFrame); horizontalLayout_5 = new QHBoxLayout(frame_2); horizontalLayout_5->setObjectName("horizontalLayout_5"); label_4 = new QLabel(frame_2); @@ -321,7 +320,7 @@ public: horizontalLayout_5->addWidget(label_4); - horizontalSpacer_2 = new QSpacerItem(840, 20, QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Minimum); + horizontalSpacer_2 = new QSpacerItem(840, 20, QSizePolicy::Policy::Minimum, QSizePolicy::Policy::Expanding); horizontalLayout_5->addItem(horizontalSpacer_2); @@ -333,7 +332,7 @@ public: tra_enable_0 = new QCheckBox(frame_2); tra_enable_0->setObjectName("tra_enable_0"); - tra_enable_0->setEnabled(false); + tra_enable_0->setEnabled(true); tra_enable_0->setStyleSheet(QString::fromUtf8("font: 12pt \"Microsoft YaHei UI\";")); horizontalLayout_5->addWidget(tra_enable_0); @@ -377,7 +376,7 @@ public: horizontalLayout_3->addWidget(frame_6); - horizontalLayout_3->setStretch(0, 4); + horizontalLayout_3->setStretch(0, 6); horizontalLayout_3->setStretch(1, 10); tabWidget->addTab(tab_2, QString()); tab_3 = new QWidget(); @@ -394,54 +393,73 @@ public: label_title_3->setStyleSheet(QString::fromUtf8("font: 700 48pt \"Microsoft YaHei UI\";")); groupBox_4 = new QGroupBox(tab_3); groupBox_4->setObjectName("groupBox_4"); - groupBox_4->setGeometry(QRect(30, 130, 771, 591)); + groupBox_4->setGeometry(QRect(30, 130, 771, 651)); groupBox_4->setStyleSheet(QString::fromUtf8("font: 700 40pt \"Microsoft YaHei UI\";\n" "border-color: rgb(0, 0, 0);")); btn_set_lower = new QPushButton(groupBox_4); btn_set_lower->setObjectName("btn_set_lower"); - btn_set_lower->setGeometry(QRect(430, 410, 231, 141)); - layoutWidget = new QWidget(groupBox_4); - layoutWidget->setObjectName("layoutWidget"); - layoutWidget->setGeometry(QRect(460, 120, 181, 241)); - verticalLayout_4 = new QVBoxLayout(layoutWidget); - verticalLayout_4->setObjectName("verticalLayout_4"); - verticalLayout_4->setContentsMargins(0, 0, 0, 0); - spinbox_delaytime = new QSpinBox(layoutWidget); - spinbox_delaytime->setObjectName("spinbox_delaytime"); - - verticalLayout_4->addWidget(spinbox_delaytime); - - spinbox_encoder = new QSpinBox(layoutWidget); - spinbox_encoder->setObjectName("spinbox_encoder"); - - verticalLayout_4->addWidget(spinbox_encoder); - - spinbox_valve = new QSpinBox(layoutWidget); - spinbox_valve->setObjectName("spinbox_valve"); - - verticalLayout_4->addWidget(spinbox_valve); - - layoutWidget1 = new QWidget(groupBox_4); - layoutWidget1->setObjectName("layoutWidget1"); - layoutWidget1->setGeometry(QRect(30, 120, 341, 251)); - verticalLayout_5 = new QVBoxLayout(layoutWidget1); + btn_set_lower->setGeometry(QRect(480, 470, 231, 141)); + frame_3 = new QFrame(groupBox_4); + frame_3->setObjectName("frame_3"); + frame_3->setGeometry(QRect(20, 80, 698, 373)); + frame_3->setFrameShape(QFrame::Shape::StyledPanel); + frame_3->setFrameShadow(QFrame::Shadow::Raised); + horizontalLayout_6 = new QHBoxLayout(frame_3); + horizontalLayout_6->setObjectName("horizontalLayout_6"); + verticalLayout_5 = new QVBoxLayout(); verticalLayout_5->setObjectName("verticalLayout_5"); - verticalLayout_5->setContentsMargins(0, 0, 0, 0); - label_delaytime = new QLabel(layoutWidget1); + label_delaytime = new QLabel(frame_3); label_delaytime->setObjectName("label_delaytime"); + label_delaytime->setStyleSheet(QString::fromUtf8("font: 700 48pt \"Microsoft YaHei UI\";")); verticalLayout_5->addWidget(label_delaytime); - label_encoder = new QLabel(layoutWidget1); + label_encoder = new QLabel(frame_3); label_encoder->setObjectName("label_encoder"); + label_encoder->setStyleSheet(QString::fromUtf8("font: 700 48pt \"Microsoft YaHei UI\";")); verticalLayout_5->addWidget(label_encoder); - label_encoder_2 = new QLabel(layoutWidget1); + label_encoder_2 = new QLabel(frame_3); label_encoder_2->setObjectName("label_encoder_2"); + label_encoder_2->setStyleSheet(QString::fromUtf8("font: 700 48pt \"Microsoft YaHei UI\";")); verticalLayout_5->addWidget(label_encoder_2); + + horizontalLayout_6->addLayout(verticalLayout_5); + + verticalLayout_4 = new QVBoxLayout(); + verticalLayout_4->setObjectName("verticalLayout_4"); + spinbox_delaytime = new QSpinBox(frame_3); + spinbox_delaytime->setObjectName("spinbox_delaytime"); + spinbox_delaytime->setMinimum(1000); + spinbox_delaytime->setMaximum(1400); + spinbox_delaytime->setSingleStep(10); + spinbox_delaytime->setValue(1200); + + verticalLayout_4->addWidget(spinbox_delaytime); + + spinbox_encoder = new QSpinBox(frame_3); + spinbox_encoder->setObjectName("spinbox_encoder"); + spinbox_encoder->setMinimum(8000); + spinbox_encoder->setMaximum(13000); + spinbox_encoder->setSingleStep(100); + spinbox_encoder->setValue(12000); + + verticalLayout_4->addWidget(spinbox_encoder); + + spinbox_valve = new QSpinBox(frame_3); + spinbox_valve->setObjectName("spinbox_valve"); + spinbox_valve->setMinimum(150); + spinbox_valve->setMaximum(250); + spinbox_valve->setValue(200); + + verticalLayout_4->addWidget(spinbox_valve); + + + horizontalLayout_6->addLayout(verticalLayout_4); + label_title_4 = new QLabel(tab_3); label_title_4->setObjectName("label_title_4"); label_title_4->setGeometry(QRect(920, 150, 91, 21)); @@ -523,8 +541,8 @@ public: groupBox_4->setTitle(QCoreApplication::translate("Widget", "\344\270\213\344\275\215\346\234\272\345\217\202\346\225\260", nullptr)); btn_set_lower->setText(QCoreApplication::translate("Widget", "\350\256\276\345\256\232\345\217\202\346\225\260", nullptr)); label_delaytime->setText(QCoreApplication::translate("Widget", "\345\273\266\350\277\237\346\227\266\351\227\264", nullptr)); - label_encoder->setText(QCoreApplication::translate("Widget", "\347\233\270\346\234\272\345\210\206\351\242\221\347\263\273\346\225\260", nullptr)); - label_encoder_2->setText(QCoreApplication::translate("Widget", "\345\226\267\351\230\200\345\210\206\351\242\221\347\263\273\346\225\260", nullptr)); + label_encoder->setText(QCoreApplication::translate("Widget", "\347\233\270\346\234\272\350\241\214\351\242\221", nullptr)); + label_encoder_2->setText(QCoreApplication::translate("Widget", "\345\226\267\351\230\200\351\242\221\347\216\207", nullptr)); label_title_4->setText(QCoreApplication::translate("Widget", "\345\226\267\351\230\200\346\265\213\350\257\225\347\225\214\351\235\242", nullptr)); groupBox_2->setTitle(QCoreApplication::translate("Widget", "\346\211\213\345\212\250\345\226\267\351\230\200\346\265\213\350\257\225", nullptr)); label_explosure_2->setText(QCoreApplication::translate("Widget", "\351\200\232\351\201\223", nullptr)); diff --git a/widget.ui b/widget.ui index 08aa40f..e149637 100644 --- a/widget.ui +++ b/widget.ui @@ -6,8 +6,8 @@ 0 0 - 1920 - 1080 + 1817 + 1047 @@ -20,7 +20,7 @@ true - 2 + 1 @@ -71,7 +71,7 @@ - QLayout::SetDefaultConstraint + QLayout::SizeConstraint::SetDefaultConstraint @@ -221,9 +221,15 @@ Tab 2 - + + + + 450 + 0 + + 控制及状态 @@ -321,6 +327,9 @@ + + Qt::Orientation::Vertical + 20 @@ -338,7 +347,7 @@ - QFrame::NoFrame + QFrame::Shape::NoFrame @@ -353,6 +362,9 @@ + + Qt::Orientation::Vertical + 864 @@ -374,7 +386,7 @@ - false + true font: 12pt "Microsoft YaHei UI"; @@ -446,7 +458,7 @@ border: 4px solid black; - QFrame::NoFrame + QFrame::Shape::NoFrame @@ -461,6 +473,9 @@ border: 4px solid black; + + Qt::Orientation::Vertical + 840 @@ -482,7 +497,7 @@ border: 4px solid black; - false + true font: 12pt "Microsoft YaHei UI"; @@ -576,7 +591,6 @@ border: 4px solid black; Microsoft YaHei UI 48 - 87 false true @@ -594,7 +608,7 @@ border: 4px solid black; 30 130 771 - 591 + 651 @@ -607,8 +621,8 @@ border-color: rgb(0, 0, 0); - 430 - 410 + 480 + 470 231 141 @@ -617,93 +631,104 @@ border-color: rgb(0, 0, 0); 设定参数 - + - 460 - 120 - 205 - 241 + 20 + 80 + 698 + 373 - - - - - 1000 - - - 1400 - - - 10 - - - 1200 - - - - - - - 8000 - - - 13000 - - - 100 - - - 12000 - - - - - - - 150 - - - 250 - - - 200 - - - - - - - - - 30 - 120 - 360 - 251 - + + QFrame::Shape::StyledPanel - + + QFrame::Shadow::Raised + + - - - 延迟时间 - - + + + + + font: 700 48pt "Microsoft YaHei UI"; + + + 延迟时间 + + + + + + + font: 700 48pt "Microsoft YaHei UI"; + + + 相机行频 + + + + + + + font: 700 48pt "Microsoft YaHei UI"; + + + 喷阀频率 + + + + - - - 相机行频 - - - - - - - 喷阀频率 - - + + + + + 1000 + + + 1400 + + + 10 + + + 1200 + + + + + + + 8000 + + + 13000 + + + 100 + + + 12000 + + + + + + + 150 + + + 250 + + + 200 + + + +