修改版本

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

@@ -69,9 +69,9 @@ void Group::initForm()
 
     // MainWnd *mainWindow = new MainWnd();
     // connect(mainWindow,&MainWnd::styleChanged,this,&Group::Changedstyle);
-    QTimer *timer = new QTimer(this);
-    connect(timer, &QTimer::timeout, this, &Group::Changedstyle);
-    timer->start(100);
+    // QTimer *timer = new QTimer(this);
+    // connect(timer, &QTimer::timeout, this, &Group::Changedstyle);
+    // timer->start(100);
 }
 
 void Group::Changedstyle()
@@ -111,6 +111,7 @@ bool Group::eventFilter(QObject *obj, QEvent *event)
             }
             emit SetCurrentSelectSig(groupId, index);
             emit SendGroupSelectedSignals(this, index);
+            emit sendUpdateGroupState();
             return true;
         }
     }
@@ -196,73 +197,7 @@ void Group::on_DatacomboBox_currentIndexChanged(int index){
     send_ComboBox_singal(m_nCurrentGroupId,index);
 }
 
-void Group::GetGroupSelectedSlots(Group* group, int index)
-{
-    QSettings settings("OrganizationName__", "ApplicationName__");
-    int currentLastSavedIndex = settings.value("lastIndex", 1).toInt();
-
-    // 清除当前红色边框
-    if (m_pCurrentlySelectedGroup != nullptr) 
-    {
-        m_pCurrentlySelectedGroup->ui->leftBackground->setStyleSheet("");
-        m_pCurrentlySelectedGroup->ui->rightBackground->setStyleSheet("");
-    }
-
-    // 清除当前蓝色边框
-    if (m_pPreviouslySelectedBlueGroup != nullptr)
-    {
-        m_pPreviouslySelectedBlueGroup->ui->leftBackground->setStyleSheet("");
-        m_pPreviouslySelectedBlueGroup->ui->rightBackground->setStyleSheet("");
-    }
-
-    if (currentLastSavedIndex == 1 || currentLastSavedIndex == 3)
-    {
-        // 仅当前选中设为红色，蓝色边框清空
-        m_pPreviouslySelectedBlueGroup = nullptr;
-    } 
-    else if (currentLastSavedIndex == 2) 
-    {
-        // 当前选中设为红色，上一个选中设为蓝色
-        if (m_pLastClickedGroup != nullptr) 
-        {
-            QString blueBorderStyle = "border: 2px solid blue;";
-            // 即使是同一个实例，只要索引不同就设置蓝色边框
-            if (m_pLastClickedGroup == group && m_stnLastClickedIndex != index)
-            {
-                if (m_stnLastClickedIndex == 1)
-                {
-                    m_pLastClickedGroup->ui->leftBackground->setStyleSheet(blueBorderStyle);
-                }
-                else if (m_stnLastClickedIndex == 2) 
-                {
-                    m_pLastClickedGroup->ui->rightBackground->setStyleSheet(blueBorderStyle);
-                }
-                m_pPreviouslySelectedBlueGroup = m_pLastClickedGroup;
-            }
-            else if (m_pLastClickedGroup != group) 
-            {
-                if (m_stnLastClickedIndex == 1) 
-                {
-                    m_pLastClickedGroup->ui->leftBackground->setStyleSheet(blueBorderStyle);
-                } 
-                else if (m_stnLastClickedIndex == 2)
-                {
-                    m_pLastClickedGroup->ui->rightBackground->setStyleSheet(blueBorderStyle);
-                }
-                m_pPreviouslySelectedBlueGroup = m_pLastClickedGroup;
-            }
-        }
-    }
-
-    // 更新当前选中的 Group 实例
-    m_pCurrentlySelectedGroup = group;
-    // 将当前选中的边框设为红色
-    group->check_selected(index);
 
-    // 更新上一次点击的记录
-    m_pLastClickedGroup = group;
-    m_stnLastClickedIndex = index;
-}
 
 void Group::UpDataImageShowSlots(const QPixmap& imageData)
 {
@@ -291,19 +226,22 @@ void Group::saveBorderSettings()
     settings.beginGroup(QString::number(m_nGroupId));
 
     QString leftStyle = ui->leftBackground->styleSheet();
+    QString rightStyle = ui->rightBackground->styleSheet();
+
     if (leftStyle.contains("blue", Qt::CaseInsensitive)) {
         leftStyle = ""; // 清除样式
         // 记录该边框信息
         recordBorderInfo(m_nGroupId, "Left");
     }
-    settings.setValue("LeftBorderStyle", leftStyle);
 
-    QString rightStyle = ui->rightBackground->styleSheet();
     if (rightStyle.contains("blue", Qt::CaseInsensitive)) {
         rightStyle = ""; // 清除样式
         // 记录该边框信息
         recordBorderInfo(m_nGroupId, "Right");
     }
+
+
+    settings.setValue("LeftBorderStyle", leftStyle);
     settings.setValue("RightBorderStyle", rightStyle);
 
     settings.setValue("LastClickedIndex", m_stnLastClickedIndex);
@@ -311,7 +249,8 @@ void Group::saveBorderSettings()
 
     if (m_pCurrentlySelectedGroup == this) {
         settings.setValue("IsCurrentlySelected", true);
-    } else {
+    }
+    else {
         settings.setValue("IsCurrentlySelected", false);
     }
 
@@ -329,6 +268,7 @@ void Group::recordBorderInfo(int groupId, const QString& side)
 
 void Group::loadBorderSettings()
 {
+  
     QSettings settings("YourOrganization", "YourApplication");
     settings.beginGroup(QString::number(m_nGroupId));
 
@@ -338,7 +278,6 @@ void Group::loadBorderSettings()
     m_stnLastSavedIndex = settings.value("LastSavedIndex", 1).toInt();
     bool isCurrentlySelected = settings.value("IsCurrentlySelected", false).toBool();
 
-
     QSettings settings2("OrganizationName__", "ApplicationName__");
     int Index = settings2.value("lastIndex", 1).toInt();
 
@@ -352,11 +291,17 @@ void Group::loadBorderSettings()
         if (borderInfoSettings.contains(leftKey)) {
             leftStyle = getBlueBorderStyle();
             borderInfoSettings.remove(leftKey); // 移除记录，避免下次重复处理
+            qDebug() << "Left border of group" << m_nGroupId << "restored to blue.";
+            m_pPreviouslySelectedBlueGroup = this;
+            // lastClickedGroup =this;
         }
         // 检查右边框是否需要还原
         if (borderInfoSettings.contains(rightKey)) {
             rightStyle = getBlueBorderStyle();
             borderInfoSettings.remove(rightKey);
+            qDebug() << "Right border of group" << m_nGroupId << "restored to blue.";
+            m_pPreviouslySelectedBlueGroup = this;
+            // lastClickedGroup =this;
         }
         borderInfoSettings.endGroup();
     }
@@ -366,10 +311,14 @@ void Group::loadBorderSettings()
 
     if (isCurrentlySelected) {
         m_pCurrentlySelectedGroup = this;
+        m_pLastClickedGroup = this;
         if (leftStyle.contains("red")) {
             m_stnLastClickedIndex = 1;
-        } else if (rightStyle.contains("red")) {
+            qDebug() << "Left border of group" << m_nGroupId << "is red.";
+        }
+        else if (rightStyle.contains("red")) {
             m_stnLastClickedIndex = 2;
+            qDebug() << "Right border of group" << m_nGroupId << "is red.";
         }
     }
 
@@ -381,3 +330,72 @@ QString Group::getBlueBorderStyle()
     static const QString blueBorderStyle = "border: 2px solid blue;";
     return blueBorderStyle;
 }
+
+QString Group::getRedBorderStyle()
+{
+    static const QString blueBorderStyle = "";
+    return blueBorderStyle;
+}
+
+void Group::GetGroupSelectedSlots(Group* group, int index) {
+    QSettings settings("OrganizationName__", "ApplicationName__");
+    int currentLastSavedIndex = settings.value("lastIndex", 1).toInt();
+
+    // 检查是否是同一个组的同一个索引被点击
+    if (m_pLastClickedGroup == group && m_stnLastClickedIndex == index) {
+        // 如果是同一个组的同一个索引被点击，则不更新边框
+        return;
+    }
+
+    // 清除当前红色边框
+    if (m_pCurrentlySelectedGroup != nullptr) {
+        m_pCurrentlySelectedGroup->ui->leftBackground->setStyleSheet("");
+        m_pCurrentlySelectedGroup->ui->rightBackground->setStyleSheet("");
+    }
+
+    // 清除当前蓝色边框
+    if (m_pPreviouslySelectedBlueGroup != nullptr) {
+        m_pPreviouslySelectedBlueGroup->ui->leftBackground->setStyleSheet("");
+        m_pPreviouslySelectedBlueGroup->ui->rightBackground->setStyleSheet("");
+    }
+
+    if (currentLastSavedIndex == 1 || currentLastSavedIndex == 3) {
+        // 仅当前选中设为红色，蓝色边框清空
+
+        m_pPreviouslySelectedBlueGroup = nullptr;
+    }
+    else if (currentLastSavedIndex == 2) {
+        // 当前选中设为红色，上一个选中设为蓝色
+        if (m_pLastClickedGroup != nullptr) {
+            QString blueBorderStyle = "border: 2px solid blue;";
+            // 即使是同一个实例，只要索引不同就设置蓝色边框
+            if (m_pLastClickedGroup == group && m_stnLastClickedIndex != index) {
+                if (m_stnLastClickedIndex == 1) {
+                    m_pLastClickedGroup->ui->leftBackground->setStyleSheet(blueBorderStyle);
+                }
+                else if (m_stnLastClickedIndex == 2) {
+                    m_pLastClickedGroup->ui->rightBackground->setStyleSheet(blueBorderStyle);
+                }
+                m_pPreviouslySelectedBlueGroup = m_pLastClickedGroup;
+            }
+            else if (m_pLastClickedGroup != group) {
+                if (m_stnLastClickedIndex == 1) {
+                    m_pLastClickedGroup->ui->leftBackground->setStyleSheet(blueBorderStyle);
+                }
+                else if (m_stnLastClickedIndex == 2) {
+                    m_pLastClickedGroup->ui->rightBackground->setStyleSheet(blueBorderStyle);
+                }
+                m_pPreviouslySelectedBlueGroup = m_pLastClickedGroup;
+            }
+        }
+    }
+
+    // 更新当前选中的 Group 实例
+    m_pCurrentlySelectedGroup = group;
+    // 将当前选中的边框设为红色
+    group->check_selected(index);
+
+    // 更新上一次点击的记录
+    m_pLastClickedGroup = group;
+    m_stnLastClickedIndex = index;
+}

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

@@ -27,12 +27,14 @@ public:
     void loadBorderSettings();  // 新增：加载边框颜色信息
     void recordBorderInfo(int groupId, const QString& side);
     QString getBlueBorderStyle();
+    QString getRedBorderStyle();
     void setDatacomboBox(int index);
 
 signals:
     void send_button_Signal();
     void send_ComboBox_singal(int groupId,int index);
     void SendGroupSelectedSignals(Group* group, int index);
+    void sendUpdateGroupState();
 
     /**当前选中了哪一个
      */

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

@@ -209,9 +209,7 @@ void ChartsAndCamerasWnd::on_CheckBox_clicked()
 #endif
 
 void ChartsAndCamerasWnd::initFrom() {
-    QTimer *timer = new QTimer(this);
-    connect(timer, &QTimer::timeout, this, &ChartsAndCamerasWnd::checkSettings);
-    timer->start(100);
+    checkSettings();
 
    
     QWidget *viewport = ui->scrollArea->viewport();
@@ -303,8 +301,8 @@ void ChartsAndCamerasWnd::loadGroupSettings(int Id, int Index) {
     if (Index == 1) {
 
         newPixmap = QPixmap(imagePath);
-        QStringList test = { "1","2" };
-        ui->viewwidgetgroup->updateOperateWidget(newPixmap, test);
+        
+        ui->viewwidgetgroup->updateOperateWidget(newPixmap);
 
     }else if (Index == 2) {
  

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

@@ -26,10 +26,10 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget *parent)
     lastLastGroupId = settings.value("LastLastGroupId", 0).toInt();
     settings.endGroup();
 
-
+    QStringList a = getImageslist();
+    qDebug() << a;
     ui->control_r->HideOrShowPage(false);
     ui->control_L->HideOrShowPage(false);
-    //initFrom();
     qApp->installEventFilter(this);
 }
 
@@ -69,10 +69,7 @@ void MainAndSecondaryCamerasWnd::initFrom()
     lastIndex = lastWndType;
     lastGroupId = LastGroup;
 
-
-    QTimer* timer = new QTimer(this);
-    connect(timer, &QTimer::timeout, this, &MainAndSecondaryCamerasWnd::checkSettings);
-    timer->start(100);
+    checkSettings();
 }
 
 void MainAndSecondaryCamerasWnd::InitPage()
@@ -94,6 +91,7 @@ void MainAndSecondaryCamerasWnd::InitPage()
             //JMessageTip::Message_warning("a");
         }
         QList<int> numbers;
+        nSize = 8;
         for (int i = 1; i <= nSize; i++)
         {
             numbers.push_back(i);
@@ -106,6 +104,8 @@ void MainAndSecondaryCamerasWnd::InitPage()
             Group* widget = manager->getGroup();
             CameraConnectUpdateImageFun(i, widget);
 
+            connect(widget, &Group::sendUpdateGroupState,
+                this, &MainAndSecondaryCamerasWnd::checkSettings);
             if (widget != nullptr)
             {
                 mainLayout->addWidget(widget);
@@ -213,17 +213,12 @@ void MainAndSecondaryCamerasWnd::loadSettings()
     QSettings settings("YourCompany", "YourApplication_");
     int groupId = settings.value("GroupId", 0).toInt();
     int index = settings.value("Index", 0).toInt();
-
-    //TODO: 这个地方目前暂停使用
     loadGroupSettings(groupId, index);
 }
 
 void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index)
 {
-    //int  Id = m_currentSelectGroup.nGroupId;
-    //int Index = m_currentSelectGroup.nSelectLeft1;
 
-    // isUpdatingSettings = true;
     QSettings settings("YourOrganization", "YourApplication");
     settings.beginGroup(QString::number(Id));
     QString imagePath = settings.value("ImagePath1").toString();
@@ -232,7 +227,7 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index)
     settings.endGroup();
     QSettings Last_settings("YourOrganization", "YourApplication");
     settings.beginGroup(QString::number(lastGroupId));
-    QString Last_imagePath1 = settings.value("ImagePath1").toString();
+    QString Last_imagePath = settings.value("ImagePath1").toString();
     int Last_materialWndType = settings.value("MaterialWndType").toInt();
     QStringList Last_textList = settings.value("TextList").toStringList();
     settings.endGroup();
@@ -245,16 +240,16 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index)
     if (Index == 1) 
     {
         newPixmap = QPixmap(imagePath);
-        QStringList test = { "1","2" };
-        ui->viewwidgetgroup_R->updateOperateWidget(newPixmap, test);
+        
+        ui->viewwidgetgroup_R->updateOperateWidget(newPixmap);
     }
 
     if (lastIndex == 1) 
     {
         
-        Last_newPixmap = QPixmap(imagePath);
-        QStringList test = { "1","2" };
-        ui->viewwidgetgroup_L->updateOperateWidget(Last_newPixmap, test);
+        Last_newPixmap = QPixmap(Last_imagePath);
+        
+        ui->viewwidgetgroup_L->updateOperateWidget(Last_newPixmap);
     }
     else if (lastIndex == 2) 
     {
@@ -285,16 +280,16 @@ void MainAndSecondaryCamerasWnd::loadGroupSettings(int Id, int Index)
 void MainAndSecondaryCamerasWnd::updateMaterialWidget(int  side,int materialWndType, int groupId) {
     if (side == last_left) {
         switch (materialWndType) {
-        case 1: ui->viewwidgetgroup_L->setWafer(waferMap.value(lastGroupId)); break;
-        case 2: ui->viewwidgetgroup_L->setWaffle(waffleMap.value(lastGroupId)); break;
-        case 3: ui->viewwidgetgroup_L->setMaterialBox(materialBoxMap.value(lastGroupId)); break;
+        case 1: ui->viewwidgetgroup_L->setWafer(waferMap.value(groupId)); break;
+        case 2: ui->viewwidgetgroup_L->setWaffle(waffleMap.value(groupId)); break;
+        case 3: ui->viewwidgetgroup_L->setMaterialBox(materialBoxMap.value(groupId)); break;
         }
     }
     else if (side == current_right) {
         switch (materialWndType) {
-        case 1: ui->viewwidgetgroup_R->setWafer(waferMap.value(lastGroupId)); break;
-        case 2: ui->viewwidgetgroup_R->setWaffle(waffleMap.value(lastGroupId)); break;
-        case 3: ui->viewwidgetgroup_R->setMaterialBox(materialBoxMap.value(lastGroupId)); break;
+        case 1: ui->viewwidgetgroup_R->setWafer(waferMap.value(groupId)); break;
+        case 2: ui->viewwidgetgroup_R->setWaffle(waffleMap.value(groupId)); break;
+        case 3: ui->viewwidgetgroup_R->setMaterialBox(materialBoxMap.value(groupId)); break;
         }
     }
 }
@@ -554,6 +549,7 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
             }
             m_veCurrentSelectGroup.push_back(_curr);
             UpdataLightJoystickSwitchPage();
+
         }
         
     }
@@ -685,3 +681,21 @@ void MainAndSecondaryCamerasWnd::CheckIs()
         showAndHide_L();
     }*/
 }
+QStringList MainAndSecondaryCamerasWnd::getImageslist() {
+    // 指定图片文件夹路径
+    QString folderPath = "photos/";
+
+    // 创建 QDir 对象
+    QDir dir(folderPath);
+
+    // 检查文件夹是否存在
+    if (!dir.exists()) {
+        qWarning() << "Folder does not exist:" << folderPath;
+    }
+
+    // 获取文件夹中的所有图片文件
+    QStringList filters;
+    filters << "*.png" << "*.jpg" << "*.jpeg" << "*.bmp" << "*.gif"; // 添加你需要的图片格式
+    QStringList images = dir.entryList(filters, QDir::Files);
+    return images;
+}

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

@@ -33,6 +33,8 @@ public:
      */
     void updateMaterialWidget(int side, int materialWndType, int groupId);
 
+    QStringList getImageslist();
+
 public slots:
 
     void CheckIs();

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

@@ -128,7 +128,7 @@ void SingleCameraOperationWnd::loadGroupSettings(int Id, int Index) {
 
         newPixmap = QPixmap(imagePath);
         QStringList test = { "1","2" };
-        ui->viewwidgetgroup->updateOperateWidget(newPixmap, test);
+        ui->viewwidgetgroup->updateOperateWidget(newPixmap);
 
     }else if (Index == 2) {
  

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

@@ -15,7 +15,7 @@ ControlOperationPage::~ControlOperationPage()
     delete ui;
 }
 
-void ControlOperationPage::updateOperateWidget(const QPixmap& pixmap, const QStringList& textList) {
+void ControlOperationPage::updateOperateWidget(const QPixmap& pixmap) {
     QSize size = ui->Operatewidget->size();
     QPixmap scaledPixmap = pixmap.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 
@@ -26,11 +26,16 @@ void ControlOperationPage::updateOperateWidget(const QPixmap& pixmap, const QStr
     m_scaleFactor = 1.0;
     m_previousScaleFactor = 1.0;
     ui->label_Percentage->setText("100%");
-    ui->DataSources->clear();
-    ui->DataSources->addItems(textList);
+
     m_currentMode = ModeImage;
 
 }
+
+void ControlOperationPage::setDataSources(const QStringList& textList) {
+    ui->DataSources->clear();
+    ui->DataSources->addItems(textList);
+}
+
 // 清除大窗口上当前的布局
 void ControlOperationPage::clearLayout() {
     // 获取当前布局

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

@@ -31,7 +31,8 @@ public:
 
 public:
     void initForm();
-    void updateOperateWidget(const QPixmap& pixmap, const QStringList& textList);
+    void updateOperateWidget(const QPixmap& pixmap);
+    void setDataSources(const QStringList& textList);
     void clearLayout();
     void updateScale(double newScaleFactor);
     void applyScale();