merge the code

Change-Id: Ic37b028eda661292b25c1baf6cdbdf3209940464

CameraMaterialGroupWnd/MaterialWindow/DieItem.cpp

@@ -11,13 +11,36 @@ DieItem::DieItem(int row, int col, PICK_DIE_STATUS status, qreal size, QGraphics
 
 void DieItem::setSelected(bool selected) {
     if (selected) {
-        setPen(QPen(Qt::green, 0.5));  // 选中时边框变为绿色
+        setPen(QPen(Qt::red, 1));
         setZValue(1);
     } else {
         setPen(QPen(Qt::black, 0.5));  // 未选中时恢复为黑色边框
         setZValue(0);
     }
-    qDebug() << "DieItem clicked: Row:" << row << "Col:" << col;
+    // qDebug() << "DieItem clicked: Row:" << row << "Col:" << col;
+}
+
+void DieItem::setLeftSelected(bool selected) {
+    if (selected) {
+        setPen(QPen(Qt::green, 1));
+        setZValue(1);
+    } else {
+        setPen(QPen(Qt::black, 0.5));  // 未选中时恢复为黑色边框
+        setZValue(0);
+    }
+    // qDebug() << "DieItem clicked: Row:" << row << "Col:" << col;
+
+}
+void DieItem::setRightSelected(bool selected) {
+    if (selected) {
+        setPen(QPen(QColor("#00F5FF"), 1));
+        setZValue(1);
+    } else {
+        setPen(QPen(Qt::black, 0.5));  // 未选中时恢复为黑色边框
+        setZValue(0);
+    }
+    // qDebug() << "DieItem clicked: Row:" << row << "Col:" << col;
+
 }
 
 // void DieItem::mousePressEvent(QGraphicsSceneMouseEvent *event) {

CameraMaterialGroupWnd/MaterialWindow/DieItem.h

@@ -26,6 +26,8 @@ public:
     int getCol() const;
 
     void setSelected(bool selected);
+    void setLeftSelected(bool selected);
+    void setRightSelected(bool selected);
 
 protected:
            // void mousePressEvent(QGraphicsSceneMouseEvent *event) override;

CameraMaterialGroupWnd/MaterialWindow/Wafer.cpp

@@ -8,8 +8,8 @@
 
 Wafer::Wafer(int flag, QWidget *parent) : QWidget(parent) {
     Flag = flag;
-    rows = 50;
-    cols = 50;
+    rows = 51;
+    cols = 51;
     centerX = 25;
     centerY = 25;
     radius = 25;
@@ -102,6 +102,36 @@ void Wafer::paintInitFrom(QWidget *parent) {
         painter.drawRect(x, y, cellSize, cellSize);
     }
 
+    // 根据角度绘制黑点
+    int centerX, centerY;
+    int angle = 0;
+    switch (angle) {
+    case 0: {
+        centerX = offsetX + (cols / 2) * cellSize;
+        centerY = offsetY + (rows - 1) * cellSize;
+        break;
+    }
+    case 90: {
+        centerX = offsetX;
+        centerY = offsetY + (rows / 2) * cellSize;
+        break;
+    }
+    case 180: {
+        centerX = offsetX + (cols / 2) * cellSize;
+        centerY = offsetY;
+        break;
+    }
+    case 270: {
+        centerX = offsetX + (cols - 1) * cellSize;
+        centerY = offsetY + (rows / 2) * cellSize;
+        break;
+    }
+    default:
+        return;
+    }
+
+    painter.setBrush(Qt::black);
+    painter.drawEllipse(centerX - 3, centerY - 3, 6, 6);
     painter.end(); // 结束绘制
 }
 

CameraMaterialGroupWnd/MaterialWindow/Wafer.h

@@ -7,6 +7,10 @@
 #include "WaferGraphicsView.h"
 #include "DieItem.h"
 
+enum OperateMode {
+    ModeImage,  // 显示图片
+    ModeView    // 显示 view
+};
 typedef struct
 {
     double x;

CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.cpp

@@ -3,10 +3,51 @@
 #include <QScrollBar>
 
 WaferGraphicsView::WaferGraphicsView(QGraphicsScene* scene, QWidget* parent)
-    : QGraphicsView(scene, parent), selecting(false), selectionRect(nullptr), scaleFactor(1.0) {
+    : QGraphicsView(scene, parent), selecting(false), selectionRect(nullptr),
+    scaleFactor(1.0), isDragging(false), thumbnailLabel(nullptr),
+    thumbnailVisible(false) {
     setRenderHint(QPainter::Antialiasing);
     // setDragMode(QGraphicsView::ScrollHandDrag); // 支持拖动视图
     setTransformationAnchor(QGraphicsView::AnchorUnderMouse); // 缩放时以鼠标为中心
+    // 初始化缩略图标签
+    thumbnailLabel = new QLabel(this);
+    thumbnailLabel->setFixedSize(150, 150);
+    thumbnailLabel->move(0, 0);  // 默认左上角位置
+    thumbnailLabel->setStyleSheet("background-color: white; border: 1px solid gray;");
+    thumbnailLabel->installEventFilter(this);
+    thumbnailLabel->hide();
+
+    topLeftIndex = qMakePair(-1, -1);
+    bottomRightIndex = qMakePair(-1, -1);
+}
+
+// 事件过滤器用于处理缩略图拖动
+bool WaferGraphicsView::eventFilter(QObject *obj, QEvent *event) {
+    static QPoint dragStartPosition;
+    if (obj == thumbnailLabel) {
+        if (event->type() == QEvent::MouseButtonPress) {
+            QMouseEvent *me = static_cast<QMouseEvent*>(event);
+            dragStartPosition = me->pos();
+            return true;
+        } else if (event->type() == QEvent::MouseMove) {
+            QMouseEvent *me = static_cast<QMouseEvent*>(event);
+
+            // 计算新位置
+            QPoint newPos = thumbnailLabel->pos() + (me->pos() - dragStartPosition);
+
+            // 限制在视图范围内
+            int maxX = this->width() - thumbnailLabel->width();
+            int maxY = this->height() - thumbnailLabel->height();
+
+            // 使用qBound限制坐标范围（0 <= x <= maxX，0 <= y <= maxY）
+            newPos.setX(qBound(0, newPos.x(), maxX));
+            newPos.setY(qBound(0, newPos.y(), maxY));
+
+            thumbnailLabel->move(newPos);
+            return true;
+        }
+    }
+    return QGraphicsView::eventFilter(obj, event);
 }
 
 void WaferGraphicsView::mousePressEvent(QMouseEvent* event) {
@@ -20,14 +61,28 @@ void WaferGraphicsView::mousePressEvent(QMouseEvent* event) {
         }
         selectedItemsMap.clear();
 
+        if (topLeftItem && topLeftItem->scene()) {
+            topLeftItem->setRightSelected(false);
+        }
+        topLeftItem.clear();
+
+        if (bottomRightItem && bottomRightItem->scene()) {
+            bottomRightItem->setRightSelected(false);
+        }
+        bottomRightItem.clear();
+        topLeftIndex = qMakePair(-1, -1);
+        bottomRightIndex = qMakePair(-1, -1);
         // 获取点击位置的 DieItem
-        QGraphicsItem* item = itemAt(event->pos());
-        DieItem* die = dynamic_cast<DieItem*>(item);
-        if (die) {
-            // 将 DieItem 添加到 map 中
-            selectedItemsMap.insert(qMakePair(die->getRow(), die->getCol()), die);
-            die->setSelected(true); // 设置选中状态
+        if (selectedItem && selectedItem->scene()) {
+            selectedItem->setLeftSelected(false);
         }
+        selectedItem.clear();
+        QGraphicsItem* item = itemAt(event->pos());
+		if (item) {
+            selectedItem = dynamic_cast<DieItem*>(item);
+            selectedItem->setLeftSelected(true);
+        
+		}
 
         setCursor(Qt::OpenHandCursor);  // 按下时设置为小手
         selecting = true;
@@ -71,6 +126,22 @@ void WaferGraphicsView::mouseReleaseEvent(QMouseEvent* event) {
     } else if (event->button() == Qt::RightButton && selecting) {
         selecting = false;
         if (selectionRect && isDragging) {
+            if (selectedItem && selectedItem->scene()) {
+                selectedItem->setLeftSelected(false);
+            }
+            selectedItem.clear();
+
+            if (topLeftItem && topLeftItem->scene()) {
+                topLeftItem->setRightSelected(false);
+            }
+            topLeftItem.clear();
+
+            if (bottomRightItem && bottomRightItem->scene()) {
+                bottomRightItem->setRightSelected(false);
+            }
+            bottomRightItem.clear();
+            topLeftIndex = qMakePair(-1, -1);
+            bottomRightIndex = qMakePair(-1, -1);
             QRectF selectedArea = selectionRect->rect();
             scene()->removeItem(selectionRect);
             delete selectionRect;
@@ -93,12 +164,79 @@ void WaferGraphicsView::mouseReleaseEvent(QMouseEvent* event) {
         }
         // 如果没有进行拖动，则弹出右键菜单
         if (!isDragging) {
+            QGraphicsItem* item = itemAt(event->pos());
+            DieItem* die = dynamic_cast<DieItem*>(item);
             QMenu menu;
-            QAction* action1 = menu.addAction("菜单项 1");
-            QAction* action2 = menu.addAction("菜单项 2");
+            QAction* showThumb = menu.addAction(thumbnailVisible ? "隐藏缩略图" : "显示缩略图");
+
+
+            connect(showThumb, &QAction::triggered, [this]{
+            	thumbnailVisible ? hideThumbnail() : showThumbnail();
+			});
+            menu.addAction("发送位置", [this] {
+                if (selectedItem) {
+                    qDebug() << "Row:" << selectedItem->getRow() << "Col:" << selectedItem->getCol();
+                    selectedItem->setLeftSelected(false);
+                    selectedItem = nullptr;
+                }
+            });
+            if (die) {
+                menu.addAction("移动到该位置", [this, die] {
+                    for (auto& item : selectedItemsMap) {
+                        DieItem* die = dynamic_cast<DieItem*>(item);
+                        if (die) {
+                            die->setSelected(false);
+                        }
+                    }
+                    selectedItemsMap.clear();
+
+                    if (topLeftItem && topLeftItem->scene()) {
+                        topLeftItem->setRightSelected(false);
+                    }
+                    topLeftItem.clear();
 
-            connect(action1, &QAction::triggered, this, &WaferGraphicsView::handleAction1);
-            connect(action2, &QAction::triggered, this, &WaferGraphicsView::handleAction2);
+                    if (bottomRightItem && bottomRightItem->scene()) {
+                        bottomRightItem->setRightSelected(false);
+                    }
+                    bottomRightItem.clear();
+                    topLeftIndex = qMakePair(-1, -1);
+                    bottomRightIndex = qMakePair(-1, -1);
+
+                    if (selectedItem && selectedItem->scene()) {
+                        selectedItem->setLeftSelected(false);
+                    }
+                    selectedItem.clear();
+
+                    selectedItem = die;
+                    selectedItem->setLeftSelected(true);
+                });
+
+                // 设置区域边界点菜单
+                menu.addAction("设为左上点", [this, die] {
+                    if (topLeftItem && topLeftItem->scene()) {
+                        topLeftItem->setRightSelected(false);
+                    }
+                    topLeftItem.clear();
+                    topLeftItem = die;
+                    topLeftItem->setRightSelected(true);
+                    topLeftIndex = qMakePair(die->getRow(), die->getCol());
+                    if (bottomRightIndex.first >= 0) checkAndCreateRegion();
+                });
+
+                menu.addAction("设为右下点", [this, die] {
+                    if (bottomRightItem && bottomRightItem->scene()) {
+                        bottomRightItem->setRightSelected(false);
+                    }
+                    bottomRightItem.clear();
+                    bottomRightItem = die;
+                    bottomRightItem->setRightSelected(true);
+                    bottomRightIndex = qMakePair(die->getRow(), die->getCol());
+                    if (topLeftIndex.first >= 0) checkAndCreateRegion();
+                });
+            }
+
+            menu.addAction("清除选中区域", [this] { clearRegion(); });
+            menu.addAction("设置区域", [this] { setRegion(); });
 
             menu.exec(event->globalPos());
         }
@@ -114,11 +252,129 @@ void WaferGraphicsView::wheelEvent(QWheelEvent* event) {
     event->accept();
 }
 
-// 处理右键菜单的动作
-void WaferGraphicsView::handleAction1() {
-    qDebug() << "菜单项 1 被点击";
+// 缩略图功能实现
+void WaferGraphicsView::showThumbnail() {
+    // 本地图片路径（根据实际路径修改）
+    QString imagePath = ":/images/test_image/image_1.png";  // 替换为本地图片路径
+
+    // 加载本地图片
+    QPixmap thumb(imagePath);
+
+    if (!thumb.isNull()) {
+        // 如果图片加载成功，设置为缩略图
+        thumbnailLabel->setPixmap(thumb.scaled(150, 150, Qt::KeepAspectRatio));
+        thumbnailLabel->show();
+        thumbnailVisible = true;
+    } else {
+        // 如果加载图片失败，显示"图片加载失败"
+        thumbnailLabel->setText("图片加载失败");
+        thumbnailLabel->setAlignment(Qt::AlignCenter);  // 居中显示文本
+        thumbnailLabel->show();
+        thumbnailVisible = true;
+    }
+}
+
+void WaferGraphicsView::hideThumbnail() {
+    thumbnailLabel->hide();
+    thumbnailVisible = false;
+    thumbnailLabel->move(0, 0);
+}
+void WaferGraphicsView::checkAndCreateRegion()
+{
+    // 仅当两个点都有效时处理
+    if (topLeftIndex.first < 0 || bottomRightIndex.first < 0) return;
+
+    // 确定行列范围
+    int startRow = qMin(topLeftIndex.first, bottomRightIndex.first);
+    int endRow = qMax(topLeftIndex.first, bottomRightIndex.first);
+    int startCol = qMin(topLeftIndex.second, bottomRightIndex.second);
+    int endCol = qMax(topLeftIndex.second, bottomRightIndex.second);
+
+    // 遍历场景中的所有项
+    foreach (QGraphicsItem* item, scene()->items()) {
+        if (DieItem* die = dynamic_cast<DieItem*>(item)) {
+            int row = die->getRow();
+            int col = die->getCol();
+
+            // 判断是否在区域内
+            if (row >= startRow && row <= endRow &&
+                col >= startCol && col <= endCol) {
+
+                // 更新选中状态
+                die->setSelected(true);
+                selectedItemsMap.insert(qMakePair(row, col), die);
+            }
+        }
+    }
+
+    // 重置索引点
+    topLeftIndex = qMakePair(-1, -1);
+    bottomRightIndex = qMakePair(-1, -1);
+
 }
 
-void WaferGraphicsView::handleAction2() {
-    qDebug() << "菜单项 2 被点击";
+void WaferGraphicsView::clearRegion()
+{
+    // 清空选中的 DieItem
+    for (auto& item : selectedItemsMap) {
+        DieItem* die = dynamic_cast<DieItem*>(item);
+        if (die) {
+            die->setSelected(false); // 取消选中状态
+        }
+    }
+    selectedItemsMap.clear();
+
+    if (selectedItem && selectedItem->scene()) {
+        selectedItem->setLeftSelected(false);
+    }
+    selectedItem.clear();
+
+    if (topLeftItem && topLeftItem->scene()) {
+        topLeftItem->setRightSelected(false);
+    }
+    topLeftItem.clear();
+
+    if (bottomRightItem && bottomRightItem->scene()) {
+        bottomRightItem->setRightSelected(false);
+    }
+    bottomRightItem.clear();
+    topLeftIndex = qMakePair(-1, -1);
+    bottomRightIndex = qMakePair(-1, -1);
+
+    // 清除缩略图
+    hideThumbnail();
+
 }
+void WaferGraphicsView::setRegion()
+{
+    for (auto it = selectedItemsMap.begin(); it != selectedItemsMap.end(); ++it) {
+        QPair<int, int> key = it.key();  // 获取当前元素的 key
+        qDebug() << "Row:" << key.first << ", Col:" << key.second;
+    }
+
+    // 清空选中的 DieItem
+    for (auto& item : selectedItemsMap) {
+        DieItem* die = dynamic_cast<DieItem*>(item);
+        if (die) {
+            die->setSelected(false); // 取消选中状态
+        }
+    }
+    selectedItemsMap.clear();
+
+    if (selectedItem && selectedItem->scene()) {
+        selectedItem->setLeftSelected(false);
+    }
+    selectedItem.clear();
+
+    if (topLeftItem && topLeftItem->scene()) {
+        topLeftItem->setRightSelected(false);
+    }
+    topLeftItem.clear();
+
+    if (bottomRightItem && bottomRightItem->scene()) {
+        bottomRightItem->setRightSelected(false);
+    }
+    bottomRightItem.clear();
+    topLeftIndex = qMakePair(-1, -1);
+    bottomRightIndex = qMakePair(-1, -1);
+}

CameraMaterialGroupWnd/MaterialWindow/WaferGraphicsView.h

@@ -6,20 +6,22 @@
 #include <QGraphicsRectItem>
 #include <QMouseEvent>
 #include "DieItem.h"
+#include <QLabel>
+#include <QPointer>
 
 class WaferGraphicsView : public QGraphicsView {
     Q_OBJECT
 
 public:
     WaferGraphicsView(QGraphicsScene* scene, QWidget* parent = nullptr);
-    void handleAction1();
-    void handleAction2();
+
 
 protected:
     void mousePressEvent(QMouseEvent* event) override;
     void mouseMoveEvent(QMouseEvent* event) override;
     void mouseReleaseEvent(QMouseEvent* event) override;
     void wheelEvent(QWheelEvent* event) override;
+    bool eventFilter(QObject *obj, QEvent *event) override;
 
 private:
     bool selecting; // 是否正在框选
@@ -29,6 +31,21 @@ private:
     double scaleFactor; // 当前缩放比例
     bool isDragging = false;
     QMap<QPair<int, int>, QGraphicsItem*> selectedItemsMap;
+    QLabel *thumbnailLabel; // 缩略图标签
+    bool thumbnailVisible; // 缩略图可见状态
+
+    QPair<int, int> topLeftIndex;
+    QPair<int, int> bottomRightIndex;
+    QPointer<DieItem> selectedItem;
+    QPointer<DieItem> topLeftItem;
+    QPointer<DieItem> bottomRightItem;
+
+    void showThumbnail();
+    void hideThumbnail();
+
+    void checkAndCreateRegion();
+    void clearRegion();
+    void setRegion();
 };
 
 #endif // WAFERGRAPHICSVIEW_H

OriginalWnd/ChartsAndCamerasWnd.h

@@ -10,10 +10,10 @@
 #include "CameraMaterialGroupWnd/MaterialWindow/Waffle.h"
 #include "CameraMaterialGroupWnd/MaterialWindow/MaterialBox.h"
 
-enum OperateMode {
-    ModeImage,  // 显示图片
-    ModeView    // 显示 view
-};
+// enum OperateMode {
+//     ModeImage,  // 显示图片
+//     ModeView    // 显示 view
+// };
 
 namespace Ui {
 class ChartsAndCamerasWnd;

OriginalWnd/DbTreeViewManager.cpp

@@ -1,7 +1,9 @@
 #include "DbTreeViewManager.h"
 #include "OriginalWnd/OriginalWnd.h"
 #include "OriginalWnd/NonInteractiveCheckDelegate.h"
-
+#include <QFile>
+#include <QTextStream>
+#include <QDateTime>
 
 // 构造函数
 DbTreeViewManager::DbTreeViewManager(OriginalWnd* originalWnd, QWidget* widget2, QWidget* parent)
@@ -1435,10 +1437,6 @@ void DbTreeViewManager::displayThirdLevelFields(const QJsonObject &data, bool is
                     createdWidget = inputWidget;
                     // // 连接 textChanged 信号到 lambda 函数
                     connect(lineEdit, &QLineEdit::textChanged, [this,lineEdit,fieldTableName,fieldId,fieldUpLimit,fieldDownLimit]() {
-                        // qDebug() << "Text changed:" << lineEdit->text();
-                        // qDebug() << "Text changed:" << fieldName;
-                        // qDebug() << "Text changed:" << fieldTableName;
-                        // qDebug() << "Text changed111:" << fieldId;
                         if((fieldUpLimit!="")&&(fieldDownLimit!="")){
                             int uplimit = fieldUpLimit.toInt();
                             int downlimit = fieldDownLimit.toInt();
@@ -1487,10 +1485,8 @@ void DbTreeViewManager::displayThirdLevelFields(const QJsonObject &data, bool is
                     createdWidget = lineEdit1;
                     // // 连接 textChanged 信号到 lambda 函数
                     connect(lineEdit1, &QLineEdit::textChanged, [this,lineEdit1,fieldTableName,fieldId]() {
-                        // qDebug() << "Text changed:" << lineEdit1->text();
-                        // qDebug() << "Text changed:" << fieldName;
                         updateDb(fieldTableName,fieldId,lineEdit1->text());
-                        // 在这里添加你想要执行的操作
+                        loginput(fieldTableName,fieldId,lineEdit1->text());
                     });
                 }
             }
@@ -2741,3 +2737,24 @@ void DbTreeViewManager::loadPageState(const PageState &st, bool isByHistoryNav)
         }
     }
 }
+void DbTreeViewManager::loginput(const QString& fieldTableName,const int& fieldId,const QString& modifies){
+    // 获取当前时间并格式化
+    QDateTime currentDateTime = QDateTime::currentDateTime();
+    QString timestamp = currentDateTime.toString("yyyy-MM-dd hh:mm:ss");
+    QString logMessage = QString("%1 :fieldTableName is %2 and fieldId is %3 ,currentvalue is modified %4" ).arg(timestamp).arg(fieldTableName).arg(fieldId).arg(modifies);
+    QString pathoflog = "C:\\Users\\Administrator\\Desktop\\qt\\merge\\gujiangdong\\die-bonder-ui0218\\die-bonder-ui\\log/log.txt";
+    writeLogToFile(logMessage,pathoflog);
+}
+
+void DbTreeViewManager::writeLogToFile(const QString& logMessage, const QString& filePath) {
+    QFile logFile(filePath);
+
+    if (!logFile.open(QIODevice::Append | QIODevice::Text)) {
+        qWarning() << "Cannot open file for writing:" << filePath;
+        return;
+    }
+
+    QTextStream out(&logFile);
+    out << logMessage << "\n";
+    logFile.close();
+}

OriginalWnd/DbTreeViewManager.h

@@ -100,6 +100,14 @@ public:
      */
     void loadExpandedPaths();
 
+    /**
+     * @brief 将日志写入文件中
+     *
+     */
+    void writeLogToFile(const QString& logMessage, const QString& filePath);
+
+    void loginput(const QString& fieldTableName,const int& fieldId,const QString& modifies);
+
     /**
      * @brief 存储已展开路径的容器
      *   格式通常为 "Root/Child/Child" 的字符串

OriginalWnd/MainAndSecondaryCamerasWnd.cpp

@@ -46,6 +46,7 @@ void MainAndSecondaryCamerasWnd::initFrom()
 
     initSliders();
     initLineEdits();
+	initProgressBar();
     // 连接 QSlider 的 valueChanged 信号到 QProgressBar 的 setValue 槽
     connect(ui->RedLightverticalSlider_2, &QSlider::valueChanged, ui->RedLightprogressBar_2, &QProgressBar::setValue);
     connect(ui->BlueLightverticalSlider, &QSlider::valueChanged, ui->BlueLightprogressBar_2, &QProgressBar::setValue);
@@ -89,6 +90,9 @@ void MainAndSecondaryCamerasWnd::initFrom()
             mainLayout->addWidget(widget);
             widgets.append(widget);
         }
+        if(manager->getWafer()) {
+            waferMap.insert(num, manager->getWafer());
+        }
 
         delete manager;
     }
@@ -153,18 +157,33 @@ void MainAndSecondaryCamerasWnd::handleDoubleClick(){
     QPoint leftWidgetLocalPos = ui->LeftOperatewidget->mapFromGlobal(globalMousePos);
     QPoint rightWidgetLocalPos = ui->RightOperatewidget->mapFromGlobal(globalMousePos);
     if (ui->LeftOperatewidget->rect().contains(leftWidgetLocalPos)){
-        QPixmap scaledImage = Left_currentPixmap.scaled(Left_currentPixmap.width(), Left_currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-        ui->LeftOperatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
+        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)){
-        QPixmap scaledImage = Right_currentPixmap.scaled(Right_currentPixmap.width(), Right_currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-        ui->RightOperatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
+        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::initLineEdits() {
@@ -229,30 +248,67 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
     int materialWndType = settings.value("MaterialWndType").toInt();
     QStringList textList = settings.value("TextList").toStringList();
     settings.endGroup();
+    QSettings Last_settings("YourOrganization", "YourApplication");
+    settings.beginGroup(QString::number(lastGroupId));
+    QString Last_imagePath1 = settings.value("ImagePath1").toString();
+    int Last_materialWndType = settings.value("MaterialWndType").toInt();
+    QStringList Last_textList = settings.value("TextList").toStringList();
+    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) {
         isShow = true;
 
-        newPixmap = QPixmap(imagePath1);
+        //newPixmap = QPixmap(imagePath1);
         clearLayout(1);
+        newPixmap = QPixmap(imagePath1);
+        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(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;
         } else if (lastIndex == 2) {
             isShow_L = false;
             clearLayout(0);
-            if (lastGroupId == 1) {
-                WaferWidget(0);
-            } else if (lastGroupId == 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 (lastGroupId == 3) {
+            } else if (Last_materialWndType == 3) {
                 MaterialBoxWidget(0);
             }
         }
@@ -266,41 +322,117 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
         }
 
         if (materialWndType == 1) {
-            if (lastIndex == 2) {
-                isShow_L = false;
-                if (lastGroupId == 1) {
-                    WaferWidget(0);
-                } else if (lastGroupId == 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) {
+				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);
+                } else if (Last_materialWndType == 2) {
                     WaffleWidget(0);
-                } else if (lastGroupId == 3) {
+                } else if (Last_materialWndType == 3) {
                     MaterialBoxWidget(0);
                 }
             }
-            WaferWidget(1);
+            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 == 2) {
-                isShow_L = false;
-                if (lastGroupId == 1) {
-                    WaferWidget(0);
-                } else if (lastGroupId == 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) {
+				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);
+                } else if (Last_materialWndType == 2) {
                     WaffleWidget(0);
-                } else if (lastGroupId == 3) {
+                } else if (Last_materialWndType == 3) {
                     MaterialBoxWidget(0);
                 }
             }
-            WaffleWidget(1);
+            
+			WaffleWidget(1);
         } else if (materialWndType == 3) {
-            if (lastIndex == 2) {
-                isShow_L = false;
-                if (lastGroupId == 1) {
-                    WaferWidget(0);
-                } else if (lastGroupId == 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) {
+				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);
+                } else if (Last_materialWndType == 2) {
                     WaffleWidget(0);
-                } else if (lastGroupId == 3) {
+                } else if (Last_materialWndType == 3) {
                     MaterialBoxWidget(0);
                 }
             }
-            MaterialBoxWidget(1);
+            
+			MaterialBoxWidget(1);
         }
     }
 
@@ -318,27 +450,27 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index) {
     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);
+    // 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();
+    // 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();
 
     if (isUpdatingSettings) {
         lastLastRightPixmap = lastRightPixmap;
@@ -418,137 +550,119 @@ void MainAndSecondaryCamerasWnd::MaterialBoxWidget(int flag) {
     operatewidget->setFixedSize(476, 476);
 }
 
-void MainAndSecondaryCamerasWnd::on_LeftZoomUpButton_clicked()
-{
-    Left_scaleFactor *= 1.1;
+// 更新缩放比例
+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
+        }
+    }
 
-    int newWidth = Left_currentPixmap.width() * Left_scaleFactor;
-    int newHeight = Left_currentPixmap.height() * Left_scaleFactor;
+    applyScale(flag); // 应用缩放
+}
 
-    QPixmap scaledImage = Left_currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+// 应用缩放
+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);
+        }
 
-    ui->LeftOperatewidget->setPixmap(scaledImage);
+        // 更新百分比显示
+        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 = (Left_scaleFactor * 100);
-    QString percentageStr = QString::number((int)percentage);
-    ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
+        // 更新百分比显示
+        double percentage = Right_scaleFactor * 100;
+        QString percentageStr = QString::number((int)percentage);
+        ui->Rightlabel_Percentage->setText(QString("%1%").arg(percentageStr));
+    }
 }
-
-
-void MainAndSecondaryCamerasWnd::on_RightZoomUpButton_clicked()
+void MainAndSecondaryCamerasWnd::on_LeftZoomUpButton_clicked()
 {
-    Right_scaleFactor *= 1.1;
+    mousePos = ui->LeftOperatewidget->geometry().center();
+    updateScale(Left_scaleFactor * 1.1, 0);
 
-    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->setPixmap(scaledImage);
+void MainAndSecondaryCamerasWnd::on_RightZoomUpButton_clicked()
+{
+    mousePos = ui->RightOperatewidget->geometry().center();
+    updateScale(Right_scaleFactor * 1.1, 1);
 
-    double percentage = (Right_scaleFactor * 100);
-    QString percentageStr = QString::number((int)percentage);
-    ui->Rightlabel_Percentage->setText(QString("%1%").arg(percentageStr));
 }
 
 
 void MainAndSecondaryCamerasWnd::on_LeftZoomOutButton_clicked()
 {
-    double Left_newScaleFactor = Left_scaleFactor * 0.9;
-
-    if (Left_newScaleFactor >= 1.0) {
-        Left_scaleFactor = Left_newScaleFactor;
-    } else {
-        Left_scaleFactor = 1.0;
-    }
+    mousePos = ui->LeftOperatewidget->geometry().center();
+    updateScale(Left_scaleFactor * 0.9, 0);
 
-    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->setPixmap(scaledImage);
-
-    double percentage = (Left_scaleFactor * 100);
-    QString percentageStr = QString::number((int)percentage);
-    ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr));
 }
 
 
 void MainAndSecondaryCamerasWnd::on_RightZoomOutButton_clicked()
 {
-    double Right_newScaleFactor = Right_scaleFactor * 0.9;
-
-    if (Right_newScaleFactor >= 1.0) {
-        Right_scaleFactor = Right_newScaleFactor;
-    } else {
-        Right_scaleFactor = 1.0;
-    }
-
-    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->setPixmap(scaledImage);
+    mousePos = ui->RightOperatewidget->geometry().center();
+    updateScale(Right_scaleFactor * 0.9, 1);
 
-    double percentage = (Right_scaleFactor * 100);
-    QString percentageStr = QString::number((int)percentage);
-    ui->Rightlabel_Percentage->setText(QString("%1%").arg(percentageStr));
 }
 
 void MainAndSecondaryCamerasWnd::wheelEvent(QWheelEvent *event)
 {
-    if (ui->LeftOperatewidget->rect().contains(ui->LeftOperatewidget->mapFromGlobal(event->globalPosition().toPoint()))) {
+    if (ui->LeftOperatewidget->rect().contains(ui->LeftOperatewidget->mapFromGlobal(event->globalPos()))) {
+        mousePos = ui->LeftOperatewidget->mapFromGlobal(event->globalPos());
         if (event->angleDelta().y() > 0) {
-            Left_scaleFactor *= 1.1;
+            updateScale(Left_scaleFactor * 1.1, 0); // 放大
         } else {
-            double Left_newScaleFactor = Left_scaleFactor * 0.9;
-
-            if (Left_newScaleFactor >= 1.0) {
-                Left_scaleFactor = Left_newScaleFactor;
-            } else {
-                Left_scaleFactor = 1.0;
-            }
+            updateScale(Left_scaleFactor * 0.9, 0); // 缩小
         }
-
-        int newWidth_left = Left_currentPixmap.width() * Left_scaleFactor;
-        int newHeight_left = Left_currentPixmap.height() * Left_scaleFactor;
-
-        QPixmap scaledImage_left = Left_currentPixmap.scaled(newWidth_left, newHeight_left, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-        // ui->LeftOperatewidget->setPixmap(scaledImage_left);
-        // ui->LeftOperatewidget->setPixmapAndPoint(scaledImage_left);
-
-        double percentage_left = Left_scaleFactor * 100;
-        QString percentageStr_left = QString::number((int)percentage_left);
-        ui->Leftlabel_Percentage->setText(QString("%1%").arg(percentageStr_left));
     }
 
-    if (ui->RightOperatewidget->rect().contains(ui->RightOperatewidget->mapFromGlobal(event->globalPosition().toPoint()))) {
+    if (ui->RightOperatewidget->rect().contains(ui->RightOperatewidget->mapFromGlobal(event->globalPos()))) {
+        mousePos = ui->RightOperatewidget->mapFromGlobal(event->globalPos());
         if (event->angleDelta().y() > 0) {
-            Right_scaleFactor *= 1.1;
+            updateScale(Right_scaleFactor * 1.1, 1); // 放大
         } else {
-            double Right_newScaleFactor = Right_scaleFactor * 0.9;
-
-            if (Right_newScaleFactor >= 1.0) {
-                Right_scaleFactor = Right_newScaleFactor;
-            } else {
-                Right_scaleFactor = 1.0;
-            }
+            updateScale(Right_scaleFactor * 0.9, 1); // 缩小
         }
-
-        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->setPixmap(scaledImage);
-        // ui->RightOperatewidget->setPixmapAndPoint(scaledImage);
-
-        double percentage = Right_scaleFactor * 100;
-        QString percentageStr = QString::number((int)percentage);
-        ui->Rightlabel_Percentage->setText(QString("%1%").arg(percentageStr));
     }
-
     if (ui->scrollArea->rect().contains(ui->scrollArea->mapFromGlobal(event->globalPos()))) {
         // 获取 QScrollArea 的横向滚动条
         QScrollBar *scrollBar = ui->scrollArea->horizontalScrollBar();
@@ -559,8 +673,8 @@ void MainAndSecondaryCamerasWnd::wheelEvent(QWheelEvent *event)
             scrollBar->setValue(scrollBar->value() + 50);
         }
     }
-
-    QMainWindow::wheelEvent(event);
+    
+	QMainWindow::wheelEvent(event);
 }
 
 void MainAndSecondaryCamerasWnd::showEvent(QShowEvent *event) {

OriginalWnd/MainAndSecondaryCamerasWnd.h

@@ -80,6 +80,17 @@ private:
     MaterialBox *materialbox; // 声明materialbox指针
     bool isShow;
     bool isShow_L;
+    QMap<int, Wafer*> waferMap;
+    OperateMode Left_currentMode = ModeImage;
+    OperateMode Right_currentMode = ModeImage;
+    QGraphicsView *Left_currentView = nullptr;
+    QGraphicsView *Right_currentView = nullptr;
+    QPoint mousePos;
+    double Left_previousScaleFactor;
+    double Right_previousScaleFactor;
+
+    void updateScale(double newScaleFactor, int flag); // 更新缩放比例
+    void applyScale(int flag); // 应用缩放
 };
 
 #endif // MAINANDSECONDARYCAMERASWND_H

OriginalWnd/SingleCameraOperationWnd.cpp

@@ -46,6 +46,7 @@ void SingleCameraOperationWnd::initFrom() {
     connectSliderAndLineEdit(ui->BlueLightverticalSlider, ui->BlueLightlineEdit);
     connectSliderAndLineEdit(ui->DotLightverticalSlider, ui->DotLightlineEdit);
 	connect(ui->LiveButton,&QPushButton::clicked,this,&SingleCameraOperationWnd::loadLiveVedio);
+	connect(ui->Operatewidget,&ImageWidget::sendDoubleClicksignal,this,&SingleCameraOperationWnd::handleDoubleClick);
 
     // 设置右上部分
     QWidget *viewport = ui->scrollArea->viewport();
@@ -70,6 +71,9 @@ void SingleCameraOperationWnd::initFrom() {
             widgets.append(widget);
 			groupMap[num] = widget;
         }
+        if(manager->getWafer()) {
+            waferMap.insert(num, manager->getWafer());
+        }
 
         delete manager;
     }
@@ -217,12 +221,32 @@ void SingleCameraOperationWnd::loadGroupSettings(int Id, int Index) {
     QPixmap newPixmap;
     // 判断是实时图片还是物料窗口
     if (Index == 1) {
-        newPixmap = QPixmap(imagePath1);
         clearLayout();
+        newPixmap = QPixmap(imagePath1);
+        QPixmap scaledPixmap = newPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        currentMode = ModeImage;
+        currentPixmap = scaledPixmap;
+        scaleFactor = 1.0;
+        previousScaleFactor = 1.0;
+        ui->Operatewidget->setPixmap(scaledPixmap);
+        double percentage = scaleFactor * 100;
+        QString percentageStr = QString::number((int)percentage);
+        ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
+
     } else if (Index == 2) {
         if (materialWndType == 1) {
             clearLayout();
-            WaferWidget();
+            ui->Operatewidget->clearPixmap();
+            QVBoxLayout *layout = new QVBoxLayout(ui->Operatewidget);
+            waferMap.value(Id)->initFrom(ui->Operatewidget);
+
+            layout->setContentsMargins(0, 0, 0, 0);
+            layout->addWidget(waferMap.value(Id)->view);
+            ui->Operatewidget->setLayout(layout);
+            currentMode = ModeView;
+            currentView = waferMap.value(Id)->view;
+            scaleFactor = 1.0;
+            applyScale();
         } else if (materialWndType == 2) {
             clearLayout();
             WaffleWidget();
@@ -232,13 +256,13 @@ void SingleCameraOperationWnd::loadGroupSettings(int Id, int Index) {
         }
     }
 
-    QPixmap scaledPixmap = newPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    ui->Operatewidget->setPixmap(scaledPixmap);
+    //QPixmap scaledPixmap = newPixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    //ui->Operatewidget->setPixmap(scaledPixmap);
 
     // 更新当前图片的成员变量
-    currentPixmap = scaledPixmap;
-    scaleFactor = 1.0;
-    ui->label_Percentage->setText("100%");
+    //currentPixmap = scaledPixmap;
+    //scaleFactor = 1.0;
+    //ui->label_Percentage->setText("100%");
 
     ui->DatacomboBox->clear();
     ui->DatacomboBox->addItems(textList);
@@ -296,104 +320,76 @@ void SingleCameraOperationWnd::MaterialBoxWidget() {
     ui->Operatewidget->setFixedSize(786, 786);
 }
 
-void SingleCameraOperationWnd::on_ZoomUpButton_clicked() {
-    scaleFactor *= 1.1;
-
-    int newWidth = currentPixmap.width() * scaleFactor;
-    int newHeight = currentPixmap.height() * scaleFactor;
-
-    QPixmap scaledImage = currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-
-    ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
-
-    double percentage = (scaleFactor * 100);
-    QString percentageStr = QString::number((int)percentage);
-    ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
-}
-
-void SingleCameraOperationWnd::on_ZoomOutButton_clicked() {
-    double newScaleFactor = scaleFactor * 0.9;
-
+// 更新缩放比例
+void SingleCameraOperationWnd::updateScale(double newScaleFactor) {
     if (newScaleFactor >= 1.0) {
         scaleFactor = newScaleFactor;
     } else {
-        scaleFactor = 1.0;
+        scaleFactor = 1.0; // 最小缩放比例为 1.0
     }
 
-    int newWidth = currentPixmap.width() * scaleFactor;
-    int newHeight = currentPixmap.height() * scaleFactor;
-
-    QPixmap scaledImage = currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+    applyScale(); // 应用缩放
+}
 
-    ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
+// 应用缩放
+void SingleCameraOperationWnd::applyScale() {
+    if (currentMode == ModeImage) {
+        // 图片模式：缩放图片
+        int newWidth = currentPixmap.width() * scaleFactor;
+        int newHeight = currentPixmap.height() * scaleFactor;
+
+        QPixmap scaledImage = currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        ui->Operatewidget->setPixmapAndPoint(scaledImage, previousScaleFactor, scaleFactor, mousePos);
+        previousScaleFactor = scaleFactor;
+    } else if (currentMode == ModeView && currentView) {
+        // View 模式：缩放 view
+        QTransform transform;
+        transform.scale(scaleFactor, scaleFactor);
+        currentView->setTransform(transform);
+    }
 
+    // 更新百分比显示
     double percentage = scaleFactor * 100;
     QString percentageStr = QString::number((int)percentage);
     ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
 }
+void SingleCameraOperationWnd::on_ZoomUpButton_clicked() {
+    mousePos = ui->Operatewidget->geometry().center();
+    updateScale(scaleFactor * 1.1);
 
-// void SingleCameraOperationWnd::wheelEvent(QWheelEvent *event) {
-//     // 检查鼠标事件是否发生在 Operatewidget 上
-//     if (ui->Operatewidget->rect().contains(ui->Operatewidget->mapFromGlobal(event->globalPos()))) {
-//         if (event->angleDelta().y() > 0) {
-//             scaleFactor *= 1.1;
-//         } else {
-//             double newScaleFactor = scaleFactor * 0.9;
-
-//             // 确保新的缩放因子不小于1.0（即图片的原始大小）
-//             if (newScaleFactor >= 1.0) {
-//                 scaleFactor = newScaleFactor;
-//             } else {
-//                 scaleFactor = 1.0;  // 如果新的缩放因子小于1.0，则直接设置为1.0
-//             }
-//         }
-
-//         int newWidth = currentPixmap.width() * scaleFactor;
-//         int newHeight = currentPixmap.height() * scaleFactor;
-
-//         QPixmap scaledImage = currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-//         ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
-
-
-
-//         double percentage = scaleFactor * 100;
-//         QString percentageStr = QString::number((int)percentage);
-//         ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
-//     }
+}
 
-//     QMainWindow::wheelEvent(event);
-// }
-void SingleCameraOperationWnd::wheelEvent(QWheelEvent *event) {
-        // 检查鼠标事件是否发生在 Operatewidget 上
-        if (ui->Operatewidget->rect().contains(ui->Operatewidget->mapFromGlobal(event->globalPos()))) {
-            if (event->angleDelta().y() > 0) {
-                scaleFactor *= 1.1;
-            } else {
-                double newScaleFactor = scaleFactor * 0.9;
-
-                // 确保新的缩放因子不小于1.0（即图片的原始大小）
-                if (newScaleFactor >= 1.0) {
-                    scaleFactor = newScaleFactor;
-                } else {
-                    scaleFactor = 1.0;  // 如果新的缩放因子小于1.0，则直接设置为1.0
-                }
-            }
+void SingleCameraOperationWnd::on_ZoomOutButton_clicked() {
+    mousePos = ui->Operatewidget->geometry().center();
+    updateScale(scaleFactor * 0.9);
 
-            int newWidth = currentPixmap.width() * scaleFactor;
-            int newHeight = currentPixmap.height() * scaleFactor;
-            qDebug()<<"11111"<<newWidth<<newHeight;
-            QPixmap scaledImage = currentPixmap.scaled(newWidth, newHeight, Qt::KeepAspectRatio, Qt::SmoothTransformation);
-            // ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
-            // ui->Operatewidget->setPixmapAndPoint(scaledImage);
+}
 
 
+void SingleCameraOperationWnd::wheelEvent(QWheelEvent *event)
+{
+    mousePos = ui->Operatewidget->mapFromGlobal(event->globalPos());
 
-            double percentage = scaleFactor * 100;
-            QString percentageStr = QString::number((int)percentage);
-            ui->label_Percentage->setText(QString("%1%").arg(percentageStr));
+    if (ui->Operatewidget->rect().contains(ui->Operatewidget->mapFromGlobal(event->globalPos()))) {
+        if (event->angleDelta().y() > 0) {
+            updateScale(scaleFactor * 1.1); // 放大
+        } else {
+            updateScale(scaleFactor * 0.9); // 缩小
         }
+    }
+    if (ui->scrollArea->rect().contains(ui->scrollArea->mapFromGlobal(event->globalPos()))) {
+        // 获取 QScrollArea 的横向滚动条
+        QScrollBar *scrollBar = ui->scrollArea->horizontalScrollBar();
+        // 根据滚轮滚动方向改变滚动条的值
+        if (event->angleDelta().y() > 0) {
+            scrollBar->setValue(scrollBar->value() - 50);
+        } else {
+            scrollBar->setValue(scrollBar->value() + 50);
+        }
+    }
+
+    QMainWindow::wheelEvent(event);
 
-        QMainWindow::wheelEvent(event);
 }
 
 void SingleCameraOperationWnd::onComboBoxIndexChanged(int index) {
@@ -431,10 +427,18 @@ void SingleCameraOperationWnd::hideEvent(QHideEvent *event) {
 }
 
 void SingleCameraOperationWnd::handleDoubleClick(){
-    QPixmap scaledImage = currentPixmap.scaled(currentPixmap.width(), currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
-    ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
+    if (currentMode == ModeImage) {
+        QPixmap scaledImage = currentPixmap.scaled(currentPixmap.width(), currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
+        ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
+    } else if (currentMode == ModeView && currentView) {
+        QTransform transform;
+        transform.scale(1, 1);
+        currentView->setTransform(transform);
+    }
     scaleFactor = 1.0;
+    previousScaleFactor = 1.0;
     ui->label_Percentage->setText("100%");
+
 }
 
 void SingleCameraOperationWnd::showAndHideButton(){

OriginalWnd/SingleCameraOperationWnd.h

@@ -80,6 +80,14 @@ private:
     ImageGrabber *m_grabber;
     QMap<int, Group*> groupMap;
     int currentCameraId;
+    QMap<int, Wafer*> waferMap;
+    OperateMode currentMode = ModeImage;
+    QGraphicsView *currentView = nullptr;
+    QPoint mousePos;
+    double previousScaleFactor;
+
+    void updateScale(double newScaleFactor); // 更新缩放比例
+    void applyScale(); // 应用缩放
     bool liveClick;
 };
 

SBTdie-bonder-ui.pro.user

@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 14.0.2, 2025-02-18T17:07:06. -->
-<qtcreator>
- <data>
-  <variable>EnvironmentId</variable>
-  <value type="QByteArray">{18ca618c-d623-4564-b8b0-9ee73c53f748}</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="qlonglong">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
-   <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
-   <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
-    <value type="QString" key="language">Cpp</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">CppGlobal</value>
-    </valuemap>
-   </valuemap>
-   <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
-    <value type="QString" key="language">QmlJS</value>
-    <valuemap type="QVariantMap" key="value">
-     <value type="QByteArray" key="CurrentPreferences">QmlJSGlobal</value>
-    </valuemap>
-   </valuemap>
-   <value type="qlonglong" key="EditorConfiguration.CodeStyle.Count">2</value>
-   <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
-   <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
-   <value type="int" key="EditorConfiguration.IndentSize">4</value>
-   <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
-   <value type="int" key="EditorConfiguration.MarginColumn">80</value>
-   <value type="bool" key="EditorConfiguration.MouseHiding">true</value>
-   <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
-   <value type="int" key="EditorConfiguration.PaddingMode">1</value>
-   <value type="int" key="EditorConfiguration.PreferAfterWhitespaceComments">0</value>
-   <value type="bool" key="EditorConfiguration.PreferSingleLineComments">false</value>
-   <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
-   <value type="bool" key="EditorConfiguration.ShowMargin">false</value>
-   <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">2</value>
-   <value type="bool" key="EditorConfiguration.SmartSelectionChanging">true</value>
-   <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
-   <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
-   <value type="int" key="EditorConfiguration.TabSize">8</value>
-   <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
-   <value type="bool" key="EditorConfiguration.UseIndenter">false</value>
-   <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
-   <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
-   <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
-   <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
-   <value type="QString" key="EditorConfiguration.ignoreFileTypes">*.md, *.MD, Makefile</value>
-   <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
-   <value type="bool" key="EditorConfiguration.skipTrailingWhitespace">true</value>
-   <value type="bool" key="EditorConfiguration.tintMarginArea">true</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.PluginSettings</variable>
-  <valuemap type="QVariantMap">
-   <valuemap type="QVariantMap" key="AutoTest.ActiveFrameworks">
-    <value type="bool" key="AutoTest.Framework.Boost">true</value>
-    <value type="bool" key="AutoTest.Framework.CTest">false</value>
-    <value type="bool" key="AutoTest.Framework.Catch">true</value>
-    <value type="bool" key="AutoTest.Framework.GTest">true</value>
-    <value type="bool" key="AutoTest.Framework.QtQuickTest">true</value>
-    <value type="bool" key="AutoTest.Framework.QtTest">true</value>
-   </valuemap>
-   <value type="bool" key="AutoTest.ApplyFilter">false</value>
-   <valuemap type="QVariantMap" key="AutoTest.CheckStates"/>
-   <valuelist type="QVariantList" key="AutoTest.PathFilters"/>
-   <value type="int" key="AutoTest.RunAfterBuild">0</value>
-   <value type="bool" key="AutoTest.UseGlobal">true</value>
-   <valuemap type="QVariantMap" key="ClangTools">
-    <value type="bool" key="ClangTools.AnalyzeOpenFiles">true</value>
-    <value type="bool" key="ClangTools.BuildBeforeAnalysis">true</value>
-    <value type="QString" key="ClangTools.DiagnosticConfig">Builtin.DefaultTidyAndClazy</value>
-    <value type="int" key="ClangTools.ParallelJobs">6</value>
-    <value type="bool" key="ClangTools.PreferConfigFile">true</value>
-    <valuelist type="QVariantList" key="ClangTools.SelectedDirs"/>
-    <valuelist type="QVariantList" key="ClangTools.SelectedFiles"/>
-    <valuelist type="QVariantList" key="ClangTools.SuppressedDiagnostics"/>
-    <value type="bool" key="ClangTools.UseGlobalSettings">true</value>
-   </valuemap>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value type="QString" key="DeviceType">Desktop</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop Qt 5.15.2 MinGW 64-bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop Qt 5.15.2 MinGW 64-bit</value>
-   <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">qt.qt5.5152.win64_mingw81_kit</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
-   <value type="qlonglong" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
-    <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\new2\die-bonder-ui\build\Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/new2/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Debug</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\new2\die-bonder-ui\build\Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/new2/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Release</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Release</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="int" key="QtQuickCompiler">0</value>
-   </valuemap>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
-    <value type="int" key="EnableQmlDebugging">0</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory">D:\new2\die-bonder-ui\build\Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
-    <value type="QString" key="ProjectExplorer.BuildConfiguration.BuildDirectory.shadowDir">D:/new2/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Profile</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
-      <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
-      <valuelist type="QVariantList" key="QtProjectManager.QMakeBuildStep.SelectedAbis"/>
-     </valuemap>
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">构建</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
-    </valuemap>
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
-     <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
-      <value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
-      <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
-      <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
-     </valuemap>
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">清除</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.CustomParsers"/>
-    <value type="bool" key="ProjectExplorer.BuildConfiguration.ParseStandardOutput">false</value>
-    <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Profile</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
-    <value type="int" key="QtQuickCompiler">0</value>
-    <value type="int" key="SeparateDebugInfo">0</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.BuildConfigurationCount">3</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
-    <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
-     <value type="qlonglong" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">部署</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">部署</value>
-     <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
-    </valuemap>
-    <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
-    <valuemap type="QVariantMap" key="ProjectExplorer.DeployConfiguration.CustomData"/>
-    <value type="bool" key="ProjectExplorer.DeployConfiguration.CustomDataEnabled">false</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
-   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <value type="bool" key="Analyzer.Perf.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.QmlProfiler.Settings.UseGlobalSettings">true</value>
-    <value type="int" key="Analyzer.Valgrind.Callgrind.CostFormat">0</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="QList&lt;int&gt;" key="Analyzer.Valgrind.VisibleErrorKinds"></value>
-    <valuelist type="QVariantList" key="CustomOutputParsers"/>
-    <value type="int" key="PE.EnvironmentAspect.Base">2</value>
-    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
-    <value type="bool" key="PE.EnvironmentAspect.PrintOnRun">false</value>
-    <value type="QString" key="PerfRecordArgsId">-e cpu-cycles --call-graph &quot;dwarf,4096&quot; -F 250</value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
-    <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4RunConfiguration:D:/new2/die-bonder-ui/SBTdie-bonder-ui.pro</value>
-    <value type="QString" key="ProjectExplorer.RunConfiguration.BuildKey">D:/new2/die-bonder-ui/SBTdie-bonder-ui.pro</value>
-    <value type="bool" key="ProjectExplorer.RunConfiguration.Customized">false</value>
-    <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
-    <value type="bool" key="RunConfiguration.UseLibrarySearchPath">true</value>
-    <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
-    <value type="QString" key="RunConfiguration.WorkingDirectory.default">D:/new2/die-bonder-ui/build/Desktop_Qt_5_15_2_MinGW_64_bit-Debug</value>
-   </valuemap>
-   <value type="qlonglong" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="qlonglong">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">22</value>
- </data>
- <data>
-  <variable>Version</variable>
-  <value type="int">22</value>
- </data>
-</qtcreator>