diff --git a/runner17/BO_GigEFilterDrv.dll b/runner17/BO_GigEFilterDrv.dll
new file mode 100644
index 0000000..f6c5146
Binary files /dev/null and b/runner17/BO_GigEFilterDrv.dll differ
diff --git a/runner17/MathParser.dll b/runner17/MathParser.dll
new file mode 100644
index 0000000..b43812f
Binary files /dev/null and b/runner17/MathParser.dll differ
diff --git a/runner17/bgapi2_genicam.dll b/runner17/bgapi2_genicam.dll
new file mode 100644
index 0000000..04609da
Binary files /dev/null and b/runner17/bgapi2_genicam.dll differ
diff --git a/runner17/bgapi2_gige.cti b/runner17/bgapi2_gige.cti
new file mode 100644
index 0000000..f2fdf8b
Binary files /dev/null and b/runner17/bgapi2_gige.cti differ
diff --git a/runner17/bgapi2_img.dll b/runner17/bgapi2_img.dll
new file mode 100644
index 0000000..7da1e04
Binary files /dev/null and b/runner17/bgapi2_img.dll differ
diff --git a/runner17/bgapi2_usb.cti b/runner17/bgapi2_usb.cti
new file mode 100644
index 0000000..3453427
Binary files /dev/null and b/runner17/bgapi2_usb.cti differ
diff --git a/runner17/bsysgige.xml b/runner17/bsysgige.xml
new file mode 100644
index 0000000..915e46d
--- /dev/null
+++ b/runner17/bsysgige.xml
@@ -0,0 +1,70 @@
+
+
+ 2.2.0.0
+
+ 1
+
+
+ 500
+
+ 3
+
+ 0
+
+ 20
+
+ 150
+
+ 20
+
+ 20
+
+ 100
+
+
+
+
+ 0
+
+ 3
+
+ 1
+
+
+ 100
+ 2
+
+
+
+ 9000
+
+ 0
+
+
+ 0
+ 0
+
+
+
+
+
diff --git a/runner17/bsysusb.xml b/runner17/bsysusb.xml
new file mode 100644
index 0000000..02af7a5
--- /dev/null
+++ b/runner17/bsysusb.xml
@@ -0,0 +1,17 @@
+
+
+ 2.2.0.0
+
+
+ 0x10000
+ 500
+ 1024
+
+
+ 0
+ 0
+
+
+
+
+
diff --git a/runner17/tpCam_140.dll b/runner17/tpCam_140.dll
index 1ce9256..4920a9f 100644
Binary files a/runner17/tpCam_140.dll and b/runner17/tpCam_140.dll differ
diff --git a/runner17/tpCam_140d.dll b/runner17/tpCam_140d.dll
index 8ff97d5..a5c3482 100644
Binary files a/runner17/tpCam_140d.dll and b/runner17/tpCam_140d.dll differ
diff --git a/runner17/tpCam_160.dll b/runner17/tpCam_160.dll
index 92166fa..90f70fd 100644
Binary files a/runner17/tpCam_160.dll and b/runner17/tpCam_160.dll differ
diff --git a/runner17/tpCam_160d.dll b/runner17/tpCam_160d.dll
index 4ffb7cd..d5d4148 100644
Binary files a/runner17/tpCam_160d.dll and b/runner17/tpCam_160d.dll differ
diff --git a/tpvs17/tpMain/lpMainWin.cpp b/tpvs17/tpMain/lpMainWin.cpp
index 2d125c5..f39d6fa 100644
--- a/tpvs17/tpMain/lpMainWin.cpp
+++ b/tpvs17/tpMain/lpMainWin.cpp
@@ -17,6 +17,7 @@
#include
#include "saveimgthread.h"
#include "lpGlobalData.h"
+#include "qpulpewidget.h"
#define VERSION_HUB "3.0.0.1"
#define VERSION_ALG "3.0.0.1"
#define UPDATE_TIME "2021-02-20"
@@ -215,16 +216,13 @@ lpMainWin::lpMainWin(QWidget *parent)
SendTiskTsk->start();
}
- if (DetectState::instance()->m_StartAndDetect == 1)//m_sysType 表示万丰科技的
+ //if (DetectState::instance()->m_StartAndDetect == 1)//m_sysType 表示万丰科技的
{
- // m_timerDetect.setSingleShot(true);
- // connect(&m_timerDetect, SIGNAL(timeout()), m_pUi, SLOT(onStartDetect()));
- // m_timerDetect.start(5000);
- //QTimer::singleShot(1000, m_pUi, SLOT(onStartDetect()));
- // QTimer::singleShot(3000, [&](){
- // m_pState->bLockDetect = true;
- // m_pCtrl->onStart();
- // });
+ QTimer::singleShot(3000, [&](){
+ ui.btn_start_detect->setText(tr("停止检测"));
+ DetectState::instance()->IsDetect = true;
+ m_pCtrl->onStart();
+ });
}
if (DetectState::instance()->m_AutoSendTick2COM)
m_wfPulseTimer.start(1000);
@@ -1208,13 +1206,13 @@ Q_SLOT void lpMainWin::onGetImg()
//展示信息
Q_SLOT void lpMainWin::onShowMsg(QString str)
{
-// QPulpewidget *pw = new QPulpewidget();
+ QPulpewidget *pw = new QPulpewidget();
// m_pw = pw;
// QMainWindow *m_pDlgMain = nullptr;// GET_WIDGET_POINTER("MainWindow", QMainWindow);
-// pw->setParent(m_pDlgMain);
-// pw->showmessage(str);
-// connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater()));
-// connect(pw, SIGNAL(finished()), this, SLOT(onInitPW()));
+ pw->setParent(this);
+ pw->showmessage(str);
+ connect(pw, SIGNAL(finished()), pw, SLOT(deleteLater()));
+ connect(pw, SIGNAL(finished()), this, SLOT(onInitPW()));
}
Q_SLOT void lpMainWin::onSendDisLib(int nIndex, QString strModel)