功能改进：调整灯光显示，调整数据库

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

@@ -7,6 +7,7 @@
 #include <QScrollBar>
 #include <QDoubleValidator>
 #include "CameraDistribute.h"
+#include "Src/common/JMessageTip.h"
 
 
 MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget *parent)
@@ -25,6 +26,9 @@ MainAndSecondaryCamerasWnd::MainAndSecondaryCamerasWnd(QWidget *parent)
     lastLastGroupId = settings.value("LastLastGroupId", 0).toInt();
     settings.endGroup();
 
+
+    ui->control_r->HideOrShowPage(false);
+    ui->control_L->HideOrShowPage(false);
     //initFrom();
     qApp->installEventFilter(this);
 }
@@ -88,64 +92,82 @@ void MainAndSecondaryCamerasWnd::InitPage()
     mainLayout->setSpacing(28);
     mainLayout->setMargin(0);
 
-    int nSize = 5;
+    int nSize = 0;
     if (m_pMainCameraBind != nullptr)
     {
         nSize = m_pMainCameraBind->m_vecCamera.size();
-
         if (nSize == 0) // 针对获取不到的情况
         {
-            nSize = 5;
+            //nSize = 5;
+            JMessageTip::Message_warning("a");
         }
-    }
-    
-    QList<int> numbers;
-    for (int i = 1; i <= nSize; i++)
-    {
-        numbers.push_back(i);
-    }
-
-    for (int i = 0; i < numbers.size(); ++i)
-    {
-        int num = numbers[i];
-        CameraImageHandler* manager = new CameraImageHandler(num);
-        Group* widget = manager->getGroup();
-        CameraConnectUpdateImageFun(i, widget);
-
-        if (widget != nullptr)
+        QList<int> numbers;
+        for (int i = 1; i <= nSize; i++)
         {
-            mainLayout->addWidget(widget);
-            m_currentSelectGroup.liGroup.append(widget);
+            numbers.push_back(i);
         }
-        if (manager->getWafer())
+
+        for (int i = 0; i < numbers.size(); ++i)
         {
-            waferMap.insert(num, manager->getWafer());
-        }
-        if (manager->getWafer()) {
-            waffleMap.insert(num, manager->getWaffle());
+            int num = numbers[i];
+            CameraImageHandler* manager = new CameraImageHandler(num);
+            Group* widget = manager->getGroup();
+            CameraConnectUpdateImageFun(i, widget);
+
+            if (widget != nullptr)
+            {
+                mainLayout->addWidget(widget);
+                m_currentSelectGroup.liGroup.append(widget);
+            }
+            if (manager->getWafer())
+            {
+                waferMap.insert(num, manager->getWafer());
+            }
+            if (manager->getWafer()) {
+                waffleMap.insert(num, manager->getWaffle());
+            }
+            if (manager->getMaterialBox()) {
+                materialBoxMap.insert(num, manager->getMaterialBox());
+            }
+
+            delete manager;
         }
-        if (manager->getMaterialBox()) {
-            materialBoxMap.insert(num, manager->getMaterialBox());
+
+        // 设置控件的最小高度和最大宽度
+        int minHeight = 162;
+        int maxWidth = 244;
+        int num = -28;
+        for (Group* w : m_currentSelectGroup.liGroup)
+        {
+            w->setMinimumHeight(minHeight);
+            w->setMaximumWidth(maxWidth);
+            num = num + 272;
         }
 
-        delete manager;
-    }
+        container->setMinimumSize(num, 162);
+        container->setLayout(mainLayout);
+        ui->scrollArea->setWidget(container);
+        ui->scrollArea->resize(1062, 177);
 
-    // 设置控件的最小高度和最大宽度
-    int minHeight = 162;
-    int maxWidth = 244;
-    int num = -28;
-    for (Group* w : m_currentSelectGroup.liGroup)
-    {
-        w->setMinimumHeight(minHeight);
-        w->setMaximumWidth(maxWidth);
-        num = num + 272;
-    }
 
-    container->setMinimumSize(num, 162);
-    container->setLayout(mainLayout);
-    ui->scrollArea->setWidget(container);
-    ui->scrollArea->resize(1062, 177);
+        // 只有一个相机的情况，直接绑定
+        if (numbers.size() == 1)
+        {
+            Group* pGroup = m_currentSelectGroup.liGroup[0];
+            connect(pGroup, &Group::SetUpDataImageShowSig,
+                this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0);
+
+            ST_CURRENT_SELECT_GROUP _curr;
+            _curr.isBond = true;
+            _curr.pSelectGroup = pGroup;
+            _curr.nCurrentCameraId = pGroup->m_nGroupId;
+            _curr.nSelectLeft1 = 1;
+
+            m_veCurrentSelectGroup.push_back(_curr);
+
+            UpdataLightJoystickSwitchPage(pGroup);
+        }
+    } 
 }
 
 void MainAndSecondaryCamerasWnd::CameraConnectUpdateImageFun(int nIndex, Group* widget)
@@ -1072,6 +1094,43 @@ void MainAndSecondaryCamerasWnd::HideLayout(QHBoxLayout* layout, bool isHide)
     }
 }
 
+void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage(Group* pGroup)
+{
+    auto Fun = [&](LightJoystickSwitchPage* p, bool bShow)
+    {
+        p->UpdatemPageGroup(pGroup);
+        p->InitMainCameraBind(m_pMainCameraBind);
+        p->HideOrShowPage(bShow);
+    };
+
+    for (int i = 0; i < m_veCurrentSelectGroup.size(); i++)
+    {
+        if (i == 0)
+        {
+            bool bShow = false;
+            
+            if (m_veCurrentSelectGroup[0].nSelectLeft1 == 1)
+            {
+                bShow = true;
+            }
+            Fun(ui->control_L, bShow);
+
+        }
+        else if (i == 1)
+        {
+            bool bShow = false;
+            if (m_veCurrentSelectGroup[1].nSelectLeft1 == 1)
+            {
+                bShow = true;
+            }
+            Fun(ui->control_L, bShow);
+
+        }
+    }
+
+
+}
+
 void MainAndSecondaryCamerasWnd::timerEvent(QTimerEvent* event)
 {
     int nID = event->timerId();
@@ -1195,52 +1254,28 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
             }
         }
         
-        m_veCurrentSelectGroup.push_back(_curr);
-
-        //yang:
-       // 传递当前group
-        auto Fun = [&](LightJoystickSwitchPage* p, bool bShow)
-        {
-            p->InitMainCameraBind(m_pMainCameraBind);
-            p->HideOrShowPage(bShow);
-        };
-
-        int nIndex = 0;
-        for (auto& a: m_veCurrentSelectGroup)
+        m_veCurrentSelectGroup.push_back(_curr);         
+    }
+    else
+    {
+        if (m_veCurrentSelectGroup[0].pSelectGroup != _curr.pSelectGroup)
         {
-            bool bShow = false;
-            if (a.nSelectLeft1 == 1)
-            {
-                bShow = true;
-            }
-
-            if (nIndex == 0)
+            if (m_veCurrentSelectGroup.size() == 1)
             {
-                Fun(ui->control_L, bShow);
-                ui->control_L->UpdatemPageGroup(pGroup);
+                connect(pGroup, &Group::SetUpDataImageShowSig,
+                    this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals4);
             }
-            else if (nIndex == 1)
+            else
             {
-                Fun(ui->control_r, bShow);
-                ui->control_r->UpdatemPageGroup(pGroup);
+                connect(pGroup, &Group::SetUpDataImageShowSig,
+                    this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0);
             }
-            nIndex += 1;
-        }        
-    }
-    else
-    {
-        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);
         }
-        m_veCurrentSelectGroup.push_back(_curr);
+        
     }
+
+    UpdataLightJoystickSwitchPage(pGroup);
 }
 
 void MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0(const QPixmap& imageData)

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

@@ -115,6 +115,10 @@ private:
 
     void HideLayout(QHBoxLayout* layout, bool isHide);
 
+    /**更新灯光显示
+     */
+    void UpdataLightJoystickSwitchPage(Group* pGroup);
+
 private:
     Ui::MainAndSecondaryCamerasWnd *ui;
 

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

@@ -24,7 +24,6 @@ OriginalWnd::OriginalWnd(QWidget* parent, CameraBind* pCameraBind)
     ui->setupUi(this);
 
     m_pCameraBind.reset(pCameraBind);
-
     m_pCameraDistribute = CameraDistribute::GetInstance();
 
     RegFun();
@@ -191,7 +190,6 @@ void OriginalWnd::UpdateTime()
 void OriginalWnd::Del()
 {
     killTimer(m_nTimerID);
-
 }
 
 void OriginalWnd::RunOrStopSwitch()

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

@@ -63,7 +63,7 @@ void LightJoystickSwitchPage::BondSliderAndLineEdit(QSlider* slider, QLineEdit*
         lineEdit->setText(QString::number(value));
     });
 
-    connect(lineEdit, &QLineEdit::textChanged, [&, slider](const QString& text)
+    connect(lineEdit, &QLineEdit::textChanged, [&, slider, lineEdit](const QString& text)
         {
             bool ok;
             int value = text.toInt(&ok);
@@ -275,13 +275,14 @@ void LightJoystickSwitchPage::UpdataLightVal()
     if (m_pPageSwitchGroup)
     {
         int niD = m_pPageSwitchGroup->m_nGroupId;
-        if (niD == 1)
+        //if (niD == 1)
         {
             auto Fun = [&](QWidget* pWidget, QSlider* pSlider, int nVal) {
-                if (nVal == -1)
+                if (nVal < 0)
                 {
                     // 设置不可用
                     pWidget->setEnabled(false);
+                    pWidget->hide();
                 }
                 else
                 {
@@ -301,12 +302,12 @@ void LightJoystickSwitchPage::UpdataLightVal()
 
 EN_LIGHT_INDEX LightJoystickSwitchPage::MatchSelectedLightIndex(QLineEdit* lineEdit)
 {
-    EN_LIGHT_INDEX nIndex;
+    EN_LIGHT_INDEX nIndex = EN_LIGHT_INDEX::Red;
     if (lineEdit == ui->RedLightlineEdit)
     {
         nIndex = EN_LIGHT_INDEX::Red;
     }
-    else if (lineEdit == ui->GreenLightlineEdit )
+    else if (lineEdit == ui->GreenLightlineEdit)
     {
         nIndex = EN_LIGHT_INDEX::Green;
     }

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

@@ -127,6 +127,9 @@
         <height>56</height>
        </rect>
       </property>
+      <property name="cursor">
+       <cursorShape>PointingHandCursor</cursorShape>
+      </property>
       <property name="maximum">
        <number>255</number>
       </property>
@@ -201,6 +204,9 @@
         <height>56</height>
        </rect>
       </property>
+      <property name="cursor">
+       <cursorShape>PointingHandCursor</cursorShape>
+      </property>
       <property name="maximum">
        <number>255</number>
       </property>
@@ -275,6 +281,9 @@
         <height>56</height>
        </rect>
       </property>
+      <property name="cursor">
+       <cursorShape>PointingHandCursor</cursorShape>
+      </property>
       <property name="maximum">
        <number>255</number>
       </property>

View/die-bonder-ui/Src/Sql/SqlOperation.cpp

@@ -61,12 +61,19 @@ int SqlOperation::LoadSql()
         }
         else
         {
-
             int rtn = loadMenu();
-            if (rtn != 0) return rtn;
+            if (rtn != 0) 
+                return rtn;
             rtn = loadAllDirectories();
-            if (rtn != 0) return rtn;
+            if (rtn != 0) 
+                return rtn;
             rtn = loadAllControlData();
+            if (rtn != 0) 
+                return rtn;
+            rtn = LoadAppConfig();
+            if (rtn != 0)
+                return rtn;
+
             return 0;
         }
     }
@@ -391,6 +398,46 @@ int SqlOperation::updateDb(QString tableName, QString name, const QString curren
     return 0;
 }
 
+int SqlOperation::LoadAppConfig()
+{
+    int nErr = -1;
+
+    QSqlDatabase db = QSqlDatabase::database();
+    if (!db.isOpen())
+    {
+        JLogAllOutput::cmd_Warning("Êý¾Ý¿âδ´ò¿ª");
+    }
+    else
+    {
+        QSqlQuery query(db);
+        QString sql = QString("SELECT ID, SwitchWnd,GroupId_R,Index_R,GroupId_L,Index_L FROM %1").arg("AppConfig");
+        if (!query.exec(sql))
+        {
+            QString strErr = "²éѯ Mune ʧ°Ü:";
+            strErr += query.lastQuery();
+            strErr += "  ";
+            strErr += query.lastError().text();
+            JLogAllOutput::cmd_Warning(strErr.toStdString());
+            nErr = 1;
+        }
+        else
+        {
+            while (query.next())
+            {
+                m_appConifg.nID = query.value("Id").toInt();
+                m_appConifg.nID = query.value("SwitchWnd").toInt();
+                m_appConifg.nGroupId_R = query.value("GroupId_R").toInt();
+                m_appConifg.nIndex_R = query.value("Index_R").toInt();
+                m_appConifg.nGroupId_L = query.value("GroupId_L").toInt();
+                m_appConifg.nIndex_L = query.value("Index_L").toInt();
+            }
+            nErr = 0;
+        }
+    }
+
+    return nErr;
+}
+
 int SqlOperation::GetDirectories(QString tableName, const int& userPrivilege, QList<QJsonObject>& directories)
 {
     auto it = m_mapAllDirectories.find(tableName);

View/die-bonder-ui/Src/Sql/SqlOperation.h

@@ -46,6 +46,15 @@ struct Table_Control_Data
     
 };
 
+// 页面切换保存
+struct ST_APP_CONFIG
+{
+    int nID;
+    int nGroupId_R; // Group 
+    int nIndex_R;   // Group 里面第几个
+    int nGroupId_L; // Group 
+    int nIndex_L;   // Group 里面第几个
+};
 
 
 class SqlOperation
@@ -105,6 +114,8 @@ public:
 
    // bool GetDirectories(QString tableName, const int& userPrivilege, QList<CONFIG_BASE_STRUCT>& directories);
 
+    int LoadAppConfig();
+
 private:
     void ErrorInfo(const QString& strError);
 
@@ -134,14 +145,15 @@ private:
 
 
     //所有控件数据
-    QList<Table_Control_Data> m_allControlData;
+    QList<Table_Control_Data>       m_allControlData;
 
     //每个ID对应菜单名
-    QMap<int, QString> m_mapMenu;
-
-
+    QMap<int, QString>              m_mapMenu;
 
 
+    /**页面配置信息
+     */
+    ST_APP_CONFIG                   m_appConifg;
 };
 
 #endif  //__SQLOPERATION_H__

View/die-bonder-ui/Src/common/JLogAllOutput.cpp

@@ -12,6 +12,15 @@ void JLogAllOutput::cmd_debug(const std::string& strLog, int nIndex /*= -1*/)
 #endif // 0
 }
 
+void JLogAllOutput::cmd_Warning(const std::string& strLog, int nIndex /*= -1*/)
+{
+#if 1
+    qWarning() << strLog.c_str();
+
+    PRINT_DEBUG(strLog.c_str(), nIndex);
+#endif // 0
+}
+
 void JLogAllOutput::cmd_error(const std::string& strLog)
 {
 #if 1

View/die-bonder-ui/Src/common/JLogAllOutput.h

@@ -20,6 +20,9 @@ public:
     /**µ÷ÊÔÊä³ö
      */
     static void cmd_debug(const std::string& strLog, int nIndex = -1);
+
+    static void cmd_Warning(const std::string& strLog, int nIndex = -1);
+
     static void cmd_error(const std::string& strLog);
 };
 

View/die-bonder-ui/Src/common/JMessageTip.cpp

@@ -12,12 +12,13 @@ void JMessageTip::Message_information(const QString& strTip, QWidget* parent /*=
 
 QMessageBox::StandardButton JMessageTip::Message_question(const QString& strMsg, QWidget* parent /*= nullptr*/)
 {
-    return QMessageBox::information(NULL, "Title", "Content", QMessageBox::Yes | QMessageBox::No);
+    return QMessageBox::information(nullptr, "Title", "Content", QMessageBox::Yes | QMessageBox::No);
 }
 
 void JMessageTip::Message_warning(const QString& strMsg, QWidget* parent /*= nullptr*/)
 {
-
+    QMessageBox::warning(nullptr, tr("Currently exiting.....","当前正在退出....."),
+        tr("The current camera initialization failed and no camera is available.","当前相机初始化失败，没有可用相机"));
 }
 
 void JMessageTip::Message_warning(const QString& title, const QString& text, QWidget* parent /*= nullptr*/)