退出崩溃

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

@@ -6,6 +6,7 @@
 #include <QMap>
 #include "BondGraphicsView.h"
 #include <CBondMatrix.h>
+#include "CProduct.h"
 
 class Bond : public QWidget {
     Q_OBJECT

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

@@ -115,7 +115,7 @@ void DbTreeViewManager::Init()
     m_pCModel       = new QStandardItemModel(this);
 
     m_sqlOper       = &SqlOperation::GetInstance();
-    m_pTreeCViewInterface.reset(ns_module::CViewInterface::GetInstance());
+    m_pTreeCViewInterface = ns_module::CViewInterface::GetInstance();
 }
 
 // 创建横线样式

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

@@ -286,7 +286,7 @@ private:
     /**组合控件
      */
     std::vector<ST_COMBINED_CONT> m_veCombinedCont;
-    std::unique_ptr<ns_module::CViewInterface> m_pTreeCViewInterface;
+    ns_module::CViewInterface* m_pTreeCViewInterface;
     QString m_strModuleTypeAAA;
 private:
 

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

@@ -23,7 +23,7 @@ OriginalWnd::OriginalWnd(QWidget* parent, CameraBind* pCameraBind)
 {
     ui->setupUi(this);
 
-    m_pCameraBind.reset(pCameraBind);
+    m_pCameraBind = pCameraBind;
     m_pCameraDistribute = CameraDistribute::GetInstance();
     StatusBar();
     RegFun();
@@ -49,7 +49,7 @@ OriginalWnd::~OriginalWnd()
 
 void OriginalWnd::CameraBindInit(CameraBind* pCameraBind)
 {
-    m_pCameraBind.reset(pCameraBind);
+    m_pCameraBind= pCameraBind;
 }
 
 void OriginalWnd::RegFun()
@@ -299,12 +299,12 @@ void OriginalWnd::on_stopButton_clicked()
 
 void OriginalWnd::SwitchMainPage(JOriginalMainWnd* pWnd, QToolButton* tooBut)
 {
-    if (m_pCameraBind == nullptr)
+    if (m_pCameraBind.isNull())
     {
         RegFun();
     }
     m_pCameraBind->SetImageWnd(pWnd);
-    pWnd->InitMainCameraBind(m_pCameraBind.get());
+    pWnd->InitMainCameraBind(m_pCameraBind);
 
     ui->switchShowPageUI->addWidget(pWnd);
     ui->switchShowPageUI->setCurrentIndex(ui->switchShowPageUI->indexOf(pWnd));

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

@@ -149,7 +149,7 @@ private:
 
     /**相机绑定接口
      */
-    std::unique_ptr<CameraBind> m_pCameraBind;
+    QPointer<CameraBind> m_pCameraBind;
 
     /**保存当前切换窗口
      */

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

@@ -239,6 +239,7 @@
     <ClCompile Include="Src\common\GlobalUse\JMouseMonitorThread.cpp" />
     <ClCompile Include="Src\common\JLogAllOutput.cpp" />
     <ClCompile Include="Src\common\JMessageTip.cpp" />
+    <ClCompile Include="Src\common\JQCommon.cpp" />
     <ClCompile Include="Src\common\JUserAccountsData.cpp" />
     <ClCompile Include="Src\RewriteControl\ControlOperationPage.cpp" />
     <ClCompile Include="Src\RewriteControl\JoystickPage.cpp" />
@@ -267,6 +268,7 @@
     <QtMoc Include="Src\common\GlobalUse\JMouseMonitorThread.h" />
     <ClInclude Include="Src\common\JLogAllOutput.h" />
     <QtMoc Include="Src\common\JMessageTip.h" />
+    <QtMoc Include="Src\common\JQCommon.h" />
     <ClInclude Include="Src\common\JUserAccountsData.h" />
     <ClInclude Include="Src\common\UserManagementShared.h" />
     <QtMoc Include="Src\RewriteControl\LightJoystickSwitchPage.h" />

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

@@ -168,9 +168,6 @@
     <ClCompile Include="OriginalWnd\JOriginalMainWnd.cpp">
       <Filter>Source Files\OriginalWnd</Filter>
     </ClCompile>
-    <ClCompile Include="Src\CameraBind.cpp">
-      <Filter>Header Files\Src</Filter>
-    </ClCompile>
     <ClCompile Include="OriginalWnd\DbTreeViewManager.cpp">
       <Filter>Source Files\OriginalWnd</Filter>
     </ClCompile>
@@ -261,6 +258,12 @@
     <ClCompile Include="ImageView.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Src\common\JQCommon.cpp">
+      <Filter>Source Files\Src\common</Filter>
+    </ClCompile>
+    <ClCompile Include="Src\CameraBind.cpp">
+      <Filter>Source Files\Src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="ImageWidget.h">
@@ -281,9 +284,6 @@
     <ClInclude Include="gen_interface.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <QtMoc Include="Src\CameraBind.h">
-      <Filter>Source Files\Src</Filter>
-    </QtMoc>
     <QtMoc Include="Src\common\JMessageTip.h">
       <Filter>Header Files\Src\common</Filter>
     </QtMoc>
@@ -356,6 +356,12 @@
     <QtMoc Include="ImageView.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    <QtMoc Include="Src\common\JQCommon.h">
+      <Filter>Header Files\Src\common</Filter>
+    </QtMoc>
+    <QtMoc Include="Src\CameraBind.h">
+      <Filter>Header Files\Src</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="debug\moc_predefs.h.cbt">

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

@@ -18,7 +18,8 @@ CameraBind::CameraBind()
 
 CameraBind::~CameraBind()
 {
-   // m_pCViewInterface = nullptr;
+    delete m_pCViewInterface;
+    m_pCViewInterface = nullptr;
 }
 
 void CameraBind::SetImageWnd(QWidget* pImageWnd)
@@ -28,7 +29,7 @@ void CameraBind::SetImageWnd(QWidget* pImageWnd)
 
 void CameraBind::InitAllCamera()
 {
-    m_pCViewInterface.reset(ns_module::CViewInterface::GetInstance());
+    m_pCViewInterface = ns_module::CViewInterface::GetInstance();
 
     if (m_pCViewInterface == nullptr)
     {

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

@@ -13,6 +13,7 @@
 #define __CAMERABIND_H__ 1
 
 #include <QObject>
+#include <QPointer>
 #include "Machine.h"
 #include "CViewInterface.h"
 
@@ -124,7 +125,7 @@ private:
 public:
     /**相机图像接口
     */
-    std::unique_ptr<ns_module::CViewInterface> m_pCViewInterface;
+    ns_module::CViewInterface* m_pCViewInterface;
 
     /**当前相机列表
     */

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

@@ -1,6 +1,7 @@
 #include "LightJoystickSwitchPage.h"
 #include "ui_LightJoystickSwitchPage.h"
 #include "../common/JMessageTip.h"
+#include "../common/JQCommon.h"
 
 LightJoystickSwitchPage::LightJoystickSwitchPage(QWidget *parent)
     : QWidget(parent)
@@ -23,8 +24,7 @@ void LightJoystickSwitchPage::InitForm()
     InitLineEdits();
     SliderBind();
 
-    QDoubleValidator* validator = new QDoubleValidator(-1e12, 1e12, 6, this);
-    ui->valLineEdit->setValidator(validator);
+    JQCommon::SetQLineEditLimit(ui->valLineEdit);
 }
 
 

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

@@ -22,7 +22,7 @@
 
 SqlOperation::SqlOperation()
 {
-    m_pCViewInterface.reset(ns_module::CViewInterface::GetInstance());
+    m_pCViewInterface = ns_module::CViewInterface::GetInstance();
     if (m_pCViewInterface == nullptr)
     {
         ErrorInfo(QObject::tr("SqlOperation:Initialization failed, please check", "³õʼ»¯Ê§°Ü,Çë¼ì²é"));

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

@@ -127,7 +127,7 @@ private:
 
 private:
 
-    std::unique_ptr<ns_module::CViewInterface> m_pCViewInterface;
+    ns_module::CViewInterface* m_pCViewInterface;
 
     //每个目录表格名字对应的目录
     QMap<QString, QList<QJsonObject>> m_mapAllDirectories;

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

@@ -0,0 +1,10 @@
+#include "JQCommon.h"
+#include <QDoubleValidator>
+
+JQCommon::JQCommon() {}
+
+void JQCommon::SetQLineEditLimit(QLineEdit* pLineEdit)
+{
+    QDoubleValidator* validator = new QDoubleValidator(-1e12, 1e12, 6, pLineEdit);
+    pLineEdit->setValidator(validator);
+}

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

@@ -0,0 +1,27 @@
+// *****************************************************************************
+// 版权所有（C）2023~2099 上海骄成超声波技术有限公司
+// 保留所有权利
+// *****************************************************************************
+// 作者 : 杨坚
+// 版本 : 1.0
+// 功能说明:
+//          qt 通用控件设置
+// *****************************************************************************
+#ifndef JQCOMMON_H
+#define JQCOMMON_H
+
+#include <QObject>
+#include <QLineEdit>
+
+class JQCommon : public QObject
+{
+    Q_OBJECT
+public:
+    JQCommon();
+
+    /**设置控件范围 int double flate
+     */
+    static void SetQLineEditLimit(QLineEdit* pLineEdit);
+};
+
+#endif // JQCOMMON_H