upright
/
valvedetect
mirror of https://gitlab.hzleaper.com:81/bob.pan/valvedetect.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加deviceMgr

Browse Source
valve_lucas
bobpan 5 years ago
parent 618c9c8a2d
commit 69aee070bd
8 changed files with 89 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
src/lpMain/TrigDetector.cpp
Unescape Escape View File

@ -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";

34
tpvs17/lpMain/CMainWin.cpp
Unescape Escape View File

@ -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) {

2
tpvs17/lpMain/CMainWin.h
Unescape Escape View File

@ -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;

11
tpvs17/lpMain/QDeviceMgrUI.cpp
Unescape Escape View File

@ -0,0 +1,11 @@
#include "QDeviceMgrUI.h"
QDeviceMgrUI::QDeviceMgrUI(QWidget *parent)
: QWidget(parent)
{
ui.setupUi(this);
}
QDeviceMgrUI::~QDeviceMgrUI()
{
}

19
tpvs17/lpMain/QDeviceMgrUI.h
Unescape Escape View File

@ -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

20
tpvs17/lpMain/QDeviceMgrUI.ui
Unescape Escape View File

@ -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>

6
tpvs17/lpMain/lpMain.vcxproj
Unescape Escape View File

@ -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>

9
tpvs17/lpMain/lpMain.vcxproj.filters
Unescape Escape View File

@ -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">

Write Preview
Loading…
Cancel
Save