1、增加单工位切换

2、增加视场标定圆参数保存和使用 3、修改算法bug
4 years ago · 0dc4758b1b
parent c1995212ef
commit 0dc4758b1b
350 changed files with 83 additions and 106 deletions
--- a/release/runner17_ValueDetect/BO_GigEFilterDrv.dll
+++ b/release/runner17_ValueDetect/BO_GigEFilterDrv.dll
--- a/release/runner17_ValueDetect/DBFiles/AntMan.db
+++ b/release/runner17_ValueDetect/DBFiles/AntMan.db
--- a/release/runner17_ValueDetect/Enchanter.exe
+++ b/release/runner17_ValueDetect/Enchanter.exe
--- a/release/runner17_ValueDetect/MathParser.dll
+++ b/release/runner17_ValueDetect/MathParser.dll
--- a/release/runner17_ValueDetect/Net4Wheel.dll
+++ b/release/runner17_ValueDetect/Net4Wheel.dll
--- a/release/runner17_ValueDetect/QUserInfo.dll
+++ b/release/runner17_ValueDetect/QUserInfo.dll
--- a/release/runner17_ValueDetect/Qt5Concurrent.dll
+++ b/release/runner17_ValueDetect/Qt5Concurrent.dll
--- a/release/runner17_ValueDetect/Qt5Core.dll
+++ b/release/runner17_ValueDetect/Qt5Core.dll
--- a/release/runner17_ValueDetect/Qt5Gui.dll
+++ b/release/runner17_ValueDetect/Qt5Gui.dll
--- a/release/runner17_ValueDetect/Qt5Network.dll
+++ b/release/runner17_ValueDetect/Qt5Network.dll
--- a/release/runner17_ValueDetect/Qt5PrintSupport.dll
+++ b/release/runner17_ValueDetect/Qt5PrintSupport.dll
--- a/release/runner17_ValueDetect/Qt5SerialBus.dll
+++ b/release/runner17_ValueDetect/Qt5SerialBus.dll
--- a/release/runner17_ValueDetect/Qt5SerialPort.dll
+++ b/release/runner17_ValueDetect/Qt5SerialPort.dll
--- a/release/runner17_ValueDetect/Qt5Sql.dll
+++ b/release/runner17_ValueDetect/Qt5Sql.dll
--- a/release/runner17_ValueDetect/Qt5Svg.dll
+++ b/release/runner17_ValueDetect/Qt5Svg.dll
--- a/release/runner17_ValueDetect/Qt5WebSockets.dll
+++ b/release/runner17_ValueDetect/Qt5WebSockets.dll
--- a/release/runner17_ValueDetect/Qt5Widgets.dll
+++ b/release/runner17_ValueDetect/Qt5Widgets.dll
--- a/release/runner17_ValueDetect/Report.exe
+++ b/release/runner17_ValueDetect/Report.exe
--- a/release/runner17_ValueDetect/SerialPortTool.dll
+++ b/release/runner17_ValueDetect/SerialPortTool.dll
--- a/release/runner17_ValueDetect/TaskInfo.ini
+++ b/release/runner17_ValueDetect/TaskInfo.ini
--- a/release/runner17_ValueDetect/algorithmLib/caliCenter.dll
+++ b/release/runner17_ValueDetect/algorithmLib/caliCenter.dll
--- a/release/runner17_ValueDetect/algorithmLib/caliValve.dll
+++ b/release/runner17_ValueDetect/algorithmLib/caliValve.dll
--- a/release/runner17_ValueDetect/algorithmLib/valveDetector.dll
+++ b/release/runner17_ValueDetect/algorithmLib/valveDetector.dll
--- a/release/runner17_ValueDetect/bgapi2_genicam.dll
+++ b/release/runner17_ValueDetect/bgapi2_genicam.dll
--- a/release/runner17_ValueDetect/bgapi2_gige.cti
+++ b/release/runner17_ValueDetect/bgapi2_gige.cti
--- a/release/runner17_ValueDetect/bgapi2_img.dll
+++ b/release/runner17_ValueDetect/bgapi2_img.dll
--- a/release/runner17_ValueDetect/bgapi2_usb.cti
+++ b/release/runner17_ValueDetect/bgapi2_usb.cti
--- a/release/runner17_ValueDetect/bsysgige.xml
+++ b/release/runner17_ValueDetect/bsysgige.xml
--- a/release/runner17_ValueDetect/bsysusb.xml
+++ b/release/runner17_ValueDetect/bsysusb.xml
--- a/release/runner17_ValueDetect/concrt140.dll
+++ b/release/runner17_ValueDetect/concrt140.dll
--- a/release/runner17_ValueDetect/config/camera.json
+++ b/release/runner17_ValueDetect/config/camera.json
--- a/release/runner17_ValueDetect/config/communicate.json
+++ b/release/runner17_ValueDetect/config/communicate.json
--- a/release/runner17_ValueDetect/config/corectrl.json
+++ b/release/runner17_ValueDetect/config/corectrl.json
--- a/release/runner17_ValueDetect/config/exposure.json
+++ b/release/runner17_ValueDetect/config/exposure.json
--- a/release/runner17_ValueDetect/config/paramshare.json
+++ b/release/runner17_ValueDetect/config/paramshare.json
--- a/release/runner17_ValueDetect/config/windows.json
+++ b/release/runner17_ValueDetect/config/windows.json
--- a/release/runner17_ValueDetect/dbLog.db
+++ b/release/runner17_ValueDetect/dbLog.db
--- a/release/runner17_ValueDetect/hubdetect.ini
+++ b/release/runner17_ValueDetect/hubdetect.ini
--- a/release/runner17_ValueDetect/iconengines/qsvgicon.dll
+++ b/release/runner17_ValueDetect/iconengines/qsvgicon.dll
--- a/release/runner17_ValueDetect/imageformats/qgif.dll
+++ b/release/runner17_ValueDetect/imageformats/qgif.dll
--- a/release/runner17_ValueDetect/imageformats/qicns.dll
+++ b/release/runner17_ValueDetect/imageformats/qicns.dll
--- a/release/runner17_ValueDetect/imageformats/qico.dll
+++ b/release/runner17_ValueDetect/imageformats/qico.dll
--- a/release/runner17_ValueDetect/imageformats/qjpeg.dll
+++ b/release/runner17_ValueDetect/imageformats/qjpeg.dll
--- a/release/runner17_ValueDetect/imageformats/qsvg.dll
+++ b/release/runner17_ValueDetect/imageformats/qsvg.dll
--- a/release/runner17_ValueDetect/imageformats/qtga.dll
+++ b/release/runner17_ValueDetect/imageformats/qtga.dll
--- a/release/runner17_ValueDetect/imageformats/qtiff.dll
+++ b/release/runner17_ValueDetect/imageformats/qtiff.dll
--- a/release/runner17_ValueDetect/imageformats/qwbmp.dll
+++ b/release/runner17_ValueDetect/imageformats/qwbmp.dll
--- a/release/runner17_ValueDetect/imageformats/qwebp.dll
+++ b/release/runner17_ValueDetect/imageformats/qwebp.dll
--- a/release/runner17_ValueDetect/language/English/calicenter_en.qm
+++ b/release/runner17_ValueDetect/language/English/calicenter_en.qm
--- a/release/runner17_ValueDetect/language/English/calivalve_en.qm
+++ b/release/runner17_ValueDetect/language/English/calivalve_en.qm
--- a/release/runner17_ValueDetect/language/English/lpdesigner_en.qm
+++ b/release/runner17_ValueDetect/language/English/lpdesigner_en.qm
--- a/release/runner17_ValueDetect/language/English/lpmain_en.qm
+++ b/release/runner17_ValueDetect/language/English/lpmain_en.qm
--- a/release/runner17_ValueDetect/language/English/lpreport_en.qm
+++ b/release/runner17_ValueDetect/language/English/lpreport_en.qm
--- a/release/runner17_ValueDetect/language/English/quserinfo_en.qm
+++ b/release/runner17_ValueDetect/language/English/quserinfo_en.qm
--- a/release/runner17_ValueDetect/language/English/rastersdg20_en.qm
+++ b/release/runner17_ValueDetect/language/English/rastersdg20_en.qm
--- a/release/runner17_ValueDetect/language/English/report_en.qm
+++ b/release/runner17_ValueDetect/language/English/report_en.qm
--- a/release/runner17_ValueDetect/language/English/reportmodel_en.qm
+++ b/release/runner17_ValueDetect/language/English/reportmodel_en.qm
--- a/release/runner17_ValueDetect/language/English/valvedetector_en.qm
+++ b/release/runner17_ValueDetect/language/English/valvedetector_en.qm
--- a/release/runner17_ValueDetect/libEGL.dll
+++ b/release/runner17_ValueDetect/libEGL.dll
--- a/release/runner17_ValueDetect/libGLESv2.dll
+++ b/release/runner17_ValueDetect/libGLESv2.dll
--- a/release/runner17_ValueDetect/libeay32.dll
+++ b/release/runner17_ValueDetect/libeay32.dll
--- a/release/runner17_ValueDetect/libnlopt-0.dll
+++ b/release/runner17_ValueDetect/libnlopt-0.dll
--- a/release/runner17_ValueDetect/lpCoreCtrl.dll
+++ b/release/runner17_ValueDetect/lpCoreCtrl.dll
--- a/release/runner17_ValueDetect/lpMain.dll
+++ b/release/runner17_ValueDetect/lpMain.dll
--- a/release/runner17_ValueDetect/lpbengine.dll
+++ b/release/runner17_ValueDetect/lpbengine.dll
--- a/release/runner17_ValueDetect/lpdesigner.dll
+++ b/release/runner17_ValueDetect/lpdesigner.dll
--- a/release/runner17_ValueDetect/msvcp140.dll
+++ b/release/runner17_ValueDetect/msvcp140.dll
--- a/release/runner17_ValueDetect/msvcp140_1.dll
+++ b/release/runner17_ValueDetect/msvcp140_1.dll
--- a/release/runner17_ValueDetect/msvcp140_2.dll
+++ b/release/runner17_ValueDetect/msvcp140_2.dll
--- a/release/runner17_ValueDetect/opencv_world341.dll
+++ b/release/runner17_ValueDetect/opencv_world341.dll
--- a/release/runner17_ValueDetect/platforms/qminimal.dll
+++ b/release/runner17_ValueDetect/platforms/qminimal.dll
--- a/release/runner17_ValueDetect/platforms/qoffscreen.dll
+++ b/release/runner17_ValueDetect/platforms/qoffscreen.dll
--- a/release/runner17_ValueDetect/platforms/qwindows.dll
+++ b/release/runner17_ValueDetect/platforms/qwindows.dll
--- a/release/runner17_ValueDetect/printsupport/windowsprintersupport.dll
+++ b/release/runner17_ValueDetect/printsupport/windowsprintersupport.dll
--- a/release/runner17_ValueDetect/raster.json
+++ b/release/runner17_ValueDetect/raster.json
--- a/release/runner17_ValueDetect/set.ini
+++ b/release/runner17_ValueDetect/set.ini
--- a/release/runner17_ValueDetect/showImg.ini
+++ b/release/runner17_ValueDetect/showImg.ini
@ -1,7 +1,7 @@
 [ShowImg]
 Scale_Stand=0.28294005293337054
 Scale_Standard=0.2663824433072367
-Scale_Standard_1=0.1829515775204701
+Scale_Standard_1=0.4715957084312881
 Scale_Standard_2=0.2032795305783001
 ScaleA=0.24845275959570007
 ScaleB=0.2386627295411188
--- a/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_18_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_18_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_19_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_19_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_20_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_20_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_21_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_21_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_22_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_22_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_7_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_7_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/123/taskinfo.json
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/123/taskinfo.json
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_18_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_18_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_19_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_19_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_20_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_20_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_21_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_21_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_22_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_22_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_7_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_7_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/taskinfo.json
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/taskinfo.json
--- a/release/runner17_ValueDetect/solutions/1_模型列表/3333/template.png
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/3333/template.png
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_18_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_18_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_19_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_19_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_20_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_20_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_21_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_21_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_22_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_22_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_7_in.wsf
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_7_in.wsf
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/taskinfo.json
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/taskinfo.json
--- a/release/runner17_ValueDetect/solutions/1_模型列表/4444/template.png
+++ b/release/runner17_ValueDetect/solutions/1_模型列表/4444/template.png
--- a/Show More
+++ b/Show More