From 69aee070bda4d5742b6ccbde71d9358dbef18442 Mon Sep 17 00:00:00 2001
From: bobpan <bob.pan@hzleaper.com>
Date: Wed, 21 Oct 2020 09:17:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0deviceMgr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lpMain/TrigDetector.cpp          |  2 +-
 tpvs17/lpMain/CMainWin.cpp           | 34 +++++++++++++++++-----------
 tpvs17/lpMain/CMainWin.h             |  2 ++
 tpvs17/lpMain/QDeviceMgrUI.cpp       | 11 +++++++++
 tpvs17/lpMain/QDeviceMgrUI.h         | 19 ++++++++++++++++
 tpvs17/lpMain/QDeviceMgrUI.ui        | 20 ++++++++++++++++
 tpvs17/lpMain/lpMain.vcxproj         |  6 +++++
 tpvs17/lpMain/lpMain.vcxproj.filters |  9 ++++++++
 8 files changed, 89 insertions(+), 14 deletions(-)
 create mode 100644 tpvs17/lpMain/QDeviceMgrUI.cpp
 create mode 100644 tpvs17/lpMain/QDeviceMgrUI.h
 create mode 100644 tpvs17/lpMain/QDeviceMgrUI.ui

diff --git a/src/lpMain/TrigDetector.cpp b/src/lpMain/TrigDetector.cpp
index b4d1d31..eee08f8 100644
--- a/src/lpMain/TrigDetector.cpp
+++ b/src/lpMain/TrigDetector.cpp
@@ -109,7 +109,7 @@ bool CTrigDetector::filterTrig()
 	if (interval < 0)
 		return true;
 	if (interval < 350) {
-		qWarning() << "trig less than interval";
+		//qWarning() << "trig less than interval";
 		if (nCount++ > lpSysConfig::instance()->m_TrigerFilter)
 		{
 			qWarning() << "correct";
diff --git a/tpvs17/lpMain/CMainWin.cpp b/tpvs17/lpMain/CMainWin.cpp
index 6bdf1fc..3981cec 100644
--- a/tpvs17/lpMain/CMainWin.cpp
+++ b/tpvs17/lpMain/CMainWin.cpp
@@ -116,7 +116,7 @@ CMainWin::CMainWin(QWidget *parent)
 
 	m_TimerID_Status = startTimer(1000);
 	ui.main_action_userManager->setVisible(false);
-	ui.action->setVisible(false);
+	//ui.action->setVisible(false);
 
 	QTextDocument *pDoc = ui.wf_text_edit_result_1->document();
  	pDoc->setMaximumBlockCount(200);
@@ -126,17 +126,7 @@ CMainWin::CMainWin(QWidget *parent)
 
 CMainWin::~CMainWin()
 {
-	if (m_pDllDetectorEngine)
-	{
-		delete m_pDllDetectorEngine;
-		m_pDllDetectorEngine = nullptr;
-	}
-	//load coretrl
-	if (m_pDllCoreCtrl)
-	{
-		delete m_pDllCoreCtrl;
-		m_pDllCoreCtrl = nullptr;
-	}
+
 // 	if (m_pDesignerMgr)
 // 	{
 // 		delete m_pDesignerMgr;
@@ -160,6 +150,18 @@ CMainWin::~CMainWin()
 		delete m_pSerialPort;
 		m_pSerialPort = NULL;
 	}
+
+	if (m_pDllDetectorEngine)
+	{
+		delete m_pDllDetectorEngine;
+		m_pDllDetectorEngine = nullptr;
+	}
+	//load coretrl
+	if (m_pDllCoreCtrl)
+	{
+		delete m_pDllCoreCtrl;
+		m_pDllCoreCtrl = nullptr;
+	}
 	rmTranslator();
 	lpSysLog::uninstance();
 }
@@ -522,6 +524,7 @@ Q_SLOT void CMainWin::onActionClicked()
 		m_testWid.show();
 	}
 	else if ("actionHelp" == strObj) {//帮助
+		m_aboutWid.setParent(this);
 		m_aboutWid.setWindowIcon(QIcon(LEAPER_LOGO));
 		m_aboutWid.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
 		m_aboutWid.setWindowModality(Qt::ApplicationModal);
@@ -539,7 +542,12 @@ Q_SLOT void CMainWin::onActionClicked()
 		process.startDetached(strTaskName);
 	}
 	else if ("action" == strObj) {//系统参数设置
-
+		m_devMgrWid.setParent(this);
+		m_devMgrWid.setWindowIcon(QIcon(LEAPER_LOGO));
+		m_devMgrWid.setWindowFlags(Qt::Dialog | Qt::WindowCloseButtonHint);
+		m_devMgrWid.setWindowModality(Qt::ApplicationModal);
+		m_devMgrWid.setAttribute(Qt::WA_ShowModal, true);
+		m_devMgrWid.show();
 	}
 	else if ("main_Login_action" == strObj) {//用户登陆
 		if (m_pUserCtrl) {
diff --git a/tpvs17/lpMain/CMainWin.h b/tpvs17/lpMain/CMainWin.h
index eff5f60..2687283 100644
--- a/tpvs17/lpMain/CMainWin.h
+++ b/tpvs17/lpMain/CMainWin.h
@@ -18,6 +18,7 @@
 #include "iCoreCtrl.h"
 #include "QModelMangerUI.h"
 #include "QAboutUI.h"
+#include "QDeviceMgrUI.h"
 
 struct StationInfo
 {
@@ -129,6 +130,7 @@ private:
 	QTestModeWid m_testWid;
 	QModelMangerUI m_mangeWid;
 	QAboutUI m_aboutWid;
+	QDeviceMgrUI m_devMgrWid;
 
 	QString m_strUserName;
 	QString m_strComName;
diff --git a/tpvs17/lpMain/QDeviceMgrUI.cpp b/tpvs17/lpMain/QDeviceMgrUI.cpp
new file mode 100644
index 0000000..7dfe642
--- /dev/null
+++ b/tpvs17/lpMain/QDeviceMgrUI.cpp
@@ -0,0 +1,11 @@
+#include "QDeviceMgrUI.h"
+
+QDeviceMgrUI::QDeviceMgrUI(QWidget *parent)
+	: QWidget(parent)
+{
+	ui.setupUi(this);
+}
+
+QDeviceMgrUI::~QDeviceMgrUI()
+{
+}
diff --git a/tpvs17/lpMain/QDeviceMgrUI.h b/tpvs17/lpMain/QDeviceMgrUI.h
new file mode 100644
index 0000000..f71b68d
--- /dev/null
+++ b/tpvs17/lpMain/QDeviceMgrUI.h
@@ -0,0 +1,19 @@
+#ifndef _H_QDEVICEMGRUI_H_
+#define _H_QDEVICEMGRUI_H_
+
+#include <QWidget>
+#include "ui_QDeviceMgrUI.h"
+
+class QDeviceMgrUI : public QWidget
+{
+	Q_OBJECT
+
+public:
+	QDeviceMgrUI(QWidget *parent = Q_NULLPTR);
+	~QDeviceMgrUI();
+
+private:
+	Ui::QDeviceMgrUI ui;
+};
+
+#endif
diff --git a/tpvs17/lpMain/QDeviceMgrUI.ui b/tpvs17/lpMain/QDeviceMgrUI.ui
new file mode 100644
index 0000000..8b1d9ea
--- /dev/null
+++ b/tpvs17/lpMain/QDeviceMgrUI.ui
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QDeviceMgrUI</class>
+ <widget class="QWidget" name="QDeviceMgrUI">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>璁惧绠＄悊</string>
+  </property>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tpvs17/lpMain/lpMain.vcxproj b/tpvs17/lpMain/lpMain.vcxproj
index d8ac41e..f09b660 100644
--- a/tpvs17/lpMain/lpMain.vcxproj
+++ b/tpvs17/lpMain/lpMain.vcxproj
@@ -139,6 +139,7 @@
     <ClCompile Include="lpSysConfig.cpp" />
     <ClCompile Include="QAboutUI.cpp" />
     <ClCompile Include="QAddModeUI.cpp" />
+    <ClCompile Include="QDeviceMgrUI.cpp" />
     <ClCompile Include="QModelMangerUI.cpp" />
     <ClCompile Include="QPLCIndexUI.cpp" />
     <ClCompile Include="QTestModeWid.cpp" />
@@ -154,11 +155,16 @@
     <QtUic Include="CMainWin.ui" />
     <QtUic Include="QAboutUI.ui" />
     <QtUic Include="QAddModeUI.ui" />
+    <QtUic Include="QDeviceMgrUI.ui" />
     <QtUic Include="QModelMangerUI.ui" />
     <QtUic Include="QPLCIndexUI.ui" />
     <QtUic Include="QTestModeWid.ui" />
   </ItemGroup>
   <ItemGroup>
+    <QtMoc Include="QDeviceMgrUI.h">
+      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
+      <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
+    </QtMoc>
     <QtMoc Include="lpSysConfig.h">
       <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
       <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\GeneratedFiles;.;$(QTDIR)\include;.\GeneratedFiles\$(ConfigurationName);$(QTDIR)\include\QtCore;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtSerialBus;$(QTDIR)\include\QtSerialPort;$(QTDIR)\include\QtSql;.\..\..\3part\SerialPortTool\include;.\..\..\src\lpMain;.\..\..\src\lpMain\algela;.\..\..\src\lpMain\QDiskCleanThread;.\..\..\src\lpMain\sqliteDB;.\..\..\src\lpMain\UI;.\..\..\3part\opencv3.4.1\include;.\..\..\3part\opencv3.4.1\include\opencv;.\..\..\3part\opencv3.4.1\include\opencv2;.\..\..\3part\libzkq\include;.\..\..\3part\lpSyslog\inc;.\..\..\3part\customgui\include;.\..\..\src\userCtrl;.\..\..\src\lpMain\CoreCtrl;.\..\..\src\lpBase</IncludePath>
diff --git a/tpvs17/lpMain/lpMain.vcxproj.filters b/tpvs17/lpMain/lpMain.vcxproj.filters
index 66520be..471fd4b 100644
--- a/tpvs17/lpMain/lpMain.vcxproj.filters
+++ b/tpvs17/lpMain/lpMain.vcxproj.filters
@@ -130,6 +130,9 @@
     <ClCompile Include="lpSysConfig.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="QDeviceMgrUI.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="IMainWidget.h">
@@ -210,6 +213,9 @@
     <QtMoc Include="lpSysConfig.h">
       <Filter>Header Files</Filter>
     </QtMoc>
+    <QtMoc Include="QDeviceMgrUI.h">
+      <Filter>Header Files</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <QtUic Include="CMainWin.ui">
@@ -230,6 +236,9 @@
     <QtUic Include="QAddModeUI.ui">
       <Filter>Form Files</Filter>
     </QtUic>
+    <QtUic Include="QDeviceMgrUI.ui">
+      <Filter>Form Files</Filter>
+    </QtUic>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\lpMain\CoreCtrl\CDllCoreCtrl.h">