fix a bug of view change

Group.cpp

@@ -1,62 +0,0 @@
-#include "Group.h"
-#include "ui_Group.h"
-#include <QDebug>
-#include <QMouseEvent>
-#include <QSettings>
-
-Group::Group(int Id, const QString& imagePath1, const QString& imagePath2, const QStringList& textList, QWidget* parent)
-    : QWidget(parent), ui(new Ui::Group) {
-    ui->setupUi(this);
-
-    QPixmap pixmap1(imagePath1);
-    QPixmap pixmap2(imagePath2);
-    ui->Imagewidget_left->setPixmap(pixmap1);
-    ui->Imagewidget_right->setPixmap(pixmap2);
-
-    ui->DatacomboBox->addItems(textList);
-
-    ui->Imagewidget_left->setProperty("groupId", Id);
-    ui->Imagewidget_right->setProperty("groupId", Id);
-
-    // 存储参数到 QSettings
-    saveGroupSettings(Id, imagePath1, imagePath2, textList);
-
-    initForm();
-}
-
-Group::~Group() {
-    delete ui;
-}
-
-void Group::initForm() {
-    ui->Imagewidget_left->installEventFilter(this);
-    ui->Imagewidget_right->installEventFilter(this);
-}
-
-bool Group::eventFilter(QObject *obj, QEvent *event) {
-    if (event->type() == QEvent::MouseButtonDblClick) {
-        QMouseEvent* mouseEvent = static_cast<QMouseEvent*>(event);
-        if (mouseEvent->button() == Qt::LeftButton) {
-            int groupId = obj->property("groupId").toInt();
-            QSettings settings("YourCompany", "YourApplication_");
-            settings.setValue("GroupId", groupId);
-
-            if (obj == this->ui->Imagewidget_left) {
-                settings.setValue("Index", 1);
-            } else if (obj == this->ui->Imagewidget_right) {
-                settings.setValue("Index", 2);
-            }
-            return true;
-        }
-    }
-    return QWidget::eventFilter(obj, event);
-}
-
-void Group::saveGroupSettings(int Id, const QString& imagePath1, const QString& imagePath2, const QStringList& textList) {
-    QSettings settings("YourOrganization", "YourApplication");
-    settings.beginGroup(QString::number(Id));
-    settings.setValue("ImagePath1", imagePath1);
-    settings.setValue("ImagePath2", imagePath2);
-    settings.setValue("TextList", textList);
-    settings.endGroup();
-}

Group.h

@@ -1,26 +0,0 @@
-#ifndef GROUP_H
-#define GROUP_H
-
-#include <QWidget>
-
-namespace Ui {
-class Group;
-}
-
-class Group : public QWidget
-{
-    Q_OBJECT
-
-public:
-    explicit Group(int Id, const QString& imagePath1, const QString& imagePath2, const QStringList& textList, QWidget* parent);
-    ~Group();
-
-    void initForm();
-    bool eventFilter(QObject *obj, QEvent *event);
-    void saveGroupSettings(int Id, const QString& imagePath1, const QString& imagePath2, const QStringList& textList);
-
-private:
-    Ui::Group *ui;
-};
-
-#endif // GROUP_H

Group.ui

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Group</class>
- <widget class="QWidget" name="Group">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>326</width>
-    <height>245</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <widget class="ImageWidget_nodrag" name="Imagewidget_left" native="true">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>48</y>
-     <width>114</width>
-     <height>114</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background-color: rgb(0, 170, 127);</string>
-   </property>
-  </widget>
-  <widget class="QComboBox" name="DatacomboBox">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>172</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background-color: rgb(255, 255, 255);</string>
-   </property>
-  </widget>
-  <widget class="QPushButton" name="GroupButton">
-
-   <property name="geometry">
-    <rect>
-     <x>184</x>
-     <y>0</y>
-     <width>60</width>
-     <height>32</height>
-    </rect>
-   </property>
-   <property name="text">
-    <string/>
-   </property>
-  </widget>
-
-  <widget class="ImageWidget_nodrag" name="Imagewidget_right" native="true">
-
-   <property name="geometry">
-    <rect>
-     <x>130</x>
-     <y>48</y>
-     <width>114</width>
-     <height>114</height>
-    </rect>
-   </property>
-   <property name="styleSheet">
-    <string notr="true">background-color: rgb(0, 170, 127);</string>
-   </property>
-  </widget>
- </widget>
- <customwidgets>
-  <customwidget>
-
-   <class>ImageWidget_nodrag</class>
-   <extends>QWidget</extends>
-   <header location="global">ImageWidget_nodrag.h</header>
-
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>

OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -25,7 +25,7 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget *parent)
     settings.endGroup();
 
     initFrom();
-    isShow = true;
+    isShow_R = true;
     isShow_L = true;
 }
 
@@ -260,7 +260,7 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
     int Last_materialWndType = settings.value("MaterialWndType").toInt();
     QStringList Last_textList = settings.value("TextList").toStringList();
     settings.endGroup();
-    QString lastRightImage = settings.value("LastRightImage").toString();
+    // QString lastRightImage = settings.value("LastRightImage").toString();
 
     QSize size_left = ui->LeftOperatewidget->size();
     QSize size_right = ui->RightOperatewidget->size();
@@ -269,10 +269,10 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
 	QPixmap Last_newPixmap;
 
     if (Index == 1) {
-        isShow = true;
-
-        //newPixmap = QPixmap(imagePath1);
+        isShow_R = true;
         clearLayout(1);
+        clearLayout(0);
+        qDebug()<<imagePath1;
         newPixmap = QPixmap(imagePath1);
         QPixmap scaledPixmap = newPixmap.scaled(size_right, Qt::KeepAspectRatio, Qt::SmoothTransformation);
         Right_currentMode = ModeImage;
@@ -283,9 +283,11 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
         double percentage = Right_scaleFactor * 100;
         QString percentageStr = QString::number((int)percentage);
         ui->Rightlabel_Percentage->setText(QString("%1%").arg(percentageStr));
+        applyScale(1);
+        // imageWidget(imagePath1,current_right,size_right);
 
         if (lastIndex == 1) {
-            clearLayout(0);
+            isShow_L = true;
             Last_newPixmap = QPixmap(Last_imagePath1);
             QPixmap scaledPixmap = Last_newPixmap.scaled(size_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
             Left_currentMode = ModeImage;
@@ -296,53 +298,42 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
             double percentage = Left_scaleFactor * 100;
             QString percentageStr = QString::number((int)percentage);
             ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
-            isShow_L = true;
+            // imageWidget(Last_imagePath1,last_left,size_left);
+
         } else if (lastIndex == 2) {
             isShow_L = false;
-            clearLayout(0);
+            // 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);
+
+                KindsofWidget(last_left,lastGroupId,wafer_kind);
+
             } else if (Last_materialWndType == 2) {
-                ui->LeftOperatewidget->clearPixmap();
-                QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                waffleMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-
-                layout->setContentsMargins(0, 0, 0, 0);
-                layout->addWidget(waffleMap.value(lastGroupId)->view);
-                ui->LeftOperatewidget->setLayout(layout);
-                Left_currentMode = ModeView;
-                Left_currentView = waffleMap.value(lastGroupId)->view;
-                Left_scaleFactor = 1.0;
-                applyScale(0);
+
+                KindsofWidget(last_left,lastGroupId,waffle_kind);
+
             } else if (Last_materialWndType == 3) {
-                ui->LeftOperatewidget->clearPixmap();
-                QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                materialBoxMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-                layout->setContentsMargins(0, 0, 0, 0);
-                layout->addWidget(materialBoxMap.value(lastGroupId)->view);
-                ui->LeftOperatewidget->setLayout(layout);
-                Left_currentMode = ModeView;
-                Left_currentView = materialBoxMap.value(lastGroupId)->view;
-                Left_scaleFactor = 1.0;
-                applyScale(0);
+
+                KindsofWidget(last_left,lastGroupId,materialbox_kind);
+
             }
         }
     } else if (Index == 2) {
-        isShow = false;
+        isShow_R = false;
         clearLayout(1);
         clearLayout(0);
 
         if (lastIndex == 1) {
+            // clearLayout(0);
+            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));
             isShow_L = true;
         }
 
@@ -361,54 +352,24 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
                 ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
             } else if (lastIndex == 2) {
 				isShow_L = false;
+                // 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);
+
+                    KindsofWidget(last_left,lastGroupId,wafer_kind);
+
                 } else if (Last_materialWndType == 2) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    waffleMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(waffleMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = waffleMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
+
+                    KindsofWidget(last_left,lastGroupId,waffle_kind);
+
                 } else if (Last_materialWndType == 3) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    materialBoxMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(materialBoxMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = materialBoxMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
+
+                    KindsofWidget(last_left,lastGroupId,materialbox_kind);
+
                 }
             }
-            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);
+
+            KindsofWidget(current_right,Id,wafer_kind);
+
         } else if (materialWndType == 2) {
             if (lastIndex == 1) {
                 Last_newPixmap = QPixmap(Last_imagePath1);
@@ -424,53 +385,22 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
             } else if (lastIndex == 2) {
 				isShow_L = false;
                 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);
+
+                    KindsofWidget(last_left,lastGroupId,wafer_kind);
+
                 } else if (Last_materialWndType == 2) {                   
-                    ui->LeftOperatewidget->clearPixmap();
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    waffleMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(waffleMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = waffleMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
+
+                    KindsofWidget(last_left,lastGroupId,waffle_kind);
+
                 } else if (Last_materialWndType == 3) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    materialBoxMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(materialBoxMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = materialBoxMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
+
+                    KindsofWidget(last_left,lastGroupId,materialbox_kind);
+
                 }
             }
-            ui->RightOperatewidget->clearPixmap();
-            QVBoxLayout *layout = new QVBoxLayout(ui->RightOperatewidget);
-            waffleMap.value(Id)->initFrom(ui->RightOperatewidget);
-
-            layout->setContentsMargins(0, 0, 0, 0);
-            layout->addWidget(waffleMap.value(Id)->view);
-            ui->RightOperatewidget->setLayout(layout);
-            Right_currentMode = ModeView;
-            Right_currentView = waffleMap.value(Id)->view;
-            Right_scaleFactor = 1.0;
+
+            KindsofWidget(current_right,Id,waffle_kind);
+
         } else if (materialWndType == 3) {
             if (lastIndex == 1) {
                 Last_newPixmap = QPixmap(Last_imagePath1);
@@ -486,53 +416,20 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
             } else if (lastIndex == 2) {
 				isShow_L = false;
                 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);
+
+                    KindsofWidget(last_left,lastGroupId,wafer_kind);
+
                 } else if (Last_materialWndType == 2) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    waffleMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(waffleMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = waffleMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
+
+                    KindsofWidget(last_left,lastGroupId,waffle_kind);
+
                 } else if (Last_materialWndType == 3) {
-                    ui->LeftOperatewidget->clearPixmap();
-                    QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
-                    materialBoxMap.value(lastGroupId)->initFrom(ui->LeftOperatewidget);
-                    layout->setContentsMargins(0, 0, 0, 0);
-                    layout->addWidget(materialBoxMap.value(lastGroupId)->view);
-                    ui->LeftOperatewidget->setLayout(layout);
-                    Left_currentMode = ModeView;
-                    Left_currentView = materialBoxMap.value(lastGroupId)->view;
-                    Left_scaleFactor = 1.0;
-                    applyScale(0);
+
+                    KindsofWidget(last_left,lastGroupId,materialbox_kind);
                 }
             }
             
-            ui->RightOperatewidget->clearPixmap();
-            QVBoxLayout *layout = new QVBoxLayout(ui->RightOperatewidget);
-            materialBoxMap.value(Id)->initFrom(ui->RightOperatewidget);
-            layout->setContentsMargins(0, 0, 0, 0);
-            layout->addWidget(materialBoxMap.value(Id)->view);
-            ui->RightOperatewidget->setLayout(layout);
-            Left_currentMode = ModeView;
-            Left_currentView = materialBoxMap.value(Id)->view;
-            Left_scaleFactor = 1.0;
-            applyScale(0);
+            KindsofWidget(current_right,Id,materialbox_kind);
         }
     }
 
@@ -597,57 +494,100 @@ void MainAndSecondaryCamerasWnd::clearLayout(int flag) {
         delete layout;  // 删除布局本身
     }
 }
+//相机
+void MainAndSecondaryCamerasWnd::imageWidget(QString path,int flag,QSize size){
+    QPixmap newPixmap;
+    QPixmap Last_newPixmap;
+    if(flag == 0){
+        isShow_L = true;
+        Last_newPixmap = QPixmap(path);
+        QPixmap scaledPixmap = Last_newPixmap.scaled(size, 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));
+        applyScale(0);
+    }else if(flag == 1){
+        isShow_R = true;
+        qDebug()<<path;
+        newPixmap = QPixmap(":/images/test_image/image_1.png");
+        QPixmap scaledPixmap = newPixmap.scaled(size, 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));
+        applyScale(1);
 
-// 圆晶
-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);
+    }else{
+        qDebug()<<"parameter has problem";
+    }
 }
 
-// 华夫盒
-void MainAndSecondaryCamerasWnd::WaffleWidget(int flag) {
-    QWidget *operatewidget = ui->LeftOperatewidget;
+// 圆晶
+void MainAndSecondaryCamerasWnd::KindsofWidget(int flag,int groupId,kinds kind) {
+    if(flag == 0){
 
-    if (flag == 1) {
-        operatewidget = ui->RightOperatewidget;
-    }
+        ui->LeftOperatewidget->clearPixmap();
+        QVBoxLayout *layout = new QVBoxLayout(ui->LeftOperatewidget);
+        layout->setContentsMargins(0, 0, 0, 0);
 
-    QVBoxLayout *layout = new QVBoxLayout(operatewidget);
-    waffle = new Waffle(1, operatewidget);
+        if(kind == wafer_kind){
+            waferMap.value(groupId)->initFrom(ui->LeftOperatewidget);
+            layout->addWidget(waferMap.value(groupId)->view);
+            Left_currentView = waferMap.value(groupId)->view;
+        }else if(kind == waffle_kind){
+            waffleMap.value(groupId)->initFrom(ui->LeftOperatewidget);
+            layout->addWidget(waffleMap.value(groupId)->view);
+            Left_currentView = waffleMap.value(groupId)->view;
+        }else if(kind == materialbox_kind){
+            materialBoxMap.value(groupId)->initFrom(ui->LeftOperatewidget);
+            layout->addWidget(materialBoxMap.value(groupId)->view);
+            Left_currentView = materialBoxMap.value(groupId)->view;
+        }else{
 
-    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;
-    }
+        ui->LeftOperatewidget->setLayout(layout);
+        Left_currentMode = ModeView;
 
-    QVBoxLayout *layout = new QVBoxLayout(operatewidget);
-    materialbox = new MaterialBox(1, operatewidget);
+        Left_scaleFactor = 1.0;
+        applyScale(0);
+    }else if(flag == 1){
+        ui->RightOperatewidget->clearPixmap();
+        QVBoxLayout *layout = new QVBoxLayout(ui->RightOperatewidget);
+        layout->setContentsMargins(0, 0, 0, 0);
+
+        if(kind == wafer_kind){
+            waferMap.value(groupId)->initFrom(ui->RightOperatewidget);
+            layout->addWidget(waferMap.value(groupId)->view);
+            Right_currentView = waferMap.value(groupId)->view;
+        }else if(kind == waffle_kind){
+            waffleMap.value(groupId)->initFrom(ui->RightOperatewidget);
+            layout->addWidget(waffleMap.value(groupId)->view);
+            Right_currentView = waffleMap.value(groupId)->view;
+        }else if(kind == materialbox_kind){
+            materialBoxMap.value(groupId)->initFrom(ui->RightOperatewidget);
+            layout->addWidget(materialBoxMap.value(groupId)->view);
+            Right_currentView = materialBoxMap.value(groupId)->view;
+        }else{
+
+        }
+        ui->RightOperatewidget->setLayout(layout);
+        Right_currentMode = ModeView;
+        Right_scaleFactor = 1.0;
+        applyScale(1);
 
-    layout->setContentsMargins(0, 0, 0, 0);
-    layout->addWidget(materialbox);
-    operatewidget->setLayout(layout);
-    operatewidget->setFixedSize(476, 476);
+    }else{
+        qDebug()<<"parameter has problem";
+    }
 }
 
 // 更新缩放比例
@@ -797,10 +737,10 @@ void MainAndSecondaryCamerasWnd::CheckIs()
 
     if (groupId == lastGroupId) {
         if (lastIndex == 1 ) {
-            if(isShow == true){
-                isShow = false;
+            if(isShow_R == true){
+                isShow_R = false;
             } else {
-                isShow = true;
+                isShow_R = true;
             }
         }
         if (lastLastIndex == 1 && groupId == lastLastGroupId) {
@@ -838,7 +778,7 @@ void MainAndSecondaryCamerasWnd::showAndHide(){
         ui->RedLightprogressBar_2,ui->GreenLightprogressBar_5,
         ui->BlueLightprogressBar_2,ui->DotLightprogressBar_2
     };
-    if(isShow == true){
+    if(isShow_R == true){
         for (QLineEdit* lineEdit : lineEdits) {
             lineEdit->show();
         }
@@ -928,3 +868,5 @@ void MainAndSecondaryCamerasWnd::showAndHide_L(){
         // ui->GreenLightlabel_5->hide();
     }
 }
+
+

OriginalWnd/MainAndSecondaryCamerasWnd.h

@@ -25,6 +25,12 @@ public:
     void initLineEdits();
     void initSliders();
     void initProgressBar();
+    enum kinds{
+        wafer_kind,
+        waffle_kind,
+        materialbox_kind,
+        bond_kind
+    };
 
 public slots: // 确保这里声明了槽函数
     void handleDoubleClick();
@@ -41,9 +47,8 @@ protected:
     void hideEvent(QHideEvent *event) override;
 
     void clearLayout(int flag); // 清除大窗口上当前的布局
-    void WaferWidget(int flag); // 圆晶
-    void WaffleWidget(int flag); // 华夫盒
-    void MaterialBoxWidget(int flag); // 料盒
+    void imageWidget(QString path,int flag,QSize size); //相机图像
+    void KindsofWidget(int flag,int groupId,kinds kind); // 圆晶
 
 private slots:
     void on_LeftZoomUpButton_clicked();
@@ -78,7 +83,7 @@ private:
     Wafer *wafer; // 声明Wafer指针
     Waffle *waffle; // 声明Waffle指针
     MaterialBox *materialbox; // 声明materialbox指针
-    bool isShow;
+    bool isShow_R;
     bool isShow_L;
     QMap<int, Wafer*> waferMap;
     QMap<int, Waffle*> waffleMap;
@@ -90,6 +95,9 @@ private:
     QPoint mousePos;
     double Left_previousScaleFactor;
     double Right_previousScaleFactor;
+    const int last_left = 0;
+    const int current_right = 1;
+
 
     void updateScale(double newScaleFactor, int flag); // 更新缩放比例
     void applyScale(int flag); // 应用缩放

OriginalWnd/SingleCameraOperationWnd.cpp

@@ -239,6 +239,37 @@ void SingleCameraOperationWnd::loadGroupSettings(int Id, int Index) {
         QString percentageStr = QString::number((int)percentage);
         ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
 
+        // clearLayout();
+
+        // // 初始化场景（关键步骤）
+        // if (!operateScene) {
+        //     operateScene = new QGraphicsScene(this);
+        //     ui->Operatewidget->setScene(operateScene); // 假设Operatewidget是QGraphicsView
+        // }
+
+        // // 加载并显示图片
+        // newPixmap = QPixmap(imagePath1);
+        // QPixmap scaledPixmap = newPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+
+        // // 创建图片图形项
+        // QGraphicsPixmapItem* pixmapItem = operateScene->addPixmap(scaledPixmap);
+        // pixmapItem->setZValue(0); // 设置图片在底层
+
+        // // 添加可拖拽线段
+        // currentLine = new DraggableLine;
+        // currentLine->setLine(0, 0, 200, 0); // 初始线段长度200px
+        // currentLine->setZValue(1);         // 设置线段在图片上层
+        // operateScene->addItem(currentLine);
+
+        // // 设置显示参数
+        // currentMode = ModeImage;
+        // scaleFactor = 1.0;
+        // previousScaleFactor = 1.0;
+
+        // // 更新界面显示
+        // ui->Operatewidget->fitInView(pixmapItem, Qt::KeepAspectRatio);
+        // updatePercentageDisplay();
+
     } else if (Index == 2) {
         if (materialWndType == 1) {
             clearLayout();

OriginalWnd/SingleCameraOperationWnd.h

@@ -92,6 +92,8 @@ private : Ui::SingleCameraOperationWnd *ui;
     void updateScale(double newScaleFactor); // 更新缩放比例
     void applyScale(); // 应用缩放
     bool liveClick;
+    QGraphicsScene* operateScene;  // 图形场景
+    DraggableLine* currentLine;    // 当前线段
 };
 
 #endif // SINGLECAMERAOPERATIONWND_H