添加回调

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

@@ -118,6 +118,7 @@ void DbTreeViewManager::Init()
     m_pCModel       = new QStandardItemModel(this);
 
     m_sqlOper       = &SqlOperation::GetInstance();
+
     m_pTreeCViewInterface = ns_module::CViewInterface::GetInstance();
 }
 

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

@@ -15,6 +15,11 @@ CustomMessageDlg::~CustomMessageDlg()
     delete ui;
 }
 
+void CustomMessageDlg::RunMsgWnd(const ns_module::ST_BUTTON_DONE& butDone)
+{
+
+}
+
 void CustomMessageDlg::mousePressEvent(QMouseEvent* event)
 {
     if(event->button() == Qt::LeftButton && event->pos().y() <= 48)

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

@@ -3,6 +3,7 @@
 
 #include <QDialog>
 #include <QMouseEvent>
+#include <CViewInterface.h>
 
 namespace Ui {
 class CustomMessageDlg;
@@ -16,6 +17,9 @@ public:
     explicit CustomMessageDlg(QWidget *parent = nullptr);
     ~CustomMessageDlg();
 
+    /**运行消息对话框
+     */
+    void RunMsgWnd(const ns_module::ST_BUTTON_DONE& butDone);
 protected:
     void mousePressEvent(QMouseEvent* event) override;
     void mouseMoveEvent(QMouseEvent* event) override;

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

@@ -29,7 +29,17 @@ SqlOperation::SqlOperation()
         return;
     }
 
-    //注册回调
+    RegeditFun();
+}
+
+SqlOperation& SqlOperation::GetInstance()
+{
+    static SqlOperation instance;
+    return instance;
+}
+
+void SqlOperation::RegeditFun()
+{
     DataNoticeCallbackFun fun = std::bind(&SqlOperation::DataChange, this, std::placeholders::_1, std::placeholders::_2);
     //模组
     m_pCViewInterface->RecvDataChangNotice(MODULECONFIG_DATABASE_NAME, BONDHEAD_CONFIG_TABLE_NAME, fun);
@@ -48,12 +58,14 @@ SqlOperation::SqlOperation()
     m_pCViewInterface->RecvDataChangNotice(CALIBCONFIG_DATABASE_NAME, CALIB_R_TABLE_NAME, fun);
     m_pCViewInterface->RecvDataChangNotice(CALIBCONFIG_DATABASE_NAME, FORCE_CONTROL_TABLE_NAME, fun);
 
-}
+    //****************************************************新增************************************************
 
-SqlOperation& SqlOperation::GetInstance()
-{
-    static SqlOperation instance;
-    return instance;
+    //设置弹出框回调
+    ns_module::SendButtonRunDone funRunDone = std::bind(&SqlOperation::RunButDone, this, std::placeholders::_1);
+    m_pCViewInterface->SetButtonRunDoneFunc(funRunDone);
+
+    //设置按钮执行完回调
+    m_pCViewInterface->SetPopMessageBoxFunc(&SqlOperation::StartMessageWnd);
 }
 
 int SqlOperation::LoadSql()
@@ -703,3 +715,17 @@ void SqlOperation::DataChange(string strDbName, string strTableName)
 {
 
 }
+
+BUTTON_TYPE SqlOperation::StartMessageWnd(MESSAGE_INFO stMsgInfo)
+{
+    // 所有动作执行完毕，开始运动
+
+
+    return BUTTON_TYPE::CLOSE_BUTTON;
+}
+
+
+void SqlOperation::RunButDone(ns_module::ST_BUTTON_DONE butDone)
+{
+    JMessageTip::CreateCustomMessageDlg(butDone);
+}

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

@@ -67,6 +67,9 @@ public:
 
 public:
 
+    void RegeditFun();
+
+
     //创建数据库连接
     int LoadSql();
 
@@ -125,6 +128,11 @@ private:
 
     void DataChange(string strDbName, string strTableName);
 
+    /**弹出对话框
+     */
+   static BUTTON_TYPE StartMessageWnd(MESSAGE_INFO stMsgInfo);
+
+   void   RunButDone(ns_module::ST_BUTTON_DONE butDone);
 private:
 
     ns_module::CViewInterface* m_pCViewInterface;

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

@@ -18,8 +18,6 @@ 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.","当前相机初始化失败，没有可用相机"));
 }
@@ -39,9 +37,10 @@ void JMessageTip::Message_critical(const QString& title, const QString& text, QW
 
 }
 
-void JMessageTip::CreateCustomMessageDlg()
+void JMessageTip::CreateCustomMessageDlg(const ns_module::ST_BUTTON_DONE& butDone)
 {
     CustomMessageDlg dlg;
+    dlg.RunMsgWnd(butDone);
     dlg.exec();
 
 }

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

@@ -13,6 +13,7 @@
 
 #include <QObject>
 #include <QMessageBox>
+#include <CViewInterface.h>
 
 class JMessageTip : public QObject
 {
@@ -41,7 +42,7 @@ public:
 
     /**ÏÈ´´½¨Ò»¸ö
      */
-    static void CreateCustomMessageDlg();
+    static void CreateCustomMessageDlg(const ns_module::ST_BUTTON_DONE& butDone);
 };
 
 #endif  //__JMESSAGETIP_H__