diff --git a/runner17/user/selfdefine.json b/runner17/user/selfdefine.json
new file mode 100644
index 0000000..0f46753
--- /dev/null
+++ b/runner17/user/selfdefine.json
@@ -0,0 +1,69 @@
+{
+ "AlgPara": {
+ "Threshold": 60
+ },
+ "AutoSystem": {
+ "AutoSendTick2COM": 1,
+ "AutoSendTick2Net": 1,
+ "CameraTrigerType": 0,
+ "IsUseChannel": 0,
+ "IsUseRaster": 1,
+ "SaveD2HCsv": 0,
+ "SendChannelRes2COM": 1,
+ "SendChannelRes2Net": 1,
+ "SendDetectStr2Net": 1,
+ "StartAndDetect": 1,
+ "showThressList": 0,
+ "showThressValue": 0
+ },
+ "CheckDB": {
+ "AutoDelCountUser": 100000,
+ "AutoDelCountWarn": 100000,
+ "AutoDelTime": 0,
+ "AutoDel_days": 3650
+ },
+ "DetectImage": {
+ "Debug": 1001,
+ "SaveCut_Bad": 1,
+ "SaveCut_Good": 1,
+ "SaveImgPath": "D:/汽摩轮/分类软件/runner17 -20210706",
+ "Save_Bad": 1,
+ "Save_Good": 0,
+ "UseBackground": 1
+ },
+ "DetectModl": {
+ "UseCutImg": 0,
+ "Virsual_Camera": 1,
+ "Virsual_Times": 3000
+ },
+ "Dia2Th": {
+ "b": 0.7862445712089539,
+ "k": -0.0007752884412184358
+ },
+ "TcpNetWork": {
+ "TCP_Address": "192.168.0.240",
+ "TCP_Type": "server",
+ "TCP_port": 2000,
+ "client_IP": "192.168.0.119",
+ "client_port": 2000
+ },
+ "alg": {
+ "useDiameter": 1,
+ "useThickness": 0
+ },
+ "detectState": {
+ "isOnline": false
+ },
+ "plcPara": {
+ "CamTrigDelay": 2000,
+ "CamTrigPulse": 10,
+ "IsRestartServer": 0,
+ "IsSaveMsgInlog": 0,
+ "LightDelay": 10,
+ "ResHoldTime": 5,
+ "ShowTimeOutMsg": 0,
+ "TimeOutCount": 1,
+ "TrigerFilter": 10,
+ "TrigerType": 1
+ }
+}
diff --git a/src/tpMain/qworkmgrui.cpp b/src/tpMain/qworkmgrui.cpp
index 3e5b30a..4f21dd8 100644
--- a/src/tpMain/qworkmgrui.cpp
+++ b/src/tpMain/qworkmgrui.cpp
@@ -25,6 +25,8 @@ QWorkMgrUI::QWorkMgrUI(QWorkMgrCtlr *pWork, IWheelCtrl *pCtrl)
ui.setupUi(this);
m_pWidgetMain = NULL;
connect(this, SIGNAL(sgShowMsg(QString)), this, SLOT(onShowMsg(QString)));
+ connect(ui.work_mode_UseDiameter, SIGNAL(stateChanged(int)), this, SLOT(onStateChangedDiameter(int)));
+ connect(ui.work_mode_UseThickness, SIGNAL(stateChanged(int)), this, SLOT(onStateChangedThickness(int)));
bEdit = false;
setWindowIcon(QIcon(":/image/leaper"));
setWindowTitle(tr("检测模板管理"));
@@ -259,7 +261,16 @@ bool QWorkMgrUI::onStateChanged(QObject* watched, int state)
}
return true;
}
-
+void QWorkMgrUI::onStateChangedThickness(int state)
+{
+ DetectState::instance()->bUseThickness = state == 2;
+ DetectState::instance()->save();
+}
+void QWorkMgrUI::onStateChangedDiameter(int state)
+{
+ DetectState::instance()->bUseDiameter = state == 2;
+ DetectState::instance()->save();
+}
bool QWorkMgrUI::onUserRole()
{
int nLevel = m_pCtrl->getUserLevel();
diff --git a/src/tpMain/qworkmgrui.h b/src/tpMain/qworkmgrui.h
index 5522185..f48b16a 100644
--- a/src/tpMain/qworkmgrui.h
+++ b/src/tpMain/qworkmgrui.h
@@ -31,6 +31,8 @@ public:
void setData2Show(QString str);
void modWorkMgr(const QString &str);//修改所有工作单中的模板并保存到json中
+ Q_SLOT void onStateChangedDiameter(int state);
+ Q_SLOT void onStateChangedThickness(int state);
Q_SLOT void onTextChanged(QString);
//Q_SLOT void onSendModelState();
Q_SLOT void onSaveItemState(QString m_str);
diff --git a/src/tpMain/qworkmgrui.ui b/src/tpMain/qworkmgrui.ui
index 90f7b9c..6479ee4 100644
--- a/src/tpMain/qworkmgrui.ui
+++ b/src/tpMain/qworkmgrui.ui
@@ -336,7 +336,7 @@
- 0
+ 1