功能改进：修改软件崩溃,完善功能

View/die-bonder-ui/CameraMaterialGroupWnd/CameraImage/CameraImageHandler.h

@@ -30,17 +30,19 @@ private:
     void initGroup(int CameraId);
 
 private:
-    Group* m_pGroup;  // 存储 Group 对象的容器
+    /**存储 Group 对象的容器
+     */
+    Group* m_pGroup = nullptr; 
 
     /**晶圆台
      */
-    Wafer* m_pWafer;
+    Wafer* m_pWafer = nullptr;
 
     /**华夫盒
      */
-    Waffle* waffle;
+    Waffle* waffle = nullptr;
 
-    MaterialBox* materialBox;
+    MaterialBox* materialBox = nullptr;
 
     int MaterialWindowType; // 物料窗口类型标识，1代表圆晶 后面接口获取标识
 };

View/die-bonder-ui/CameraMaterialGroupWnd/Group.h

@@ -62,9 +62,9 @@ private:
     Ui::Group *ui;
 
     int             m_nCurrentGroupId;
-    Wafer *         m_pWafer; // 声明Wafer指针
-    Waffle *        m_pWaffle; // 声明Waffle指针
-    MaterialBox *   m_pMaterialbox; // 声明materialbox指针
+    Wafer *         m_pWafer        =nullptr; // 声明Wafer指针
+    Waffle *        m_pWaffle       = nullptr; // 声明Waffle指针
+    MaterialBox *   m_pMaterialbox  = nullptr; // 声明materialbox指针
     static Group*   m_pCurrentlySelectedGroup; // 当前选中（红色边框）的实例
     static Group*   m_pPreviouslySelectedBlueGroup; // 上一次选中且边框为蓝色的实例
     static Group*   m_pLastClickedGroup; // 上一次点击的实例

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/Wafer.h

@@ -25,12 +25,6 @@ public:
     QPixmap getGlobalPixmap() const;
 
     QColor getColorByStatus(ns_mat::PICK_DIE_STATUS status);
-    QGraphicsScene* scene;
-    WaferGraphicsView *view;
-
-protected:
-
-private slots:
 
 signals:
     void sendCoordinates(int x, int y);
@@ -43,6 +37,9 @@ private:
     qreal radius;
     QMenu *contextMenu = nullptr;
     QPixmap globalPixmap;
+public:
+    QGraphicsScene* scene = nullptr;
+    WaferGraphicsView* view = nullptr;
 };
 
 #endif // WAFER_H

View/die-bonder-ui/CameraMaterialGroupWnd/MaterialWindow/Waffle.h

@@ -20,9 +20,7 @@ public:
     void initFrom(QWidget *parent);
     void paintInitFrom(QWidget *parent);
     QPixmap getGlobalPixmap() const;
-    QGraphicsScene* scene;
-    WaffleGraphicsView *view;
-protected:
+
 private:
     void drawWaffle(QPainter &painter, int startX, int startY, int rows, int cols, int gridSize, int gap);
 
@@ -39,6 +37,10 @@ private:
     QVector<ns_mat::WAFFLE_MATRIX_POINT_STRUCT> waffleData;
     int centerX, centerY;
     QPixmap globalPixmap;
+
+public:
+    QGraphicsScene*     scene = nullptr;
+    WaffleGraphicsView* view = nullptr;
 };
 
 #endif // WAFFLE_H

View/die-bonder-ui/ImageWidget.cpp

@@ -64,7 +64,7 @@ void ImageWidget::paintEvent(QPaintEvent *event)
         }
         painter.drawPixmap(imageOffset.x(), imageOffset.y(), pixmap);
 
-        QRect targetRect = { 476,476,476,476 };
+        QRect targetRect = { 493,493,493,493 };
         if (m_nSingleCameraOperationWnd)
         {
             targetRect = { 794,794,794,794 };
@@ -73,14 +73,24 @@ void ImageWidget::paintEvent(QPaintEvent *event)
         drawCross(&painter, targetRect);
         //DrawCrossWithScale(&painter, pixmapWidth, pixmapHeight, { 476,300 }, { 300,300 });
     }
+
+    QWidget::paintEvent(event);
 }
 
-void ImageWidget::mousePressEvent(QMouseEvent *event) {
-    if (event->button() == Qt::LeftButton) {
-        lastMousePos = event->pos(); // 记录鼠标按下时的位置
-        isDragging = true; // 设置正在拖动的标志
-        setCursor(Qt::OpenHandCursor);
+void ImageWidget::mousePressEvent(QMouseEvent *event) 
+{
+    if (event->button() == Qt::LeftButton) 
+    {
+        lastMousePos = event->pos();
+        isDragging = true; 
+        setCursor(Qt::BlankCursor);
     }
+    else if (event->button() == Qt::RightButton)
+    {
+        unsetCursor();
+    }
+
+    QWidget::mousePressEvent(event);
 }
 
 void ImageWidget::mouseMoveEvent(QMouseEvent *event) {
@@ -90,6 +100,8 @@ void ImageWidget::mouseMoveEvent(QMouseEvent *event) {
         lastMousePos = event->pos(); // 更新鼠标位置
         update();
     }
+
+    QWidget::mouseMoveEvent(event);
 }
 
 void ImageWidget::mouseReleaseEvent(QMouseEvent *event) {
@@ -97,6 +109,8 @@ void ImageWidget::mouseReleaseEvent(QMouseEvent *event) {
         isDragging = false; // 重置正在拖动的标志
         setCursor(Qt::ArrowCursor);
     }
+
+    QWidget::mouseReleaseEvent(event);
 }
 void ImageWidget::mouseDoubleClickEvent(QMouseEvent *event){
     if (event->type() == QEvent::MouseButtonDblClick) {

View/die-bonder-ui/MainWnd.cpp

@@ -22,6 +22,8 @@ MainWnd::MainWnd(QWidget* parent)
 
 MainWnd::~MainWnd()
 {
+    m_pCameraBind->deleteLater();
+
     delete ui;
 }
 
@@ -207,7 +209,7 @@ void MainWnd::ShowOriginalWndSlots()
 {
     if (m_pOriginalWnd == nullptr) //防止重复创建
     {
-        m_pOriginalWnd = new OriginalWnd(this, m_pCameraBind.get());
+        m_pOriginalWnd = new OriginalWnd(this, m_pCameraBind);
         ui->stackedWidget_UI->addWidget(m_pOriginalWnd);
         connect(this, &MainWnd::setLanguageSignal, m_pOriginalWnd, &OriginalWnd::onHandleLanguageSignal);
     }
@@ -832,7 +834,7 @@ void MainWnd::Init()
     m_sqlOper = &SqlOperation::GetInstance();
     m_sqlOper->LoadSql();
 
-    m_pCameraBind.reset(new CameraBind);
+    m_pCameraBind = new CameraBind;
 
 
     int themeValue = gen_if.getThemeValue();

View/die-bonder-ui/MainWnd.h

@@ -88,7 +88,7 @@ private:
 
     /**相机绑定接口
     */
-    std::unique_ptr<CameraBind> m_pCameraBind;
+    QPointer<CameraBind> m_pCameraBind;
 
     /**原始窗口？
      */

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

@@ -34,8 +34,6 @@ struct STR_TEMPLATE
 // 当前选择的Group
 struct ST_CURRENT_SELECT_GROUP
 {
-    QList<Group*>       liGroup; // 当前窗口所有的Group
-
     /**当前选中的
      */
     Group*              pSelectGroup;

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

@@ -35,7 +35,6 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget *parent)
 
 MainAndSecondaryCamerasWnd::~MainAndSecondaryCamerasWnd()
 {
-    m_pMainCameraBind = nullptr;
 
     delete ui;
 }
@@ -110,7 +109,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
             if (widget != nullptr)
             {
                 mainLayout->addWidget(widget);
-                m_currentSelectGroup.liGroup.append(widget);
+                m_allGroup.append(widget);
             }
             if (manager->getWafer())
             {
@@ -130,7 +129,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
         int minHeight = 162;
         int maxWidth = 244;
         int num = -28;
-        for (Group* w : m_currentSelectGroup.liGroup)
+        for(Group* w : m_allGroup)
         {
             w->setMinimumHeight(minHeight);
             w->setMaximumWidth(maxWidth);
@@ -146,7 +145,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
         // 只有一个相机的情况，直接绑定
         if (numbers.size() == 1)
         {
-            Group* pGroup = m_currentSelectGroup.liGroup[0];
+            Group* pGroup = m_allGroup[0];
             connect(pGroup, &Group::SetUpDataImageShowSig,
                 this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0);
 
@@ -158,7 +157,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
 
             m_veCurrentSelectGroup.push_back(_curr);
 
-            UpdataLightJoystickSwitchPage(pGroup);
+            UpdataLightJoystickSwitchPage();
         }
     } 
 }
@@ -379,13 +378,17 @@ void MainAndSecondaryCamerasWnd::HideLayout(QHBoxLayout* layout, bool isHide)
     }
 }
 
-void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage(Group* pGroup)
+void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage()
 {
-    auto Fun = [&](LightJoystickSwitchPage* p, bool bShow)
+    auto Fun = [&](Group* pGroup,LightJoystickSwitchPage* p, ControlOperationPage* pContPage, bool bShow)
     {
         p->UpdatemPageGroup(pGroup);
         p->InitMainCameraBind(m_pMainCameraBind, bShow);
         p->HideOrShowPage(bShow);
+        if (bShow)
+        {
+            pContPage->UpDateCameraBind(m_pMainCameraBind);
+        }
     };
 
     for (int i = 0; i < m_veCurrentSelectGroup.size(); i++)
@@ -398,7 +401,7 @@ void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage(Group* pGroup)
             {
                 bShow = true;
             }
-            Fun(ui->control_L, bShow);
+            Fun(m_veCurrentSelectGroup[0].pSelectGroup,ui->control_L,ui->viewwidgetgroup_L, bShow);
 
         }
         else if (i == 1)
@@ -408,7 +411,7 @@ void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage(Group* pGroup)
             {
                 bShow = true;
             }
-            Fun(ui->control_L, bShow);
+            Fun(m_veCurrentSelectGroup[1].pSelectGroup,ui->control_L, ui->viewwidgetgroup_R, bShow);
 
         }
     }
@@ -421,13 +424,6 @@ void MainAndSecondaryCamerasWnd::timerEvent(QTimerEvent* event)
     int nID = event->timerId();
 }
 
-
-
-
-
-
-
-
 void MainAndSecondaryCamerasWnd::ResetIdleTimer(bool bStart /*= false*/)
 {
     if (bStart)
@@ -454,7 +450,7 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
     // 绑定操作，用来初始化
     ST_CURRENT_SELECT_GROUP _curr;
     _curr.isBond = true;
-    m_currentSelectGroup.nGroupId = groupId;
+
     //2. 开始干活
     int nOnClickGroupId = groupId - 1; // 这里new 有些是0,有些是1 暂时选择
     if (m_pMainCameraBind->m_vecCamera.size() > nOnClickGroupId)
@@ -468,7 +464,7 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
 
     _curr.nSelectLeft1 = nIndex; // 是否选中窗口
 
-    Group* pGroup = m_currentSelectGroup.liGroup[nOnClickGroupId];
+    Group* pGroup = m_allGroup.at(nOnClickGroupId);
     _curr.pSelectGroup = pGroup;
 
     // 1.判断当前是否存储
@@ -516,11 +512,35 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
         }
         
         m_veCurrentSelectGroup.push_back(_curr); 
-        UpdataLightJoystickSwitchPage(pGroup);
+        UpdataLightJoystickSwitchPage();
     }
     else
     {
-        if (m_veCurrentSelectGroup[0].pSelectGroup != _curr.pSelectGroup)
+        if (m_veCurrentSelectGroup.size() > 0)
+        {
+            if (m_veCurrentSelectGroup[0].pSelectGroup != _curr.pSelectGroup)
+            {
+                if (m_veCurrentSelectGroup.size() == 1)
+                {
+                    connect(pGroup, &Group::SetUpDataImageShowSig,
+                        this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals4);
+                }
+                else
+                {
+                    connect(pGroup, &Group::SetUpDataImageShowSig,
+                        this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0);
+                }
+                m_veCurrentSelectGroup.push_back(_curr);
+                
+            }
+            else
+            {
+                m_veCurrentSelectGroup.clear();
+                m_veCurrentSelectGroup.push_back(_curr);
+            }
+            UpdataLightJoystickSwitchPage();
+        }
+        else
         {
             if (m_veCurrentSelectGroup.size() == 1)
             {
@@ -533,8 +553,9 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
                     this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0);
             }
             m_veCurrentSelectGroup.push_back(_curr);
-            UpdataLightJoystickSwitchPage(pGroup);
+            UpdataLightJoystickSwitchPage();
         }
+        
     }
 }
 

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

@@ -3,6 +3,7 @@
 
 #include <QSlider>
 #include <QLineEdit>
+#include <QStack>
 #include <QHBoxLayout>
 #include "CameraMaterialGroupWnd/MaterialWindow/MaterialBox.h"
 #include "CameraMaterialGroupWnd/CameraImage/CameraImageHandler.h"
@@ -93,7 +94,7 @@ private:
 
     /**更新灯光显示
      */
-    void UpdataLightJoystickSwitchPage(Group* pGroup);
+    void UpdataLightJoystickSwitchPage();
 
 private:
     Ui::MainAndSecondaryCamerasWnd *ui;
@@ -136,9 +137,11 @@ private:
 
     /**当前选中的group
      */
-    std::vector<ST_CURRENT_SELECT_GROUP> m_veCurrentSelectGroup = {};
+    std::vector<ST_CURRENT_SELECT_GROUP> m_veCurrentSelectGroup;
 
-    ST_CURRENT_SELECT_GROUP m_currentSelectGroup = {};
+    /**保存所有的后续使用
+    */
+    QStack<Group*> m_allGroup;
 
     int m_nIdex = 0;
 

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

@@ -12,10 +12,11 @@ SingleCameraOperationWnd::SingleCameraOperationWnd(QWidget *parent)
     , ui(new Ui::SingleCameraOperationWnd), scaleFactor(1.0)
 {
     ui->setupUi(this);
-    ui->viewwidgetgroup->resizeSingleUI();
+    ui->viewwidgetgroup->resizeSingleUI(true);
     ui->lightJoystickSwitchPage->resizeSingleUI();
     isShow = true;
     liveClick = true;
+
     initFrom();
 }
 

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

@@ -234,6 +234,7 @@
     <ClCompile Include="gen_interface.cpp" />
     <ClCompile Include="main.cpp" />
     <ClCompile Include="Src\CameraBind.cpp" />
+    <ClCompile Include="Src\common\GlobalUse\JMouseMonitorThread.cpp" />
     <ClCompile Include="Src\common\JLogAllOutput.cpp" />
     <ClCompile Include="Src\common\JMessageTip.cpp" />
     <ClCompile Include="Src\common\JUserAccountsData.cpp" />
@@ -257,6 +258,7 @@
     <ClInclude Include="CameraMaterialGroupWnd\MaterialWindow\DraggableLine.h" />
     <QtMoc Include="CameraMaterialGroupWnd\MaterialWindow\MaterialBoxGraphicsView.h" />
     <ClInclude Include="JUserAccountsData.h" />
+    <QtMoc Include="Src\common\GlobalUse\JMouseMonitorThread.h" />
     <ClInclude Include="Src\common\JLogAllOutput.h" />
     <QtMoc Include="Src\common\JMessageTip.h" />
     <ClInclude Include="Src\common\JUserAccountsData.h" />

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

@@ -124,6 +124,9 @@
     <Filter Include="Source Files\Src\RewriteControl\MsgDlg">
       <UniqueIdentifier>{b469d2d0-374c-4e79-bb6f-5ffc5c55aaa2}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Src\common\GlobalUse">
+      <UniqueIdentifier>{2cb77129-4457-44f2-87f2-6a65f01a5d62}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ImageWidget.cpp">
@@ -240,6 +243,9 @@
     <ClCompile Include="Src\RewriteControl\ControlOperationPage.cpp">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </ClCompile>
+    <ClCompile Include="Src\common\GlobalUse\JMouseMonitorThread.cpp">
+      <Filter>Source Files\Src\common\GlobalUse</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
@@ -320,6 +326,9 @@
     <QtMoc Include="Src\RewriteControl\ControlOperationPage.h">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </QtMoc>
+    <QtMoc Include="Src\common\GlobalUse\JMouseMonitorThread.h">
+      <Filter>Source Files\Src\common\GlobalUse</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">

View/die-bonder-ui/Src/CameraBind.cpp

@@ -18,7 +18,7 @@ CameraBind::CameraBind()
 
 CameraBind::~CameraBind()
 {
-    m_pCViewInterface = nullptr;
+   // m_pCViewInterface = nullptr;
 }
 
 void CameraBind::SetImageWnd(QWidget* pImageWnd)
@@ -203,7 +203,7 @@ ST_LIGHT_VAL CameraBind::JGetLight(int iCameraId)
         return {};
     }
 
-    ST_LIGHT_VAL _val;
+    ST_LIGHT_VAL _val = {};
     m_pCViewInterface->GetLight(iCameraId, 
         _val.redLightValue, 
         _val.greenLightValue,
@@ -261,3 +261,13 @@ long CameraBind::JViewExit()
 
     return m_pCViewInterface->ViewExit();
 }
+
+long CameraBind::JCameraMove(int iCameraId, double x, double y)
+{
+    if (m_pCViewInterface == nullptr)
+    {
+        return -1;
+    }
+
+    return m_pCViewInterface->CameraMove(iCameraId, x, y);
+}

View/die-bonder-ui/Src/CameraBind.h

@@ -85,6 +85,10 @@ public:
      */
     long JViewExit();
 
+    /**移动相机轴
+     */
+    long JCameraMove(int iCameraId, double x, double y);
+
 signals:
     /**通用图像传输
     *        哪里需要绑哪里

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.cpp

@@ -7,7 +7,7 @@ ControlOperationPage::ControlOperationPage(QWidget* parent)
 {
     ui->setupUi(this);
 
-    HideLayout(false);
+    InitWnd();
 }
 
 ControlOperationPage::~ControlOperationPage()
@@ -47,21 +47,25 @@ void ControlOperationPage::clearLayout() {
     }
 }
 
-void ControlOperationPage::on_ZoomUpButton_clicked() {
+void ControlOperationPage::on_ZoomUpButton_clicked()
+{
     m_mousePos = ui->Operatewidget->geometry().center();
     updateScale(m_scaleFactor * 1.1);
 
 }
 
-void ControlOperationPage::on_ZoomOutButton_clicked() {
+void ControlOperationPage::on_ZoomOutButton_clicked() 
+{
     m_mousePos = ui->Operatewidget->geometry().center();
     updateScale(m_scaleFactor * 0.9);
 
 }
 
 // 更新缩放比例
-void ControlOperationPage::updateScale(double newScaleFactor) {
-    if (newScaleFactor >= 1.0) {
+void ControlOperationPage::updateScale(double newScaleFactor)
+{
+    if (newScaleFactor >= 1.0) 
+    {
         m_scaleFactor = newScaleFactor;
     }
     else {
@@ -72,8 +76,10 @@ void ControlOperationPage::updateScale(double newScaleFactor) {
 }
 
 // 应用缩放
-void ControlOperationPage::applyScale() {
-    if (m_currentMode == ModeImage) {
+void ControlOperationPage::applyScale() 
+{
+    if (m_currentMode == ModeImage)
+    {
         // 图片模式：缩放图片
         int newWidth = m_currentPixmap.width() * m_scaleFactor;
         int newHeight = m_currentPixmap.height() * m_scaleFactor;
@@ -82,7 +88,8 @@ void ControlOperationPage::applyScale() {
         ui->Operatewidget->setPixmapAndPoint(scaledImage, m_previousScaleFactor, m_scaleFactor, m_mousePos);
         m_previousScaleFactor = m_scaleFactor;
     }
-    else if (m_currentMode == ModeView && m_currentView) {
+    else if (m_currentMode == ModeView && m_currentView)
+    {
         // View 模式：缩放 view
         QTransform transform;
         transform.scale(m_scaleFactor, m_scaleFactor);
@@ -96,11 +103,13 @@ void ControlOperationPage::applyScale() {
 }
 
 void ControlOperationPage::handleDoubleClick() {
-    if (m_currentMode == ModeImage) {
+    if (m_currentMode == ModeImage) 
+    {
         QPixmap scaledImage = m_currentPixmap.scaled(m_currentPixmap.width(), m_currentPixmap.height(), Qt::KeepAspectRatio, Qt::SmoothTransformation);
         ui->Operatewidget->setPixmap(scaledImage); // 这里传递缩放后的图片
     }
-    else if (m_currentMode == ModeView && m_currentView) {
+    else if (m_currentMode == ModeView && m_currentView) 
+    {
         QTransform transform;
         transform.scale(1, 1);
         m_currentView->setTransform(transform);
@@ -126,35 +135,51 @@ void ControlOperationPage::updateMaterialWidget(kinds materialWndType)
 
 void ControlOperationPage::KindsofWidget(kinds kind)
 {
+    bool isRun = false;
     ui->Operatewidget->clearPixmap();
     QVBoxLayout* layout = new QVBoxLayout(ui->Operatewidget);
     layout->setContentsMargins(0, 0, 0, 0);
     m_currentMode = ModeView;
     if (kind == wafer_kind)
     {
-        m_wafer->initFrom(ui->Operatewidget);
-        layout->addWidget(m_wafer->view);
-        m_currentView = m_wafer->view;
+        if (m_wafer)
+        {
+            isRun = true;
+            m_wafer->initFrom(ui->Operatewidget);
+            layout->addWidget(m_wafer->view);
+            m_currentView = m_wafer->view;
+        }
     }
     else if (kind == waffle_kind)
     {
-        m_waffle->initFrom(ui->Operatewidget);
-        layout->addWidget(m_waffle->view);
-        m_currentView = m_waffle->view;
+        if (m_waffle)
+        {
+            isRun = true;
+            m_waffle->initFrom(ui->Operatewidget);
+            layout->addWidget(m_waffle->view);
+            m_currentView = m_waffle->view;
+        }
     }
     else if (kind == materialbox_kind)
     {
-        m_materialbox->initFrom(ui->Operatewidget);
-        layout->addWidget(m_materialbox->view);
-        m_currentView = m_materialbox->view;
+        if (m_materialbox)
+        {
+            isRun = true;
+            m_materialbox->initFrom(ui->Operatewidget);
+            layout->addWidget(m_materialbox->view);
+            m_currentView = m_materialbox->view;
+        }
+        
     }
 
-    ui->Operatewidget->setLayout(layout);
-    m_currentMode = ModeView;
-
-    m_scaleFactor = 1.0;
-    applyScale();
+    if (isRun)
+    {
+        ui->Operatewidget->setLayout(layout);
+        m_currentMode = ModeView;
 
+        m_scaleFactor = 1.0;
+        applyScale();
+    }
 }
 
 void ControlOperationPage::setWafer(Wafer* wafer) {
@@ -176,17 +201,6 @@ void ControlOperationPage::setMaterialBox(MaterialBox* materialbox) {
 
 void ControlOperationPage::initForm()
 {
-    {
-        // 后面在做
-        //if (m_pMainCameraBind != nullptr)
-        //{
-        //    DeduplicationBox(ui->axisComboBox, m_pMainCameraBind->m_vecCAxis, 0);
-        //    DeduplicationBox(ui->axisTypeComboBox, m_pMainCameraBind->m_vecCAxis, 1);
-        //}
-    }
-
-
-
     connect(ui->Operatewidget, &ImageWidget::sendDoubleClicksignal, this, &ControlOperationPage::handleDoubleClick);
     ui->Operatewidget->setMouseTracking(true);
 }
@@ -196,7 +210,8 @@ ImageWidget* ControlOperationPage::getOperatewidget()
     return ui->Operatewidget;
 }
 
-void ControlOperationPage::resizeSingleUI() {
+void ControlOperationPage::resizeSingleUI(bool bMax /*= false*/)
+{
     ui->DataSources->setGeometry(QRect(20, 20, 400, 32));
     ui->Operatewidget->setGeometry(QRect(5, 5, 786, 786));
     //ui->line_2->setGeometry(QRect(826, 20, 1, 953));
@@ -214,6 +229,11 @@ void ControlOperationPage::resizeSingleUI() {
     ui->horizontalLayout->setGeometry(QRect(12, 882, 786, 32));
     
     ui->BackGround->setGeometry(QRect(16, 68, 794, 794));
+
+    if (bMax)
+    {
+        ui->Operatewidget->m_nSingleCameraOperationWnd = true;
+    }
 }
 
 void ControlOperationPage::resizeChartsAndCamerasUI() {
@@ -221,11 +241,38 @@ void ControlOperationPage::resizeChartsAndCamerasUI() {
 }
 
 
+void ControlOperationPage::UpDateCameraBind(CameraBind* pCameraBind)
+{
+    m_pCameraBindCopy = pCameraBind;
+
+    // 有指针了在去刷新
+//    if (m_pCameraBindCopy != nullptr)
+//    {
+//        DeduplicationBox(ui->moduleTypeComboBox, m_pCameraBindCopy->m_vecCAxis, 0);
+//        DeduplicationBox(ui->axisTypeComboBox, m_pCameraBindCopy->m_vecCAxis, 1);
+//    }
+}
+
 void ControlOperationPage::on_switchJoystickBut_clicked()
 {
     ResetIdleTimer(true);
 }
 
+void ControlOperationPage::MouseMovedSlots(const QPoint& delta)
+{
+    qDebug() << "MouseMovedSlots：" << delta;
+    if (m_pCameraBindCopy)
+    {
+        m_pCameraBindCopy->JCameraMove(0, delta.x(), delta.y());
+    }
+    
+}
+
+void ControlOperationPage::RequestCursorMoveSlots(const QPoint& pos)
+{
+    QCursor::setPos(pos);
+}
+
 void ControlOperationPage::timerEvent(QTimerEvent* event)
 {
     int nID = event->timerId();
@@ -235,6 +282,23 @@ void ControlOperationPage::timerEvent(QTimerEvent* event)
     }
 }
 
+void ControlOperationPage::mousePressEvent(QMouseEvent* event)
+{
+    if (event->button() == Qt::LeftButton)
+    {
+        LockMouse(true);
+    }
+    else if (event->button() == Qt::RightButton)
+    {
+        LockMouse(false);
+    }
+}
+
+void ControlOperationPage::mouseMoveEvent(QMouseEvent* event)
+{
+    int a = 10;
+}
+
 void ControlOperationPage::HideLayout(bool bShow)
 {
     for (int i = 0; i < ui->horizontalLayout->count(); ++i)
@@ -271,6 +335,71 @@ void ControlOperationPage::ResetIdleTimer(bool bStart /*= false*/)
     HideLayout(bStart);
 }
 
+void ControlOperationPage::InitWnd()
+{
+    HideLayout(false);
+    
+    this->setMouseTracking(true);
+}
+
+void ControlOperationPage::CreateMouseMonitor(bool isStart)
+{
+    if (isStart)
+    {
+        m_pMousethread = new JMouseMonitorThread(this);
+        connect(m_pMousethread, &JMouseMonitorThread::MouseMovedSlg, this, &ControlOperationPage::MouseMovedSlots);
+        connect(m_pMousethread, &JMouseMonitorThread::RequestCursorMoveSlg, this, &ControlOperationPage::RequestCursorMoveSlots);
+
+        m_pMousethread->start();
+    }
+    else
+    {
+        m_pMousethread->stop();
+        m_pMousethread->wait();
+        delete m_pMousethread;
+        m_pMousethread = nullptr;
+    }
+   
+}
+
+void ControlOperationPage::LockMouse(bool islockMouse)
+{
+    if (m_pCameraBindCopy)
+    {
+        if (islockMouse)
+        {
+            if (!m_bMouseRun)
+            {
+                CreateMouseMonitor(true);
+                QPoint center = rect().center();
+                QPoint globalCenter = mapToGlobal(center);
+                m_pMousethread->setLockCenter(globalCenter);
+
+                QCursor::setPos(globalCenter);
+                setCursor(Qt::BlankCursor);
+                grabMouse();
+                m_bMouseRun = true;
+            }
+        }
+        else
+        {
+            if (m_bMouseRun)
+            {
+                if (m_pMousethread)
+                {
+                    m_pMousethread->unlock();
+                    releaseMouse();
+                    unsetCursor();
+                    QCursor::setPos(mapToGlobal(rect().center()));
+
+                    CreateMouseMonitor(false);
+                }
+                m_bMouseRun = false;
+            }
+        }
+    }
+}
+
 template<class T>
 void ControlOperationPage::DeduplicationBox(QComboBox* pCom, const T& veTemp, int nIndex)
 {

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.h

@@ -10,6 +10,8 @@
 #include "OriginalWnd/CameraDataHandleAndShow.h"
 #include "CameraMaterialGroupWnd/CameraImage/CameraImageHandler.h"
 #include "ImageWidget.h"
+#include "../common/GlobalUse/JMouseMonitorThread.h"
+#include "../CameraBind.h"
 namespace Ui {
 class ControlOperationPage;
 }
@@ -26,6 +28,8 @@ public:
     };
     explicit ControlOperationPage(QWidget *parent = nullptr);
     ~ControlOperationPage();
+
+public:
     void initForm();
     void updateOperateWidget(const QPixmap& pixmap, const QStringList& textList);
     void clearLayout();
@@ -38,9 +42,12 @@ public:
     void setMaterialBox(MaterialBox *materialbox);
     //void setBond(Bond *bond);
     ImageWidget* getOperatewidget();
-    void resizeSingleUI();
+    void resizeSingleUI(bool bMax = false);
     void resizeChartsAndCamerasUI();
 
+    /**更新硬件指针
+     */
+    void UpDateCameraBind(CameraBind* pCameraBind);
 private slots:
     void on_ZoomUpButton_clicked();
     void on_ZoomOutButton_clicked();
@@ -50,12 +57,33 @@ private slots:
     void handleDoubleClick();
     void on_switchJoystickBut_clicked();
 
+private slots:
+    /**位置更新
+     */
+    void MouseMovedSlots(const QPoint& delta);
+    void RequestCursorMoveSlots(const QPoint& pos);
+
 protected:
     void timerEvent(QTimerEvent* event) override;
 
+    void mousePressEvent(QMouseEvent* event) override;
+
+    void mouseMoveEvent(QMouseEvent* event) override;
+
 private:
     void HideLayout(bool bShow);
     void ResetIdleTimer(bool bStart = false);
+
+    void InitWnd();
+
+    /**创建鼠标控制线程，
+    * @in isStart== false 关闭
+     */
+    void CreateMouseMonitor(bool isStart);
+
+    /**鼠标操作
+     */
+    void LockMouse(bool islockMouse);
 private:
     template<class T>
     void DeduplicationBox(QComboBox* pCom, const T& veTemp, int nIndex);
@@ -65,18 +93,28 @@ private:
     QPixmap                     m_currentPixmap;
     qreal                       m_scaleFactor;
     QPoint                      m_mousePos;
-    OperateMode                 m_currentMode = ModeImage;
-    QGraphicsView*              m_currentView = nullptr;
+    OperateMode                 m_currentMode           = ModeImage;
+    QGraphicsView*              m_currentView           = nullptr;
     double                      m_previousScaleFactor;
-    Wafer*                      m_wafer; // 声明Wafer指针
-    Waffle*                     m_waffle; // 声明Waffle指针
-    MaterialBox*                m_materialbox; // 声明materialbox指针
+    Wafer*                      m_wafer                 = nullptr; // 声明Wafer指针
+    Waffle*                     m_waffle                = nullptr; // 声明Waffle指针
+    MaterialBox*                m_materialbox           = nullptr; // 声明materialbox指针
     //Bond *m_bond;
 
 
     /**用作定时使用，后面移动到整个类里面，目前先实现功能
     */
     int                         m_idleTimer = -1;
+
+private:
+    JMouseMonitorThread*        m_pMousethread = nullptr;
+
+    bool                        m_bMouseRun = false; // 重复点击
+
+
+    /**硬件指针
+     */
+    QPointer<CameraBind>        m_pCameraBindCopy;
 };
 
 #endif // VIEWWIDGETGROUP_H

View/die-bonder-ui/Src/RewriteControl/ControlOperationPage.ui

@@ -39,7 +39,7 @@
   <widget class="QWidget" name="BackGround" native="true">
    <property name="geometry">
     <rect>
-     <x>13</x>
+     <x>10</x>
      <y>50</y>
      <width>501</width>
      <height>501</height>
@@ -116,7 +116,7 @@
        <number>1</number>
       </property>
       <item>
-       <widget class="QComboBox" name="moduleTypeComboBox_2">
+       <widget class="QComboBox" name="moduleTypeComboBox">
         <property name="maximumSize">
          <size>
           <width>16777215</width>

View/die-bonder-ui/Src/RewriteControl/LightJoystickSwitchPage.cpp

@@ -169,7 +169,7 @@ void LightJoystickSwitchPage::on_down_Button_clicked()
 
 void LightJoystickSwitchPage::InitMainCameraBind(CameraBind* pCameraBind, bool bUpdate /*= true*/)
 {
-    m_pCameraBind.reset(pCameraBind);
+    m_pCameraBind = pCameraBind;
     if (bUpdate)
     {
         UpdataLightVal();
@@ -274,6 +274,11 @@ void LightJoystickSwitchPage::MoveJoystick()
 
 void LightJoystickSwitchPage::UpdataLightVal()
 {
+    if (m_pCameraBind->m_pCViewInterface == nullptr)
+    {
+        return;
+    }
+
     if (m_pPageSwitchGroup)
     {
         int niD = m_pPageSwitchGroup->m_nGroupId;

View/die-bonder-ui/Src/RewriteControl/LightJoystickSwitchPage.h

@@ -102,7 +102,7 @@ private:
 
     /**硬件指针
      */
-    std::unique_ptr<CameraBind> m_pCameraBind;
+    QPointer<CameraBind> m_pCameraBind;
     
 
     /**当前页面的Group

View/die-bonder-ui/Src/common/GlobalUse/JMouseMonitorThread.cpp

@@ -0,0 +1,64 @@
+// *****************************************************************************
+// 版权所有（C）2023~2099 上海骄成超声波技术有限公司
+// 保留所有权利
+// *****************************************************************************
+// 作者 : 杨坚
+// 版本 : 1.0
+// 功能说明:
+//             鼠标监控-全局的，可能后面还有其他地方使用，所以..
+// *****************************************************************************
+#include "JMouseMonitorThread.h"
+
+JMouseMonitorThread::JMouseMonitorThread(QObject* parent /*= nullptr*/)
+    : QThread(parent),
+    m_locked(false),
+    m_running(true)
+{
+
+}
+
+void JMouseMonitorThread::setLockCenter(const QPoint center)
+{
+    QMutexLocker locker(&m_mutex);
+    m_lockCenter = center;
+    m_locked = true;
+}
+
+void JMouseMonitorThread::unlock()
+{
+    QMutexLocker locker(&m_mutex);
+    m_locked = false;
+}
+
+void JMouseMonitorThread::stop()
+{
+    m_running = false;
+    wait();
+}
+
+void JMouseMonitorThread::run()
+{
+    QPoint lastPos = QCursor::pos();
+    while (m_running) 
+    {
+        if (m_locked) 
+        {
+            QPoint currentPos;
+            QPoint center;
+            {
+                QMutexLocker locker(&m_mutex);
+                center = m_lockCenter;
+            }
+
+            currentPos = QCursor::pos();
+            QPoint delta = currentPos - center;
+
+            if (delta != QPoint(0, 0)) 
+            {
+                emit MouseMovedSlg(delta);
+                emit RequestCursorMoveSlg(center);
+            }
+        }
+        msleep(15);
+    }
+}

View/die-bonder-ui/Src/common/GlobalUse/JMouseMonitorThread.h

@@ -0,0 +1,39 @@
+// *****************************************************************************
+// 版权所有（C）2023~2099 上海骄成超声波技术有限公司
+// 保留所有权利
+// *****************************************************************************
+// 作者 : 杨坚
+// 版本 : 1.0
+// 功能说明:
+//             鼠标监控-全局的，可能后面还有其他地方使用，所以..
+// *****************************************************************************
+#include <QThread>
+#include <QMutex>
+#include <QStack>
+#include <QCursor>
+#include <QWidget>
+
+class JMouseMonitorThread : public QThread {
+    Q_OBJECT
+public:
+    explicit JMouseMonitorThread(QObject* parent = nullptr);
+
+    void setLockCenter(const QPoint center);
+
+    void unlock();
+
+    void stop();
+
+signals:
+    void MouseMovedSlg(const QPoint& delta);
+    void RequestCursorMoveSlg(const QPoint& pos);
+
+protected:
+    void run() override;
+
+private:
+    QMutex m_mutex;
+    QPoint m_lockCenter;
+    bool m_locked;
+    bool m_running;
+};