同步代码

View/die-bonder-ui/MainWnd.cpp

@@ -879,7 +879,7 @@ void MainWnd::setChineseMode(QMainWindow* MainWnd) {
     MainWnd->setWindowTitle(QCoreApplication::translate("MainWnd", "主界面", nullptr));
     ui->tabHomeBtn->setText(QCoreApplication::translate("MainWnd", "首页", nullptr));
     ui->label_logo_m->setText(QString());
-    ui->tabProductionBtn->setText(QCoreApplication::translate("MainWnd", "产品助手", nullptr));
+    ui->tabProductionBtn->setText(tr("MainWnd", "产品助手"));
     ui->tabProgramBtn->setText(QCoreApplication::translate("MainWnd", "进程", nullptr));
     ui->tabMessageBtn->setText(QCoreApplication::translate("MainWnd", "信息", nullptr));
     ui->tabModuleBtn->setText(QCoreApplication::translate("MainWnd", "校准", nullptr));

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

@@ -766,7 +766,7 @@ void MainAndSecondaryCamerasWnd::UpdataLightJoystickSwitchPage(Group* pGroup)
     auto Fun = [&](LightJoystickSwitchPage* p, bool bShow)
     {
         p->UpdatemPageGroup(pGroup);
-        p->InitMainCameraBind(m_pMainCameraBind);
+        p->InitMainCameraBind(m_pMainCameraBind, bShow);
         p->HideOrShowPage(bShow);
     };
 
@@ -897,7 +897,8 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
             }
         }
         
-        m_veCurrentSelectGroup.push_back(_curr);         
+        m_veCurrentSelectGroup.push_back(_curr); 
+        UpdataLightJoystickSwitchPage(pGroup);
     }
     else
     {
@@ -914,11 +915,9 @@ void MainAndSecondaryCamerasWnd::GetCurrentSelectSlots(int groupId, int nIndex)
                     this, &MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0);
             }
             m_veCurrentSelectGroup.push_back(_curr);
+            UpdataLightJoystickSwitchPage(pGroup);
         }
-        
     }
-
-    UpdataLightJoystickSwitchPage(pGroup);
 }
 
 void MainAndSecondaryCamerasWnd::GetUpDataImageShowSignals0(const QPixmap& imageData)

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

@@ -18,9 +18,12 @@ CONFIG += c++17
 # HEADERS += $$files(include/*.h, $$PWD)
 
 
-SOURCES += $$files(*.cpp, $$PWD)
-HEADERS += $$files(*.h, $$PWD)
-FORMS   += $$files(*.ui, $$PWD)
+SOURCES += $$files(*.cpp, $$PWD) \
+    Src/RewriteControl/MsgDlg/CustomMessageDlg.cpp
+HEADERS += $$files(*.h, $$PWD) \
+    Src/RewriteControl/MsgDlg/CustomMessageDlg.h
+FORMS   += $$files(*.ui, $$PWD) \
+    Src/RewriteControl/MsgDlg/CustomMessageDlg.ui
 
 # Default rules for deployment.
 qnx: target.path = /tmp/$${TARGET}/bin

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

@@ -238,6 +238,7 @@
     <ClCompile Include="Src\common\JMessageTip.cpp" />
     <ClCompile Include="Src\common\JUserAccountsData.cpp" />
     <ClCompile Include="Src\RewriteControl\LightJoystickSwitchPage.cpp" />
+    <ClCompile Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.cpp" />
     <ClCompile Include="Src\RewriteControl\viewwidgetgroup.cpp" />
     <ClCompile Include="Src\Sql\SqlOperation.cpp" />
     <ClCompile Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.cpp" />
@@ -262,6 +263,7 @@
     <ClInclude Include="Src\common\UserManagementShared.h" />
     <QtMoc Include="Src\RewriteControl\LightJoystickSwitchPage.h" />
     <QtMoc Include="Src\RewriteControl\viewwidgetgroup.h" />
+    <QtMoc Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.h" />
     <ClInclude Include="Src\Sql\SqlOperation.h" />
     <QtMoc Include="Src\CameraBind.h" />
     <QtMoc Include="OriginalWnd\CameraDataHandleAndShow.h">
@@ -340,6 +342,7 @@
     <QtUic Include="OriginalWnd\SingleCameraOperationWnd.ui">
     </QtUic>
     <QtUic Include="Src\RewriteControl\LightJoystickSwitchPage.ui" />
+    <QtUic Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.ui" />
     <QtUic Include="Src\RewriteControl\viewwidgetgroup.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\AccountMaintenanceWnd.ui" />
     <QtUic Include="Src\SystemInfoPage\PageWnd\AddUserAccountWnd.ui" />

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

@@ -121,6 +121,9 @@
     <Filter Include="Source Files\Src\RewriteControl">
       <UniqueIdentifier>{3ff77cc5-1816-4bcf-99d3-03e8571b3194}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Source Files\Src\RewriteControl\MsgDlg">
+      <UniqueIdentifier>{b469d2d0-374c-4e79-bb6f-5ffc5c55aaa2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="ImageWidget.cpp">
@@ -234,6 +237,9 @@
     <ClCompile Include="Src\RewriteControl\viewwidgetgroup.cpp">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </ClCompile>
+    <ClCompile Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.cpp">
+      <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
@@ -311,6 +317,9 @@
     <QtMoc Include="Src\RewriteControl\viewwidgetgroup.h">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </QtMoc>
+    <QtMoc Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.h">
+      <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">
@@ -366,6 +375,9 @@
     <QtUic Include="Src\RewriteControl\viewwidgetgroup.ui">
       <Filter>Source Files\Src\RewriteControl</Filter>
     </QtUic>
+    <QtUic Include="Src\RewriteControl\MsgDlg\CustomMessageDlg.ui">
+      <Filter>Source Files\Src\RewriteControl\MsgDlg</Filter>
+    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <None Include="images\Participation display\BlackDiamond.png">

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

@@ -167,11 +167,13 @@ void LightJoystickSwitchPage::on_down_Button_clicked()
     MoveJoystick();
 }
 
-void LightJoystickSwitchPage::InitMainCameraBind(CameraBind* pCameraBind)
+void LightJoystickSwitchPage::InitMainCameraBind(CameraBind* pCameraBind, bool bUpdate /*= true*/)
 {
     m_pCameraBind.reset(pCameraBind);
-
-    UpdataLightVal();
+    if (bUpdate)
+    {
+        UpdataLightVal();
+    }
 }
 
 void LightJoystickSwitchPage::UpdatemPageGroup(Group* pGroup)

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

@@ -45,7 +45,7 @@ public slots:
 public:
     /**拿到指针对界面操作
      */
-    void InitMainCameraBind(CameraBind* pCameraBind);
+    void InitMainCameraBind(CameraBind* pCameraBind, bool bUpdate = true);
     void UpdatemPageGroup(Group* pGroup);
 
     /**切换摇杆

View/die-bonder-ui/Src/RewriteControl/MsgDlg/CustomMessageDlg.cpp

@@ -0,0 +1,56 @@
+#include "CustomMessageDlg.h"
+#include "ui_CustomMessageDlg.h"
+
+CustomMessageDlg::CustomMessageDlg(QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::CustomMessageDlg)
+{
+    ui->setupUi(this);
+
+    this->setWindowFlags(Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint | Qt::Dialog);
+}
+
+CustomMessageDlg::~CustomMessageDlg()
+{
+    delete ui;
+}
+
+void CustomMessageDlg::mousePressEvent(QMouseEvent* event)
+{
+    if(event->button() == Qt::LeftButton && event->pos().y() <= 48)
+    {
+        m_isTitleBarClicked = true;
+        m_dragPosition = event->globalPos() - frameGeometry().topLeft();
+        event->accept();
+    }
+    else
+    {
+        m_isTitleBarClicked = false;
+        QDialog::mousePressEvent(event);
+    }
+}
+
+void CustomMessageDlg::mouseMoveEvent(QMouseEvent* event)
+{
+    if(m_isTitleBarClicked && (event->buttons() & Qt::LeftButton))
+    {
+        move(event->globalPos() - m_dragPosition);
+        event->accept();
+    }
+    else
+    {
+        QDialog::mouseMoveEvent(event);
+    }
+}
+
+void CustomMessageDlg::on_tCloseBut_clicked()
+{
+    on_closeBut_clicked(); // TODO: 都交给它
+}
+
+
+void CustomMessageDlg::on_closeBut_clicked()
+{
+    this->close();
+}
+

View/die-bonder-ui/Src/RewriteControl/MsgDlg/CustomMessageDlg.h

@@ -0,0 +1,35 @@
+#ifndef CUSTOMMESSAGEDLG_H
+#define CUSTOMMESSAGEDLG_H
+
+#include <QDialog>
+#include <QMouseEvent>
+
+namespace Ui {
+class CustomMessageDlg;
+}
+
+class CustomMessageDlg : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit CustomMessageDlg(QWidget *parent = nullptr);
+    ~CustomMessageDlg();
+
+protected:
+    void mousePressEvent(QMouseEvent* event) override;
+    void mouseMoveEvent(QMouseEvent* event) override;
+
+public slots:
+    void on_tCloseBut_clicked();
+    void on_closeBut_clicked();
+
+private:
+    Ui::CustomMessageDlg *ui;
+
+    QPoint  m_dragPosition={};
+
+    bool    m_isTitleBarClicked = false;
+};
+
+#endif // CUSTOMMESSAGEDLG_H

View/die-bonder-ui/Src/RewriteControl/MsgDlg/CustomMessageDlg.ui

@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>CustomMessageDlg</class>
+ <widget class="QDialog" name="CustomMessageDlg">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>573</width>
+    <height>341</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <widget class="QLabel" name="bgLabel">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>571</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">background-color: rgb(170, 170, 255);</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+  <widget class="QWidget" name="horizontalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>360</x>
+     <y>0</y>
+     <width>211</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <property name="spacing">
+     <number>6</number>
+    </property>
+    <item>
+     <widget class="QLabel" name="tIDLabel">
+      <property name="text">
+       <string>ID:</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QLabel" name="tIDlabel_errID">
+      <property name="text">
+       <string>oxfffffff</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="tCloseBut">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="minimumSize">
+       <size>
+        <width>0</width>
+        <height>0</height>
+       </size>
+      </property>
+      <property name="maximumSize">
+       <size>
+        <width>27</width>
+        <height>27</height>
+       </size>
+      </property>
+      <property name="text">
+       <string>X</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QLabel" name="bgTitleLabel">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>331</width>
+     <height>29</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string>Process FailuRE</string>
+   </property>
+  </widget>
+  <widget class="QWidget" name="verticalLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>40</y>
+     <width>441</width>
+     <height>291</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <item>
+       <widget class="QLabel" name="errorLogLabel">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+          <horstretch>70</horstretch>
+          <verstretch>120</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="styleSheet">
+         <string notr="true">background-color: rgb(255, 170, 255);</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QTextEdit" name="errorInfoTextEdit">
+        <property name="styleSheet">
+         <string notr="true">background-color: rgb(197, 197, 197);</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+    <item>
+     <widget class="QTextEdit" name="errorDetailsInfoTextEdit">
+      <property name="styleSheet">
+       <string notr="true">background-color: rgb(197, 197, 197);</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QWidget" name="verticalLayoutWidget_2">
+   <property name="geometry">
+    <rect>
+     <x>460</x>
+     <y>40</y>
+     <width>101</width>
+     <height>151</height>
+    </rect>
+   </property>
+   <layout class="QVBoxLayout" name="verticalLayout_2">
+    <item>
+     <widget class="QPushButton" name="closeBut">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>99</horstretch>
+        <verstretch>70</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="text">
+       <string>Close</string>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QPushButton" name="retryBut">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+        <horstretch>99</horstretch>
+        <verstretch>70</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="text">
+       <string>Retry</string>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

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

@@ -1,4 +1,5 @@
 #include "JMessageTip.h"
+#include "../RewriteControl/MsgDlg/CustomMessageDlg.h"
 
 JMessageTip::JMessageTip()
 {
@@ -17,6 +18,8 @@ QMessageBox::StandardButton JMessageTip::Message_question(const QString& strMsg,
 
 void JMessageTip::Message_warning(const QString& strMsg, QWidget* parent /*= nullptr*/)
 {
+    CreateCustomMessageDlg();
+
     QMessageBox::warning(nullptr, tr("Currently exiting.....","当前正在退出....."),
         tr("The current camera initialization failed and no camera is available.","当前相机初始化失败，没有可用相机"));
 }
@@ -35,3 +38,10 @@ void JMessageTip::Message_critical(const QString& title, const QString& text, QW
 {
 
 }
+
+void JMessageTip::CreateCustomMessageDlg()
+{
+    CustomMessageDlg dlg;
+    dlg.exec();
+
+}

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

@@ -37,6 +37,11 @@ public:
     */
     static void Message_critical(const QString& strTip, QWidget* parent = nullptr);
     static void Message_critical(const QString& title, const QString& text, QWidget* parent = nullptr);
+
+
+    /**ÏÈ´´½¨Ò»¸ö
+     */
+    static void CreateCustomMessageDlg();
 };
 
 #endif  //__JMESSAGETIP_H__