diff --git a/release/runner17_ValueDetect/algorithmLib/valveDetector.dll b/release/runner17_ValueDetect/algorithmLib/valveDetector.dll index d6e65b9..564d66a 100644 Binary files a/release/runner17_ValueDetect/algorithmLib/valveDetector.dll and b/release/runner17_ValueDetect/algorithmLib/valveDetector.dll differ diff --git a/release/runner17_ValueDetect/dbLog.db b/release/runner17_ValueDetect/dbLog.db index d63d987..229dba3 100644 Binary files a/release/runner17_ValueDetect/dbLog.db and b/release/runner17_ValueDetect/dbLog.db differ diff --git a/release/runner17_ValueDetect/lpMain.dll b/release/runner17_ValueDetect/lpMain.dll index 55c9c03..1800620 100644 Binary files a/release/runner17_ValueDetect/lpMain.dll and b/release/runner17_ValueDetect/lpMain.dll differ diff --git a/release/runner17_ValueDetect/lpbengine.dll b/release/runner17_ValueDetect/lpbengine.dll index 10f6274..05d7c1e 100644 Binary files a/release/runner17_ValueDetect/lpbengine.dll and b/release/runner17_ValueDetect/lpbengine.dll differ diff --git a/release/runner17_ValueDetect/lpdesigner.dll b/release/runner17_ValueDetect/lpdesigner.dll index 584f905..d9365ce 100644 Binary files a/release/runner17_ValueDetect/lpdesigner.dll and b/release/runner17_ValueDetect/lpdesigner.dll differ diff --git a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_18_in.wsf deleted file mode 100644 index ef4cd22..0000000 Binary files a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_18_in.wsf and /dev/null differ diff --git a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_21_in.wsf deleted file mode 100644 index 68ff946..0000000 Binary files a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_21_in.wsf and /dev/null differ diff --git a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_22_in.wsf deleted file mode 100644 index 68ff946..0000000 Binary files a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_22_in.wsf and /dev/null differ diff --git a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_7_in.wsf deleted file mode 100644 index a9729ab..0000000 Binary files a/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_7_in.wsf and /dev/null differ diff --git a/release/runner17_ValueDetect/solutions/1_模型列表/A1/template.png b/release/runner17_ValueDetect/solutions/1_模型列表/A1/template.png deleted file mode 100644 index 30b4f76..0000000 Binary files a/release/runner17_ValueDetect/solutions/1_模型列表/A1/template.png and /dev/null differ diff --git a/release/runner17_ValueDetect/solutions/1_模型列表/info.json b/release/runner17_ValueDetect/solutions/1_模型列表/info.json index 55d7b6c..7b26ce1 100644 --- a/release/runner17_ValueDetect/solutions/1_模型列表/info.json +++ b/release/runner17_ValueDetect/solutions/1_模型列表/info.json @@ -5,7 +5,7 @@ "solution_type": 1, "tasklist": [ "123", - "A1", + "A12", "B2", "C3", "D4", diff --git a/release/runner17_ValueDetect/user/plcIndex.json b/release/runner17_ValueDetect/user/plcIndex.json index 90d560b..894d5fb 100644 --- a/release/runner17_ValueDetect/user/plcIndex.json +++ b/release/runner17_ValueDetect/user/plcIndex.json @@ -1,12 +1,24 @@ { "1_模型列表": [ { - "Name": "A1", + "Name": "123", + "PlcIndex": 30 + }, + { + "Name": "A12", "PlcIndex": 2 }, { "Name": "B2", "PlcIndex": 1 + }, + { + "Name": "C3", + "PlcIndex": 10 + }, + { + "Name": "D4", + "PlcIndex": 20 } ], "2_模型列表": [ @@ -16,11 +28,19 @@ }, { "Name": "A1", - "PlcIndex": 2 + "PlcIndex": 5 }, { "Name": "B2", - "PlcIndex": 1 + "PlcIndex": 4 + }, + { + "Name": "C3", + "PlcIndex": 30 + }, + { + "Name": "D4", + "PlcIndex": 40 } ] } diff --git a/release/气门芯定位检测更新内容.txt b/release/气门芯定位检测更新内容.txt index 68291a1..cf123aa 100644 --- a/release/气门芯定位检测更新内容.txt +++ b/release/气门芯定位检测更新内容.txt @@ -57,4 +57,14 @@ 2、调整控件按钮的显示大小和字体 2021-11-03 1、增加4点场景标定支持，通过系统参数设置页面勾选打开。默认情况下使用2点标定 -2、UI相关调整 美化和增加提示 \ No newline at end of file +2、UI相关调整 美化和增加提示 +2021-12-01 +1、气门芯定位算法valuedetect模块增加圆心定位偏移判断参数设置，开放到UI上可调。 +参数位于【检测】算法里 centeroffset参数，在输入参数中可设，设置后需要点击保存才能生效 +2、修复气门芯标定页面只修改参数时，点击保存没有把相应参数保存到文件中的问题 + +2021-12-03 +1、增加型号名修改功能 +2、增加ROI标定坐标设置功能 +3、标定页面参数刷新逻辑调整 +4、检测算法增加圆心偏移参数阈值设置，开放到UI上设置 \ No newline at end of file diff --git a/runner17/algorithmLib/caliCenter.dll b/runner17/algorithmLib/caliCenter.dll index 9efd251..257c7f2 100644 Binary files a/runner17/algorithmLib/caliCenter.dll and b/runner17/algorithmLib/caliCenter.dll differ diff --git a/runner17/algorithmLib/caliValve.dll b/runner17/algorithmLib/caliValve.dll index ab5cfd6..7eb3379 100644 Binary files a/runner17/algorithmLib/caliValve.dll and b/runner17/algorithmLib/caliValve.dll differ diff --git a/runner17/algorithmLib/valveDetector.dll b/runner17/algorithmLib/valveDetector.dll index f15394e..8e0abf0 100644 Binary files a/runner17/algorithmLib/valveDetector.dll and b/runner17/algorithmLib/valveDetector.dll differ diff --git a/runner17/algorithmLib/valveDetectord.dll b/runner17/algorithmLib/valveDetectord.dll index f437a09..819c283 100644 Binary files a/runner17/algorithmLib/valveDetectord.dll and b/runner17/algorithmLib/valveDetectord.dll differ diff --git a/runner17/lpMain.dll b/runner17/lpMain.dll index 55c9c03..1800620 100644 Binary files a/runner17/lpMain.dll and b/runner17/lpMain.dll differ diff --git a/runner17/lpMaind.dll b/runner17/lpMaind.dll index ed7251f..22a678c 100644 Binary files a/runner17/lpMaind.dll and b/runner17/lpMaind.dll differ diff --git a/runner17/lpbengine.dll b/runner17/lpbengine.dll index 10f6274..05d7c1e 100644 Binary files a/runner17/lpbengine.dll and b/runner17/lpbengine.dll differ diff --git a/runner17/lpdesigner.dll b/runner17/lpdesigner.dll index 860227a..d9365ce 100644 Binary files a/runner17/lpdesigner.dll and b/runner17/lpdesigner.dll differ diff --git a/runner17/lpdesignerd.dll b/runner17/lpdesignerd.dll index 9a9c1da..add5347 100644 Binary files a/runner17/lpdesignerd.dll and b/runner17/lpdesignerd.dll differ diff --git a/runner17/showImg.ini b/runner17/showImg.ini index 74b4f5a..2dc0847 100644 --- a/runner17/showImg.ini +++ b/runner17/showImg.ini @@ -1,7 +1,7 @@ [ShowImg] Scale_Stand=0.28294005293337054 Scale_Standard=0.2663824433072367 -Scale_Standard_1=0.22628052895433784 -Scale_Standard_2=0.30910219214816836 +Scale_Standard_1=0.36442705468625075 +Scale_Standard_2=0.4259298339376627 ScaleA=0.15779670128476 ScaleB=0.16615203945157053