Skip to content

李娜 / SO664-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 2e06d2a8 由 LN
选项

新扫码算法更新

1 个父辈 2f2f236b
内嵌 并排
正在显示 10 个修改的文件 包含 27 行增加 和 18 行删除
dll/CodeLibrary.dll
此文件类型无法预览
dll/eyemLib.dll
此文件类型无法预览
dll/libdecode.dll
此文件类型无法预览
dll/model/detect-tiny.cfg
...@@ -124,7 +124,7 @@ activation=leaky ...@@ -124,7 +124,7 @@ activation=leaky
size=1 size=1
stride=1 stride=1
pad=1 pad=1
filters=21 filters=18
activation=linear activation=linear
...@@ -132,7 +132,7 @@ activation=linear ...@@ -132,7 +132,7 @@ activation=linear
[yolo] [yolo]
mask = 3,4,5 mask = 3,4,5
anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319 anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319
classes=2 classes=1
num=6 num=6
jitter=.3 jitter=.3
ignore_thresh = .7 ignore_thresh = .7
...@@ -168,13 +168,13 @@ activation=leaky ...@@ -168,13 +168,13 @@ activation=leaky
size=1 size=1
stride=1 stride=1
pad=1 pad=1
filters=21 filters=18
activation=linear activation=linear
[yolo] [yolo]
mask = 0,1,2 mask = 0,1,2
anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319 anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319
classes=2 classes=1
num=6 num=6
jitter=.3 jitter=.3
ignore_thresh = .7 ignore_thresh = .7
......
dll/model/detect-tiny.weights
此文件太大，无法显示。
source/AssemblyLineClient/model/detect-tiny.cfg
...@@ -124,7 +124,7 @@ activation=leaky ...@@ -124,7 +124,7 @@ activation=leaky
size=1 size=1
stride=1 stride=1
pad=1 pad=1
filters=21 filters=18
activation=linear activation=linear
...@@ -132,7 +132,7 @@ activation=linear ...@@ -132,7 +132,7 @@ activation=linear
[yolo] [yolo]
mask = 3,4,5 mask = 3,4,5
anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319 anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319
classes=2 classes=1
num=6 num=6
jitter=.3 jitter=.3
ignore_thresh = .7 ignore_thresh = .7
...@@ -168,13 +168,13 @@ activation=leaky ...@@ -168,13 +168,13 @@ activation=leaky
size=1 size=1
stride=1 stride=1
pad=1 pad=1
filters=21 filters=18
activation=linear activation=linear
[yolo] [yolo]
mask = 0,1,2 mask = 0,1,2
anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319 anchors = 10,14, 23,27, 37,58, 81,82, 135,169, 344,319
classes=2 classes=1
num=6 num=6
jitter=.3 jitter=.3
ignore_thresh = .7 ignore_thresh = .7
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
...@@ -139,21 +139,30 @@ namespace OnlineStore.DeviceLibrary ...@@ -139,21 +139,30 @@ namespace OnlineStore.DeviceLibrary
string r = ""; string r = "";
List<CodeInfo> tlci = EyemDecode.Decoder(ref bmp);
bool eyemNoCode = false; bool eyemNoCode = false;
foreach (CodeInfo code in tlci) Task eyemtask = Task.Factory.StartNew(delegate {
{ List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp);
LogUtil.info(deviceName + " 【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr); foreach (CodeInfo code in tlci)
string str = CodeManager.ReplaceCode(code.CodeStr);
if (!codeList.Contains(str))
{ {
codeList.Add(str); LogUtil.info(deviceName + " 【" + cameraName + "】[eyemDecode]" + code.CodeType + "(X: " + code.X + "，Y: " + code.Y + ") " + code.CodeStr);
r = r + "##eyem|" + code.CodeType + "|" + str; string str = CodeManager.ReplaceCode(code.CodeStr);
if (!findRightCode) if (!codeList.Contains(str))
{ {
findRightCode = HasRightCode(str); codeList.Add(str);
r = r + "##eyem|" + code.CodeType + "|" + str;
if (!findRightCode)
{
findRightCode = HasRightCode(str);
}
} }
} }
});
//最多等待60秒
bool taskResult = eyemtask.Wait(60000);
if (!taskResult)
{
LogUtil.error(deviceName + " 【" + cameraName + "】eyem扫码超时");
eyemNoCode = true;
} }
if (!isPreScan) if (!isPreScan)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!