Sfoglia il codice sorgente

问题修复:控制页面修改

yun 1 giorno fa
parent
commit
27fef99d94

+ 5 - 5
View/die-bonder-ui/OriginalWnd/ChartsAndCamerasWnd.cpp

@@ -58,7 +58,7 @@ ChartsAndCamerasWnd::ChartsAndCamerasWnd(QWidget *parent) :
     for (QCheckBox* cb : checkBoxes) {
         cb->setCheckable(true);
 
-        connect(cb, &QCheckBox::clicked, this, &ChartsAndCamerasWnd::on_CheckBox_clicked);
+        //connect(cb, &QCheckBox::clicked, this, &ChartsAndCamerasWnd::on_CheckBox_clicked);
     }
 
 
@@ -157,7 +157,7 @@ void ChartsAndCamerasWnd::initializeSeriesInfo()
 
 
 
-
+#if 0
 void ChartsAndCamerasWnd::on_CheckBox_clicked()
 {
     // 获取发送信号的复选框
@@ -206,7 +206,7 @@ void ChartsAndCamerasWnd::on_CheckBox_clicked()
         qDebug() << "Removed series:" << seriesName;
     }
 }
-
+#endif
 
 void ChartsAndCamerasWnd::initFrom() {
     QTimer *timer = new QTimer(this);
@@ -230,7 +230,7 @@ void ChartsAndCamerasWnd::initFrom() {
         int num = numbers[i];
         CameraImageHandler* manager = new CameraImageHandler(num);
         Group* widget = manager->getGroup();
-        connect(widget,&Group::send_button_Signal,this,&ChartsAndCamerasWnd::showAndHide);
+        //connect(widget,&Group::send_button_Signal,this,&ChartsAndCamerasWnd::showAndHide);
         if (widget != nullptr) 
         {
             layout->addWidget(widget);
@@ -293,7 +293,7 @@ void ChartsAndCamerasWnd::loadSettings()
 void ChartsAndCamerasWnd::loadGroupSettings(int Id, int Index) {
     QSettings settings("YourOrganization", "YourApplication");
     settings.beginGroup(QString::number(Id));
-    QString imagePath1 = settings.value("ImagePath1").toString();
+    QString imagePath = settings.value("ImagePath1").toString();
     int materialWndType = settings.value("MaterialWndType").toInt();
     QStringList textList = settings.value("TextList").toStringList();
     settings.endGroup();

+ 1 - 1
View/die-bonder-ui/OriginalWnd/SingleCameraOperationWnd.h

@@ -34,7 +34,7 @@ public:
     void updateImage(const QImage&image);
     void updateMaterialWidget(int materialWndType, int groupId);
 public slots: // 确保这里声明了槽函数
-    void onComboBoxIndexChanged(int index); // 确保签名匹配
+    // void onComboBoxIndexChanged(int index); // 确保签名匹配
     QString getImagePathFromIndex(int index);
 
     void on_DatacomboBox_currentIndexChanged(int index);

+ 11 - 14
View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -198,28 +198,25 @@ ImageWidget* ControlOperationPage::getOperatewidget()
 
 void ControlOperationPage::resizeSingleUI() {
     ui->DataSources->setGeometry(QRect(20, 20, 400, 32));
-    ui->Operatewidget->setGeometry(QRect(20, 72, 786, 786));
+    ui->Operatewidget->setGeometry(QRect(5, 5, 786, 786));
     //ui->line_2->setGeometry(QRect(826, 20, 1, 953));
     ui->LiveButton->setGeometry(QRect(436, 20, 60, 32));
-    ui->Toolbar->setGeometry(QRect(22, 882, 786, 32));
-    ui->line->setGeometry(QRect(140, 8, 1, 16));
-    ui->ZoomUpButton->setGeometry(QRect(0, 0, 138, 32));
-    ui->line_3->setGeometry(QRect(256, 8, 1, 16));
-    ui->line_4->setGeometry(QRect(395, 8, 1, 16));
-    ui->line_5->setGeometry(QRect(523, 8, 1, 16));
-    ui->line_6->setGeometry(QRect(635, 8, 1, 16));
-    ui->pushButton_2->setGeometry(QRect(637, 0, 149, 32));
-    ui->ZoomOutButton->setGeometry(QRect(142, 0, 112, 32));
-    ui->RulerButton->setGeometry(QRect(397, 0, 124, 32));
-    ui->PenButton->setGeometry(QRect(525, 0, 108, 32));
-    ui->label_Percentage->setGeometry(QRect(258, 0, 135, 32));
+    ui->horizontalLayout_2->setGeometry(QRect(22, 882, 786, 32));
+    ui->horizontalLayout->setGeometry(QRect(22, 882, 786, 32));
+    ui->ZoomUpButton->setGeometry(QRect(25, 882, 138, 32));
+    ui->layoutWidget->setGeometry(QRect(22, 882, 800, 31));
+
+    ui->ZoomOutButton->setGeometry(QRect(163, 882, 112, 32));
+    ui->RulerButton->setGeometry(QRect(430, 882, 124, 32));
+    ui->PenButton->setGeometry(QRect(555, 882, 108, 32));
+    ui->label_Percentage->setGeometry(QRect(275, 882, 135, 32));
     ui->BackGround->setGeometry(QRect(16, 68, 794, 794));
 }
 
 void ControlOperationPage::resizeChartsAndCamerasUI() {
 
 }
-}
+
 
 void ControlOperationPage::on_switchJoystickBut_clicked()
 {