整改ui

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -42,12 +42,7 @@ MainAndSecondaryCamerasWnd::~MainAndSecondaryCamerasWnd()
 
 void MainAndSecondaryCamerasWnd::initFrom()
 {
-    ui->Leftlabel_Percentage->setAlignment(Qt::AlignCenter);
-    ui->Rightlabel_Percentage->setAlignment(Qt::AlignCenter);
-
-    connect(ui->LeftOperatewidget,&ImageWidget::sendDoubleClicksignal,this,&MainAndSecondaryCamerasWnd::handleDoubleClick);
-    connect(ui->RightOperatewidget,&ImageWidget::sendDoubleClicksignal,this,&MainAndSecondaryCamerasWnd::handleDoubleClick);
-    
+ 
     {
         // 界面刷新
         InitPage();
@@ -66,8 +61,8 @@ void MainAndSecondaryCamerasWnd::initFrom()
 
     }
     
-    ui->LeftOperatewidget->setMouseTracking(true);
-    ui->RightOperatewidget->setMouseTracking(true);
+    //ui->LeftOperatewidget->setMouseTracking(true);
+    //ui->RightOperatewidget->setMouseTracking(true);
 
     QSettings settings2("YourOrganization", "YourApplication_lastWndType");
     int lastWndType = settings2.value("LastWndType").toInt();
@@ -206,11 +201,11 @@ void MainAndSecondaryCamerasWnd::CameraConnectUpdateImageFun(int nIndex, Group*
 
 void MainAndSecondaryCamerasWnd::InitModulesShow()
 {
-    if (m_pMainCameraBind != nullptr)
-    {
-        DeduplicationBox(ui->axisComboBox, m_pMainCameraBind->m_vecCAxis, 0);
-        DeduplicationBox(ui->axisTypeComboBox, m_pMainCameraBind->m_vecCAxis, 1);
-    }
+    //if (m_pMainCameraBind != nullptr)
+    //{
+    //    DeduplicationBox(ui->axisComboBox, m_pMainCameraBind->m_vecCAxis, 0);
+    //    DeduplicationBox(ui->axisTypeComboBox, m_pMainCameraBind->m_vecCAxis, 1);
+    //}
 }
 
 template<class T>
@@ -251,39 +246,7 @@ void MainAndSecondaryCamerasWnd::DeduplicationBox(QComboBox* pCom, const T& veTe
     }
 }
 
-void MainAndSecondaryCamerasWnd::handleDoubleClick(){
-    QPoint globalMousePos = QCursor::pos();  // 获取当前鼠标的全局位置
-    QPoint leftWidgetLocalPos = ui->LeftOperatewidget->mapFromGlobal(globalMousePos);
-    QPoint rightWidgetLocalPos = ui->RightOperatewidget->mapFromGlobal(globalMousePos);
-    if (ui->LeftOperatewidget->rect().contains(leftWidgetLocalPos)){
-        if (Left_currentMode == ModeImage) {
-            QPixmap scaledImage = Left_currentPixmap.scaled(Left_currentPixmap.width(), Left_currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            ui->LeftOperatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
-        } else if (Left_currentMode == ModeView && Left_currentView) {
-            QTransform transform;
-            transform.scale(1, 1);
-            Left_currentView->setTransform(transform);
-        }
-        Left_scaleFactor = 1.0;
-        Left_previousScaleFactor = 1.0;
-        ui->Leftlabel_Percentage->setText("100%");
-    }
-    if(ui->RightOperatewidget->rect().contains(rightWidgetLocalPos)){
-        if (Right_currentMode == ModeImage) {
-            QPixmap scaledImage = Right_currentPixmap.scaled(Right_currentPixmap.width(), Right_currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            ui->RightOperatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
-        } else if (Right_currentMode == ModeView && Right_currentView) {
-            QTransform transform;
-            transform.scale(1, 1);
-            Right_currentView->setTransform(transform);
-        }
-        Right_scaleFactor = 1.0;
-        Right_previousScaleFactor = 1.0;
-        ui->Rightlabel_Percentage->setText("100%");
-    }
-
 
-}
 
 void MainAndSecondaryCamerasWnd::checkSettings() {
     QSettings settings("YourCompany", "YourApplication_");
@@ -304,9 +267,9 @@ void MainAndSecondaryCamerasWnd::loadSettings()
     int index = settings.value("Index", 0).toInt();
 
     //TODO: 这个地方目前暂停使用
-    loadGroupSettings(groupId, index);
+    //loadGroupSettings(groupId, index);
 }
-
+#if 0
 void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
     // isUpdatingSettings = true;
     QSettings settings("YourOrganization", "YourApplication");
@@ -635,7 +598,7 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
         lastLastGroupId = lastGroupId;
     }
 }
-
+#endif
 void MainAndSecondaryCamerasWnd::UpdataGroupSettings(const QPixmap& imageData)
 {
     int  Id = m_currentSelectGroup.nGroupId;
@@ -656,229 +619,43 @@ void MainAndSecondaryCamerasWnd::UpdataGroupSettings(const QPixmap& imageData)
     settings.endGroup();
     QString lastRightImage = settings.value("LastRightImage").toString();
 
-    QSize size_left = ui->LeftOperatewidget->size();
-    QSize size_right = ui->RightOperatewidget->size();
 
     QPixmap newPixmap;
     QPixmap Last_newPixmap;
 
     if (Index == 1) {
 
-        //newPixmap = QPixmap(imagePath1);
-        clearLayout(1);
-        newPixmap = QPixmap(imageData);
-        QPixmap scaledPixmap = newPixmap.scaled(size_right, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-        Right_currentMode = ModeImage;
-        Right_currentPixmap = scaledPixmap;
-        Right_scaleFactor = 1.0;
-        Right_previousScaleFactor = 1.0;
-        ui->RightOperatewidget->setPixmap(scaledPixmap);
-        double percentage = Right_scaleFactor * 100;
-        QString percentageStr = QString::number((int)percentage);
-        ui->Rightlabel_Percentage->setText(QString("%1%").arg(percentageStr));
 
-        if (lastIndex == 1) {
-            clearLayout(0);
-            Last_newPixmap = QPixmap(imageData);
-            QPixmap scaledPixmap = Last_newPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            Left_currentMode = ModeImage;
-            Left_currentPixmap = scaledPixmap;
-            Left_scaleFactor = 1.0;
-            Left_previousScaleFactor = 1.0;
-            ui->LeftOperatewidget->setPixmap(scaledPixmap);
-            double percentage = Left_scaleFactor * 100;
-            QString percentageStr = QString::number((int)percentage);
-            ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
-        }
-        else if (lastIndex == 2) {
-            clearLayout(0);
-            if (Last_materialWndType == 1) {
-                ui->LeftOperatewidget->clearPixmap();
-                QVBoxLayout* layout = new QVBoxLayout(ui->LeftOperatewidget);
-                waferMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
 
-                layout->setContentsMargins(0, 0, 0, 0);
-                layout->addWidget(waferMap.value(lastGroupId)->view);
-                ui->LeftOperatewidget->setLayout(layout);
-                Left_currentMode = ModeView;
-                Left_currentView = waferMap.value(lastGroupId)->view;
-                Left_scaleFactor = 1.0;
-                applyScale(0);
-            }
-            else if (Last_materialWndType == 2) {
-                WaffleWidget(0);
-            }
-            else if (Last_materialWndType == 3) {
-                MaterialBoxWidget(0);
-            }
-        }
+        newPixmap = QPixmap(imageData);
+        QStringList test = { "1","2" };
+        ui->viewwidgetgroup_R->updateOperateWidget(newPixmap, test);
     }
-    else if (Index == 2) {
-        clearLayout(1);
-        clearLayout(0);
 
         if (lastIndex == 1) {
+            
+            Last_newPixmap = QPixmap(imageData);
+            QStringList test = { "1","2" };
+            ui->viewwidgetgroup_L->updateOperateWidget(Last_newPixmap, test);
         }
+        else if (lastIndex == 2) {
+            updateMaterialWidget(last_left,Last_materialWndType, lastGroupId);
 
-        if (materialWndType == 1) {
-
-            if (lastIndex == 1) {
-                Last_newPixmap = QPixmap(Last_imagePath1);
-                QPixmap scaledPixmap = Last_newPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-                Left_currentMode = ModeImage;
-                Left_currentPixmap = scaledPixmap;
-                Left_scaleFactor = 1.0;
-                Left_previousScaleFactor = 1.0;
-                ui->LeftOperatewidget->setPixmap(scaledPixmap);
-                double percentage = Left_scaleFactor * 100;
-                QString percentageStr = QString::number((int)percentage);
-                ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
-            }
-            else if (lastIndex == 2) 
-            {
-                if (Last_materialWndType == 1) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout* layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    waferMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(waferMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = waferMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
-                }
-                else if (Last_materialWndType == 2) {
-                    WaffleWidget(0);
-                }
-                else if (Last_materialWndType == 3) {
-                    MaterialBoxWidget(0);
-                }
-            }
-            ui->RightOperatewidget->clearPixmap();
-            QVBoxLayout* layout = new QVBoxLayout(ui->RightOperatewidget);
-            waferMap.value(Id)->initFrom(ui->RightOperatewidget);
-
-            layout->setContentsMargins(0, 0, 0, 0);
-            layout->addWidget(waferMap.value(Id)->view);
-            ui->RightOperatewidget->setLayout(layout);
-            Right_currentMode = ModeView;
-            Right_currentView = waferMap.value(Id)->view;
-            Right_scaleFactor = 1.0;
-            applyScale(1);
-        }
-        else if (materialWndType == 2) {
-            if (lastIndex == 1) {
-                Last_newPixmap = QPixmap(Last_imagePath1);
-                QPixmap scaledPixmap = Last_newPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-                Left_currentMode = ModeImage;
-                Left_currentPixmap = scaledPixmap;
-                Left_scaleFactor = 1.0;
-                Left_previousScaleFactor = 1.0;
-                ui->LeftOperatewidget->setPixmap(scaledPixmap);
-                double percentage = Left_scaleFactor * 100;
-                QString percentageStr = QString::number((int)percentage);
-                ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
-            }
-            else if (lastIndex == 2) {
-                if (Last_materialWndType == 1) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout* layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    waferMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(waferMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = waferMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
-                }
-                else if (Last_materialWndType == 2) {
-                    WaffleWidget(0);
-                }
-                else if (Last_materialWndType == 3) {
-                    MaterialBoxWidget(0);
-                }
-            }
-
-            WaffleWidget(1);
-        }
-        else if (materialWndType == 3) {
-            if (lastIndex == 1) {
-                Last_newPixmap = QPixmap(Last_imagePath1);
-                QPixmap scaledPixmap = Last_newPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-                Left_currentMode = ModeImage;
-                Left_currentPixmap = scaledPixmap;
-                Left_scaleFactor = 1.0;
-                Left_previousScaleFactor = 1.0;
-                ui->LeftOperatewidget->setPixmap(scaledPixmap);
-                double percentage = Left_scaleFactor * 100;
-                QString percentageStr = QString::number((int)percentage);
-                ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
-            }
-            else if (lastIndex == 2) {
-                if (Last_materialWndType == 1) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout* layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    waferMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(waferMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = waferMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
-                }
-                else if (Last_materialWndType == 2) {
-                    WaffleWidget(0);
-                }
-                else if (Last_materialWndType == 3) {
-                    MaterialBoxWidget(0);
-                }
-            }
-
-            MaterialBoxWidget(1);
         }
+    
+    if (Index == 2) {
+ 
+        updateMaterialWidget(current_right,materialWndType, Id);
+        
     }
 
     QSettings settings2("YourOrganization", "YourApplication_lastWndType");
     settings2.setValue("LastWndType", lastIndex);
     settings2.setValue("LastGroup", lastGroupId);
 
-    // 新的是加载进来的
-    QPixmap scaledPixmap_right = newPixmap.scaled(size_right, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    ui->RightOperatewidget->setPixmap(scaledPixmap_right);
 
-    // 旧的图像直接放到界面上？
-    QPixmap scaledPixmap_left = m_lastRightPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    ui->LeftOperatewidget->setPixmap(scaledPixmap_left);
-
-    // 更新当前图片的成员变量
-    // Left_currentPixmap = scaledPixmap_left;
-    // Left_scaleFactor = 1.0;
-    // Right_currentPixmap = scaledPixmap_right;
-    // Right_scaleFactor = 1.0;
-    // ui->Leftlabel_Percentage->setText("100%");
-    // ui->Rightlabel_Percentage->setText("100%");
-
-    // ui->LeftDataSources->clear();
-    // ui->LeftDataSources->addItems(lasttextList);
-    // ui->RightDataSources->clear();
-    // ui->RightDataSources->addItems(textList);
-
-    // 保存到 QSettings
-    // settings.beginGroup("LastSettings");
-    // settings.setValue("LastRightPixmap", lastRightPixmap);
-    // settings.setValue("LasttextList", lasttextList);
-    // settings.setValue("LastLastRightPixmap", lastLastRightPixmap);
-    // settings.setValue("LastLasttextList", lastLasttextList);
-    // settings.setValue("LastLastIndex", lastLastIndex);
-    // settings.setValue("LastLastGroupId", lastLastGroupId);
-    // settings.endGroup();
 
+    QPixmap scaledPixmap_right = newPixmap.scaled(ui->viewwidgetgroup_R->getOperatewidget()->size(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
     if (isUpdatingSettings) {
         lastLastRightPixmap = m_lastRightPixmap;
         lastLasttextList = lasttextList;
@@ -888,74 +665,25 @@ void MainAndSecondaryCamerasWnd::UpdataGroupSettings(const QPixmap& imageData)
         lastLastGroupId = lastGroupId;
     }
 }
-
-void MainAndSecondaryCamerasWnd::clearLayout(int flag) {
-    QWidget* widget = (flag == 1) ? ui->RightOperatewidget : ui->LeftOperatewidget;
-    QLayout* layout = widget->layout();
-
-    if (layout) {
-        QLayoutItem *child;
-        while ((child = layout->takeAt(0)) != nullptr) {
-            if (child->widget() != nullptr) {
-                delete child->widget();  // 删除控件
-            }
-            delete child;  // 删除布局项
+void MainAndSecondaryCamerasWnd::updateMaterialWidget(int  side,int materialWndType, int groupId) {
+    if (side == last_left) {
+        switch (materialWndType) {
+        case 1: ui->viewwidgetgroup_L->setWafer(waferMap.value(lastGroupId)); break;
+        case 2: ui->viewwidgetgroup_L->setWaffle(waffleMap.value(lastGroupId)); break;
+        case 3: ui->viewwidgetgroup_L->setMaterialBox(materialBoxMap.value(lastGroupId)); break;
         }
-        delete layout;  // 删除布局本身
     }
-}
-
-// 圆晶
-void MainAndSecondaryCamerasWnd::WaferWidget(int flag) {
-    // QWidget *operatewidget = ui->LeftOperatewidget;
-
-    // if (flag == 1) {
-    //     operatewidget = ui->RightOperatewidget;
-    // }
-
-    // QGridLayout *layout = new QGridLayout(operatewidget);
-    // wafer = new Wafer(1, operatewidget);
-    // wafer->initFrom(operatewidget);
-
-    // layout->setContentsMargins(0, 0, 0, 0);
-    // layout->addWidget(wafer->globalWidget);
-    // operatewidget->setLayout(layout);
-    // operatewidget->setFixedSize(476, 476);
-}
-
-// 华夫盒
-void MainAndSecondaryCamerasWnd::WaffleWidget(int flag) {
-    QWidget *operatewidget = ui->LeftOperatewidget;
-
-    if (flag == 1) {
-        operatewidget = ui->RightOperatewidget;
+    else if (side == current_right) {
+        switch (materialWndType) {
+        case 1: ui->viewwidgetgroup_R->setWafer(waferMap.value(lastGroupId)); break;
+        case 2: ui->viewwidgetgroup_R->setWaffle(waffleMap.value(lastGroupId)); break;
+        case 3: ui->viewwidgetgroup_R->setMaterialBox(materialBoxMap.value(lastGroupId)); break;
+        }
     }
-
-    QVBoxLayout *layout = new QVBoxLayout(operatewidget);
-    waffle = new Waffle(1, operatewidget);
-
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(waffle);
-    operatewidget->setLayout(layout);
-    operatewidget->setFixedSize(476, 476);
 }
 
-// 料盒
-void MainAndSecondaryCamerasWnd::MaterialBoxWidget(int flag) {
-    QWidget *operatewidget = ui->LeftOperatewidget;
-
-    if (flag == 1) {
-        operatewidget = ui->RightOperatewidget;
-    }
 
-    QVBoxLayout *layout = new QVBoxLayout(operatewidget);
-    materialbox = new MaterialBox(1, operatewidget);
 
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(materialbox);
-    operatewidget->setLayout(layout);
-    operatewidget->setFixedSize(476, 476);
-}
 
 void MainAndSecondaryCamerasWnd::InitMainCameraBind(CameraBind* pCameraBind)
 {
@@ -970,10 +698,10 @@ void MainAndSecondaryCamerasWnd::UpdateCameraDisplay0(int iCameraId, JVision::Im
 {
     // TODO: 这里需要改动
     QImage image(imageData.data, imageData.width, imageData.height, QImage::Format_Indexed8);
-    ui->LeftOperatewidget->setGeometry(ui->LeftOperatewidget->pos().x(),
-        ui->LeftOperatewidget->pos().y(),
-        ui->LeftOperatewidget->width(),
-        ui->LeftOperatewidget->height());
+    ui->viewwidgetgroup_L->getOperatewidget()->setGeometry(ui->viewwidgetgroup_L->getOperatewidget()->pos().x(),
+        ui->viewwidgetgroup_L->getOperatewidget()->pos().y(),
+        ui->viewwidgetgroup_L->getOperatewidget()->width(),
+        ui->viewwidgetgroup_L->getOperatewidget()->height());
     //ui->LeftOperatewidget->setPixmap(QPixmap::fromImage(image));
     emit UpDataImageShowSignals0(QPixmap::fromImage(image));
 }
@@ -981,10 +709,10 @@ void MainAndSecondaryCamerasWnd::UpdateCameraDisplay0(int iCameraId, JVision::Im
 void MainAndSecondaryCamerasWnd::UpdateCameraDisplay1(int iCameraId, JVision::ImageInfo imageData)
 {
     QImage image(imageData.data, imageData.width, imageData.height, QImage::Format_Indexed8);
-    ui->RightOperatewidget->setGeometry(ui->RightOperatewidget->pos().x(),
-        ui->RightOperatewidget->pos().y(),
-        ui->RightOperatewidget->width(),
-        ui->RightOperatewidget->height());
+    ui->viewwidgetgroup_R->getOperatewidget()->setGeometry(ui->viewwidgetgroup_R->getOperatewidget()->pos().x(),
+        ui->viewwidgetgroup_R->getOperatewidget()->pos().y(),
+        ui->viewwidgetgroup_R->getOperatewidget()->width(),
+        ui->viewwidgetgroup_R->getOperatewidget()->height());
     //ui->RightOperatewidget->setPixmap(QPixmap::fromImage(image));
     emit UpDataImageShowSignals1(QPixmap::fromImage(image));
 }
@@ -1002,77 +730,16 @@ void MainAndSecondaryCamerasWnd::UpdateCameraDisplay3(int iCameraId, JVision::Im
 void MainAndSecondaryCamerasWnd::UpdateCameraDisplay4(int iCameraId, JVision::ImageInfo imageData)
 {
     QImage image(imageData.data, imageData.width, imageData.height, QImage::Format_Indexed8);
-    ui->RightOperatewidget->setGeometry(ui->RightOperatewidget->pos().x(),
-        ui->RightOperatewidget->pos().y(),
-        ui->RightOperatewidget->width(),
-        ui->RightOperatewidget->height());
+    ui->viewwidgetgroup_R->getOperatewidget()->setGeometry(ui->viewwidgetgroup_R->getOperatewidget()->pos().x(),
+        ui->viewwidgetgroup_R->getOperatewidget()->pos().y(),
+        ui->viewwidgetgroup_R->getOperatewidget()->width(),
+        ui->viewwidgetgroup_R->getOperatewidget()->height());
     //ui->RightOperatewidget->setPixmap(QPixmap::fromImage(image));
     emit UpDataImageShowSignals4(QPixmap::fromImage(image));
 }
 
-// 更新缩放比例
-void MainAndSecondaryCamerasWnd::updateScale(double newScaleFactor, int flag) {
-    if (flag == 0) {
-        if (newScaleFactor >= 1.0) {
-            Left_scaleFactor = newScaleFactor;
-        } else {
-            Left_scaleFactor = 1.0; // 最小缩放比例为 1.0
-        }
-    } else if (flag == 1) {
-        if (newScaleFactor >= 1.0) {
-            Right_scaleFactor = newScaleFactor;
-        } else {
-            Right_scaleFactor = 1.0; // 最小缩放比例为 1.0
-        }
-    }
 
-    applyScale(flag); // 应用缩放
-}
 
-// 应用缩放
-void MainAndSecondaryCamerasWnd::applyScale(int flag) {
-    if (flag == 0) {
-        if (Left_currentMode == ModeImage) {
-            // 图片模式：缩放图片
-            int newWidth = Left_currentPixmap.width() * Left_scaleFactor;
-            int newHeight = Left_currentPixmap.height() * Left_scaleFactor;
-
-            QPixmap scaledImage = Left_currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            ui->LeftOperatewidget->setPixmapAndPoint(scaledImage, Left_previousScaleFactor, Left_scaleFactor, mousePos);
-            Left_previousScaleFactor = Left_scaleFactor;
-        } else if (Left_currentMode == ModeView && Left_currentView) {
-            // View 模式：缩放 view
-            QTransform transform;
-            transform.scale(Left_scaleFactor, Left_scaleFactor);
-            Left_currentView->setTransform(transform);
-        }
-
-        // 更新百分比显示
-        double percentage = Left_scaleFactor * 100;
-        QString percentageStr = QString::number((int)percentage);
-        ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
-    } else if (flag == 1) {
-        if (Right_currentMode == ModeImage) {
-            // 图片模式：缩放图片
-            int newWidth = Right_currentPixmap.width() * Right_scaleFactor;
-            int newHeight = Right_currentPixmap.height() * Right_scaleFactor;
-
-            QPixmap scaledImage = Right_currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            ui->RightOperatewidget->setPixmapAndPoint(scaledImage, Right_previousScaleFactor, Right_scaleFactor, mousePos);
-            Right_previousScaleFactor = Right_scaleFactor;
-        } else if (Right_currentMode == ModeView && Right_currentView) {
-            // View 模式：缩放 view
-            QTransform transform;
-            transform.scale(Right_scaleFactor, Right_scaleFactor);
-            Right_currentView->setTransform(transform);
-        }
-
-        // 更新百分比显示
-        double percentage = Right_scaleFactor * 100;
-        QString percentageStr = QString::number((int)percentage);
-        ui->Rightlabel_Percentage->setText(QString("%1%").arg(percentageStr));
-    }
-}
 
 void MainAndSecondaryCamerasWnd::HideLayout(QHBoxLayout* layout, bool isHide)
 {
@@ -1136,36 +803,12 @@ void MainAndSecondaryCamerasWnd::timerEvent(QTimerEvent* event)
     int nID = event->timerId();
 }
 
-void MainAndSecondaryCamerasWnd::on_LeftZoomUpButton_clicked()
-{
-    mousePos = ui->LeftOperatewidget->geometry().center();
-    updateScale(Left_scaleFactor * 1.1, 0);
-
-}
 
 
-void MainAndSecondaryCamerasWnd::on_RightZoomUpButton_clicked()
-{
-    mousePos = ui->RightOperatewidget->geometry().center();
-    updateScale(Right_scaleFactor * 1.1, 1);
 
-}
 
 
-void MainAndSecondaryCamerasWnd::on_LeftZoomOutButton_clicked()
-{
-    mousePos = ui->LeftOperatewidget->geometry().center();
-    updateScale(Left_scaleFactor * 0.9, 0);
 
-}
-
-
-void MainAndSecondaryCamerasWnd::on_RightZoomOutButton_clicked()
-{
-    mousePos = ui->RightOperatewidget->geometry().center();
-    updateScale(Right_scaleFactor * 0.9, 1);
-
-}
 
 void MainAndSecondaryCamerasWnd::ResetIdleTimer(bool bStart /*= false*/)
 {
@@ -1250,7 +893,7 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
             }
             else
             {
-                loadGroupSettings(groupId, nIndex);
+                //loadGroupSettings(groupId, nIndex);
             }
         }
         
@@ -1281,9 +924,9 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
 void MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0(const QPixmap& imageData)
 {
     //lastIndex = 1;
-    QSize size_left = ui->LeftOperatewidget->size();
+    QSize size_left = ui->viewwidgetgroup_L->getOperatewidget()->size();
     QPixmap scaledPixmap_left = m_lastRightPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    ui->LeftOperatewidget->setPixmap(scaledPixmap_left);
+    ui->viewwidgetgroup_L->getOperatewidget()->setPixmap(scaledPixmap_left);
     m_lastRightPixmap = imageData;
     //UpdataGroupSettings(imageData);
 }
@@ -1296,30 +939,32 @@ void MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals1(const QPixmap& image
 
 void MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals4(const QPixmap& imageData)
 {
-    QSize size_left = ui->RightOperatewidget->size();
+    QSize size_left = ui->viewwidgetgroup_R->getOperatewidget()->size();
     QPixmap scaledPixmap_left = imageData.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    ui->RightOperatewidget->setPixmap(scaledPixmap_left);
+    ui->viewwidgetgroup_R->getOperatewidget()->setPixmap(scaledPixmap_left);
     //m_lastRightPixmap = imageData;
 }
 
+
+
 void MainAndSecondaryCamerasWnd::wheelEvent(QWheelEvent *event)
 {
-    if (ui->LeftOperatewidget->rect().contains(ui->LeftOperatewidget->mapFromGlobal(event->globalPos()))) {
-        mousePos = ui->LeftOperatewidget->mapFromGlobal(event->globalPos());
-        if (event->angleDelta().y() > 0) {
-            updateScale(Left_scaleFactor * 1.1, 0); // 放大
-        } else {
-            updateScale(Left_scaleFactor * 0.9, 0); // 缩小
-        }
+    if (ui->viewwidgetgroup_L->getOperatewidget()->rect().contains(ui->viewwidgetgroup_L->getOperatewidget()->mapFromGlobal(event->globalPos()))) {
+       mousePos = ui->viewwidgetgroup_L->getOperatewidget()->mapFromGlobal(event->globalPos());
+       if (event->angleDelta().y() > 0) {
+           ui->viewwidgetgroup_L->updateScale(Left_scaleFactor * 1.1); // 放大
+       } else {
+           ui->viewwidgetgroup_L->updateScale(Left_scaleFactor * 0.9); // 缩小
+       }
     }
 
-    if (ui->RightOperatewidget->rect().contains(ui->RightOperatewidget->mapFromGlobal(event->globalPos()))) {
-        mousePos = ui->RightOperatewidget->mapFromGlobal(event->globalPos());
-        if (event->angleDelta().y() > 0) {
-            updateScale(Right_scaleFactor * 1.1, 1); // 放大
-        } else {
-            updateScale(Right_scaleFactor * 0.9, 1); // 缩小
-        }
+    if (ui->viewwidgetgroup_R->getOperatewidget()->rect().contains(ui->viewwidgetgroup_R->getOperatewidget()->mapFromGlobal(event->globalPos()))) {
+       mousePos = ui->viewwidgetgroup_R->getOperatewidget()->mapFromGlobal(event->globalPos());
+       if (event->angleDelta().y() > 0) {
+           ui->viewwidgetgroup_R->updateScale(Right_scaleFactor * 1.1); // 放大
+       } else {
+           ui->viewwidgetgroup_R->updateScale(Right_scaleFactor * 0.9); // 缩小
+       }
     }
     if (ui->scrollArea->rect().contains(ui->scrollArea->mapFromGlobal(event->globalPos()))) {
         // 获取 QScrollArea 的横向滚动条

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.h

@@ -31,13 +31,13 @@ public:
     /**初始化界面运动控制轴
      */
     void InitModulesShow();
+    void updateMaterialWidget(int side, int materialWndType, int groupId);
 
     template<class T>
     void DeduplicationBox(QComboBox* pCom, const T& veTemp, int nIndex);
 
 
 public slots: // 确保这里声明了槽函数
-    void handleDoubleClick();
 
     void CheckIs();
 
@@ -49,7 +49,7 @@ protected:
 
     void checkSettings();
 
-    void loadGroupSettings(int Id, int Index);
+    // void loadGroupSettings(int Id, int Index);
     /**更新刷新
      */
     void UpdataGroupSettings(const QPixmap& imageData);
@@ -71,13 +71,6 @@ protected:
     void timerEvent(QTimerEvent* event) override;
 
 private slots:
-    void on_LeftZoomUpButton_clicked();
-
-    void on_RightZoomUpButton_clicked();
-
-    void on_LeftZoomOutButton_clicked();
-
-    void on_RightZoomOutButton_clicked();
 
     QPixmap getCurrentPixmap() const 
     {
@@ -109,9 +102,6 @@ signals:
     void UpDataImageShowSignals4(const QPixmap& imageData);
 
 private:
-    void updateScale(double newScaleFactor, int flag); // 更新缩放比例
-
-    void applyScale(int flag); // 应用缩放
 
     void HideLayout(QHBoxLayout* layout, bool isHide);
 
@@ -188,6 +178,8 @@ private:
     double              Left_previousScaleFactor;
 
     double              Right_previousScaleFactor;
+    const int           last_left = 0;
+    const int           current_right = 1;
 };
 
 #endif // MAINANDSECONDARYCAMERASWND_H

View/die-bonder-ui/OriginalWnd/MainAndSecondaryCamerasWnd.ui

@@ -14,391 +14,6 @@
    <string>MainWindow</string>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <widget class="QComboBox" name="LeftDataSources">
-    <property name="geometry">
-     <rect>
-      <x>34</x>
-      <y>20</y>
-      <width>400</width>
-      <height>32</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="QComboBox" name="RightDataSources">
-    <property name="geometry">
-     <rect>
-      <x>596</x>
-      <y>20</y>
-      <width>400</width>
-      <height>32</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="ImageWidget" name="LeftOperatewidget" native="true">
-    <property name="geometry">
-     <rect>
-      <x>34</x>
-      <y>72</y>
-      <width>476</width>
-      <height>476</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="ImageWidget" name="RightOperatewidget" native="true">
-    <property name="geometry">
-     <rect>
-      <x>596</x>
-      <y>72</y>
-      <width>476</width>
-      <height>476</height>
-     </rect>
-    </property>
-   </widget>
-   <widget class="QWidget" name="LeftBackGround" native="true">
-    <property name="geometry">
-     <rect>
-      <x>30</x>
-      <y>68</y>
-      <width>484</width>
-      <height>484</height>
-     </rect>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">border: 4px solid blue;</string>
-    </property>
-   </widget>
-   <widget class="QWidget" name="RightBackGround" native="true">
-    <property name="geometry">
-     <rect>
-      <x>592</x>
-      <y>68</y>
-      <width>484</width>
-      <height>484</height>
-     </rect>
-    </property>
-    <property name="styleSheet">
-     <string notr="true">border: 4px solid red;</string>
-    </property>
-   </widget>
-   <widget class="QWidget" name="LeftToolbar" native="true">
-    <property name="geometry">
-     <rect>
-      <x>20</x>
-      <y>572</y>
-      <width>501</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <widget class="Line" name="line">
-     <property name="geometry">
-      <rect>
-       <x>80</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_3">
-     <property name="geometry">
-      <rect>
-       <x>156</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_4">
-     <property name="geometry">
-      <rect>
-       <x>255</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_5">
-     <property name="geometry">
-      <rect>
-       <x>343</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_6">
-     <property name="geometry">
-      <rect>
-       <x>415</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="QWidget" name="layoutWidget">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>0</y>
-       <width>513</width>
-       <height>31</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QPushButton" name="LeftZoomUpButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="LeftZoomOutButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="Leftlabel_Percentage">
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="text">
-         <string>100%</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="LeftRulerButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="LeftPenButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <layout class="QHBoxLayout" name="showLayout">
-        <item>
-         <widget class="QComboBox" name="axisComboBox">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>127</width>
-            <height>0</height>
-           </size>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QComboBox" name="axisTypeComboBox"/>
-        </item>
-       </layout>
-      </item>
-      <item>
-       <widget class="QPushButton" name="showMoveBut_L">
-        <property name="text">
-         <string>.......</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-    <zorder>layoutWidget</zorder>
-    <zorder>line</zorder>
-    <zorder>line_3</zorder>
-    <zorder>line_4</zorder>
-    <zorder>line_5</zorder>
-    <zorder>line_6</zorder>
-   </widget>
-   <widget class="QWidget" name="RightToolbar" native="true">
-    <property name="geometry">
-     <rect>
-      <x>590</x>
-      <y>572</y>
-      <width>511</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <widget class="Line" name="line_11">
-     <property name="geometry">
-      <rect>
-       <x>80</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_12">
-     <property name="geometry">
-      <rect>
-       <x>156</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_13">
-     <property name="geometry">
-      <rect>
-       <x>255</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_14">
-     <property name="geometry">
-      <rect>
-       <x>343</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="Line" name="line_15">
-     <property name="geometry">
-      <rect>
-       <x>415</x>
-       <y>8</y>
-       <width>1</width>
-       <height>16</height>
-      </rect>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-    </widget>
-    <widget class="QWidget" name="layoutWidget">
-     <property name="geometry">
-      <rect>
-       <x>10</x>
-       <y>0</y>
-       <width>411</width>
-       <height>26</height>
-      </rect>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout_2">
-      <item>
-       <widget class="QPushButton" name="RightZoomUpButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="RightZoomOutButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QLabel" name="Rightlabel_Percentage">
-        <property name="layoutDirection">
-         <enum>Qt::LeftToRight</enum>
-        </property>
-        <property name="text">
-         <string>100%</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="RightRulerButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="RightPenButton">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QPushButton" name="pushButton_4">
-        <property name="text">
-         <string>.......</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </widget>
-   <widget class="QPushButton" name="LeftLiveButton">
-    <property name="geometry">
-     <rect>
-      <x>452</x>
-      <y>20</y>
-      <width>60</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Live</string>
-    </property>
-   </widget>
-   <widget class="QPushButton" name="RightLiveButton">
-    <property name="geometry">
-     <rect>
-      <x>1014</x>
-      <y>20</y>
-      <width>60</width>
-      <height>32</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Live</string>
-    </property>
-   </widget>
    <widget class="Line" name="line_16">
     <property name="geometry">
      <rect>
@@ -416,7 +31,7 @@
     <property name="geometry">
      <rect>
       <x>20</x>
-      <y>652</y>
+      <y>645</y>
       <width>1062</width>
       <height>177</height>
      </rect>
@@ -441,50 +56,56 @@
    <widget class="LightJoystickSwitchPage" name="control_L" native="true">
     <property name="geometry">
      <rect>
-      <x>20</x>
-      <y>840</y>
-      <width>531</width>
-      <height>141</height>
+      <x>30</x>
+      <y>825</y>
+      <width>491</width>
+      <height>151</height>
      </rect>
     </property>
    </widget>
    <widget class="LightJoystickSwitchPage" name="control_r" native="true">
     <property name="geometry">
      <rect>
-      <x>570</x>
-      <y>840</y>
-      <width>521</width>
-      <height>131</height>
+      <x>550</x>
+      <y>825</y>
+      <width>491</width>
+      <height>151</height>
+     </rect>
+    </property>
+   </widget>
+   <widget class="ViewWidgetGroup" name="viewwidgetgroup_L" native="true">
+    <property name="geometry">
+     <rect>
+      <x>10</x>
+      <y>10</y>
+      <width>525</width>
+      <height>605</height>
+     </rect>
+    </property>
+   </widget>
+   <widget class="ViewWidgetGroup" name="viewwidgetgroup_R" native="true">
+    <property name="geometry">
+     <rect>
+      <x>555</x>
+      <y>10</y>
+      <width>525</width>
+      <height>605</height>
      </rect>
     </property>
    </widget>
-   <zorder>RightBackGround</zorder>
-   <zorder>LeftBackGround</zorder>
-   <zorder>LeftDataSources</zorder>
-   <zorder>RightDataSources</zorder>
-   <zorder>LeftOperatewidget</zorder>
-   <zorder>RightOperatewidget</zorder>
-   <zorder>LeftToolbar</zorder>
-   <zorder>RightToolbar</zorder>
-   <zorder>LeftLiveButton</zorder>
-   <zorder>RightLiveButton</zorder>
-   <zorder>line_16</zorder>
-   <zorder>scrollArea</zorder>
-   <zorder>control_L</zorder>
-   <zorder>control_r</zorder>
   </widget>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>ImageWidget</class>
+   <class>LightJoystickSwitchPage</class>
    <extends>QWidget</extends>
-   <header location="global">ImageWidget.h</header>
+   <header>src/RewriteControl/lightjoystickswitchpage.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>LightJoystickSwitchPage</class>
+   <class>ViewWidgetGroup</class>
    <extends>QWidget</extends>
-   <header location="global">Src/RewriteControl/LightJoystickSwitchPage.h</header>
+   <header>src/RewriteControl/viewwidgetgroup.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj

@@ -238,6 +238,7 @@
     <ClCompile Include="Src\common\JMessageTip.cpp" />
     <ClCompile Include="Src\common\JUserAccountsData.cpp" />
     <ClCompile Include="Src\RewriteControl\LightJoystickSwitchPage.cpp" />
+    <ClCompile Include="Src\RewriteControl\viewwidgetgroup.cpp" />
     <ClCompile Include="Src\Sql\SqlOperation.cpp" />
     <ClCompile Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.cpp" />
     <ClCompile Include="Src\SystemInfoPage\PageWnd\AddUserAccountWnd.cpp" />
@@ -260,6 +261,7 @@
     <ClInclude Include="Src\common\JUserAccountsData.h" />
     <ClInclude Include="Src\common\UserManagementShared.h" />
     <QtMoc Include="Src\RewriteControl\LightJoystickSwitchPage.h" />
+    <QtMoc Include="Src\RewriteControl\viewwidgetgroup.h" />
     <ClInclude Include="Src\Sql\SqlOperation.h" />
     <QtMoc Include="Src\CameraBind.h" />
     <QtMoc Include="OriginalWnd\CameraDataHandleAndShow.h">
@@ -338,6 +340,7 @@
     <QtUic Include="OriginalWnd\SingleCameraOperationWnd.ui">
     </QtUic>
     <QtUic Include="Src\RewriteControl\LightJoystickSwitchPage.ui" />
+    <QtUic Include="Src\RewriteControl\viewwidgetgroup.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\AddUserAccountWnd.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\LanguageSwitchWnd.ui" />

View/die-bonder-ui/SBTdie-bonder-ui.vcxproj.filters

@@ -231,6 +231,9 @@
     <ClCompile Include="Src\RewriteControl\LightJoystickSwitchPage.cpp">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </ClCompile>
+    <ClCompile Include="Src\RewriteControl\viewwidgetgroup.cpp">
+      <Filter>Source Files\Src\RewriteControl</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
@@ -305,6 +308,9 @@
     <QtMoc Include="Src\RewriteControl\LightJoystickSwitchPage.h">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </QtMoc>
+    <QtMoc Include="Src\RewriteControl\viewwidgetgroup.h">
+      <Filter>Source Files\Src\RewriteControl</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -357,6 +363,9 @@
     <QtUic Include="Src\RewriteControl\LightJoystickSwitchPage.ui">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </QtUic>
+    <QtUic Include="Src\RewriteControl\viewwidgetgroup.ui">
+      <Filter>Source Files\Src\RewriteControl</Filter>
+    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <None Include="images\Participation display\BlackDiamond.png">

View/die-bonder-ui/light.qss

@@ -275,8 +275,7 @@ Group QPushButton#GroupButton
 }
 
 SingleCameraOperationWnd QPushButton#LiveButton,
-MainAndSecondaryCamerasWnd QPushButton#LeftLiveButton,
-MainAndSecondaryCamerasWnd QPushButton#RightLiveButton,
+MainAndSecondaryCamerasWnd QPushButton#LiveButton,
 ChartsAndCamerasWnd QPushButton#LiveButton
 {
     color: #FFFFFF;
@@ -292,10 +291,10 @@ MainAndSecondaryCamerasWnd QWidget#RedLight,
 MainAndSecondaryCamerasWnd QWidget#GreenLight,
 MainAndSecondaryCamerasWnd QWidget#BlueLight,
 MainAndSecondaryCamerasWnd QWidget#DotLight,
-MainAndSecondaryCamerasWnd QWidget#RedLight_L,
-MainAndSecondaryCamerasWnd QWidget#GreenLight_L,
-MainAndSecondaryCamerasWnd QWidget#BlueLight_L,
-MainAndSecondaryCamerasWnd QWidget#DotLight_L,
+MainAndSecondaryCamerasWnd QTabWidget#switchTabWidget,
+MainAndSecondaryCamerasWnd QWidget#LightJoystickSwitchPage,
+MainAndSecondaryCamerasWnd QWidget#GreenLightTab,
+MainAndSecondaryCamerasWnd QWidget#JoystickTab,
 ChartsAndCamerasWnd QWidget#RedLight,
 ChartsAndCamerasWnd QWidget#GreenLight,
 ChartsAndCamerasWnd QWidget#BlueLight,
@@ -328,9 +327,7 @@ QProgressBar {
     background-color: transparent;
 }
 
-QProgressBar#RedLightprogressBar::chunk,
-QProgressBar#RedLightprogressBar_2::chunk,
-QProgressBar#RedLightprogressBar_L::chunk
+QProgressBar#RedLightprogressBar::chunk
 {
     border-radius: 3px;
     background-color: red;
@@ -366,8 +363,7 @@ QProgressBar#DotLightprogressBar_L::chunk
 
 /* 工具栏 */
 SingleCameraOperationWnd QWidget#Toolbar,
-MainAndSecondaryCamerasWnd QWidget#LeftToolbar,
-MainAndSecondaryCamerasWnd QWidget#RightToolbar,
+MainAndSecondaryCamerasWnd QWidget#Toolbar,
 ChartsAndCamerasWnd QWidget#Toolbar
 {
     border-radius: 6px;
@@ -375,8 +371,7 @@ ChartsAndCamerasWnd QWidget#Toolbar
 }
 
 SingleCameraOperationWnd QWidget#Toolbar QPushButton,
-MainAndSecondaryCamerasWnd QWidget#LeftToolbar QPushButton,
-MainAndSecondaryCamerasWnd QWidget#RightToolbar QPushButton,
+MainAndSecondaryCamerasWnd QWidget#Toolbar QPushButton,
 ChartsAndCamerasWnd QWidget#Toolbar QPushButton
 {
     border-radius: 6px;
@@ -412,9 +407,7 @@ ChartsAndCamerasWnd QFrame#line_6
 SingleCameraOperationWnd QPushButton#pushButton_2,
 SingleCameraOperationWnd QLabel#label_Percentage,
 MainAndSecondaryCamerasWnd QPushButton#pushButton_2,
-MainAndSecondaryCamerasWnd QLabel#Leftlabel_Percentage,
-MainAndSecondaryCamerasWnd QPushButton#pushButton_4,
-MainAndSecondaryCamerasWnd QLabel#Rightlabel_Percentage,
+MainAndSecondaryCamerasWnd QLabel#label_Percentage,
 ChartsAndCamerasWnd QPushButton#pushButton_2,
 ChartsAndCamerasWnd QLabel#label_Percentage
 {
@@ -422,32 +415,28 @@ ChartsAndCamerasWnd QLabel#label_Percentage
 }
 
 SingleCameraOperationWnd QPushButton#ZoomUpButton,
-MainAndSecondaryCamerasWnd QPushButton#LeftZoomUpButton,
-MainAndSecondaryCamerasWnd QPushButton#RightZoomUpButton,
+MainAndSecondaryCamerasWnd QPushButton#ZoomUpButton,
 ChartsAndCamerasWnd QPushButton#ZoomUpButton
 {
     image: url(:/images/light/zoom up.png);
 }
 
 SingleCameraOperationWnd QPushButton#ZoomOutButton,
-MainAndSecondaryCamerasWnd QPushButton#LeftZoomOutButton,
-MainAndSecondaryCamerasWnd QPushButton#RightZoomOutButton,
+MainAndSecondaryCamerasWnd QPushButton#ZoomOutButton,
 ChartsAndCamerasWnd QPushButton#ZoomOutButton
 {
     image: url(:/images/light/zoom out.png);
 }
 
 SingleCameraOperationWnd QPushButton#RulerButton,
-MainAndSecondaryCamerasWnd QPushButton#LeftRulerButton,
-MainAndSecondaryCamerasWnd QPushButton#RightRulerButton,
+MainAndSecondaryCamerasWnd QPushButton#RulerButton,
 ChartsAndCamerasWnd QPushButton#RulerButton
 {
     image: url(:/images/light/ruler.png);
 }
 
 SingleCameraOperationWnd QPushButton#PenButton,
-MainAndSecondaryCamerasWnd QPushButton#LeftPenButton,
-MainAndSecondaryCamerasWnd QPushButton#RightPenButton,
+MainAndSecondaryCamerasWnd QPushButton#PenButton,
 ChartsAndCamerasWnd QPushButton#PenButton
 {
     image: url(:/images/light/pen.png);