diff --git a/release/runner17_twoStation/BO_GigEFilterDrv.dll b/release/runner17_ValueDetect/BO_GigEFilterDrv.dll
similarity index 100%
rename from release/runner17_twoStation/BO_GigEFilterDrv.dll
rename to release/runner17_ValueDetect/BO_GigEFilterDrv.dll
diff --git a/release/runner17_twoStation/DBFiles/AntMan.db b/release/runner17_ValueDetect/DBFiles/AntMan.db
similarity index 100%
rename from release/runner17_twoStation/DBFiles/AntMan.db
rename to release/runner17_ValueDetect/DBFiles/AntMan.db
diff --git a/release/runner17_twoStation/Enchanter.exe b/release/runner17_ValueDetect/Enchanter.exe
similarity index 100%
rename from release/runner17_twoStation/Enchanter.exe
rename to release/runner17_ValueDetect/Enchanter.exe
diff --git a/release/runner17_twoStation/MathParser.dll b/release/runner17_ValueDetect/MathParser.dll
similarity index 100%
rename from release/runner17_twoStation/MathParser.dll
rename to release/runner17_ValueDetect/MathParser.dll
diff --git a/release/runner17_twoStation/Net4Wheel.dll b/release/runner17_ValueDetect/Net4Wheel.dll
similarity index 100%
rename from release/runner17_twoStation/Net4Wheel.dll
rename to release/runner17_ValueDetect/Net4Wheel.dll
diff --git a/release/runner17_twoStation/QUserInfo.dll b/release/runner17_ValueDetect/QUserInfo.dll
similarity index 100%
rename from release/runner17_twoStation/QUserInfo.dll
rename to release/runner17_ValueDetect/QUserInfo.dll
diff --git a/release/runner17_twoStation/Qt5Concurrent.dll b/release/runner17_ValueDetect/Qt5Concurrent.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5Concurrent.dll
rename to release/runner17_ValueDetect/Qt5Concurrent.dll
diff --git a/release/runner17_twoStation/Qt5Core.dll b/release/runner17_ValueDetect/Qt5Core.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5Core.dll
rename to release/runner17_ValueDetect/Qt5Core.dll
diff --git a/release/runner17_twoStation/Qt5Gui.dll b/release/runner17_ValueDetect/Qt5Gui.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5Gui.dll
rename to release/runner17_ValueDetect/Qt5Gui.dll
diff --git a/release/runner17_twoStation/Qt5Network.dll b/release/runner17_ValueDetect/Qt5Network.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5Network.dll
rename to release/runner17_ValueDetect/Qt5Network.dll
diff --git a/release/runner17_twoStation/Qt5PrintSupport.dll b/release/runner17_ValueDetect/Qt5PrintSupport.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5PrintSupport.dll
rename to release/runner17_ValueDetect/Qt5PrintSupport.dll
diff --git a/release/runner17_twoStation/Qt5SerialBus.dll b/release/runner17_ValueDetect/Qt5SerialBus.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5SerialBus.dll
rename to release/runner17_ValueDetect/Qt5SerialBus.dll
diff --git a/release/runner17_twoStation/Qt5SerialPort.dll b/release/runner17_ValueDetect/Qt5SerialPort.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5SerialPort.dll
rename to release/runner17_ValueDetect/Qt5SerialPort.dll
diff --git a/release/runner17_twoStation/Qt5Sql.dll b/release/runner17_ValueDetect/Qt5Sql.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5Sql.dll
rename to release/runner17_ValueDetect/Qt5Sql.dll
diff --git a/release/runner17_twoStation/Qt5Svg.dll b/release/runner17_ValueDetect/Qt5Svg.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5Svg.dll
rename to release/runner17_ValueDetect/Qt5Svg.dll
diff --git a/release/runner17_twoStation/Qt5WebSockets.dll b/release/runner17_ValueDetect/Qt5WebSockets.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5WebSockets.dll
rename to release/runner17_ValueDetect/Qt5WebSockets.dll
diff --git a/release/runner17_twoStation/Qt5Widgets.dll b/release/runner17_ValueDetect/Qt5Widgets.dll
similarity index 100%
rename from release/runner17_twoStation/Qt5Widgets.dll
rename to release/runner17_ValueDetect/Qt5Widgets.dll
diff --git a/release/runner17_ValueDetect/Report.exe b/release/runner17_ValueDetect/Report.exe
new file mode 100644
index 0000000..8aacd04
Binary files /dev/null and b/release/runner17_ValueDetect/Report.exe differ
diff --git a/release/runner17_twoStation/SerialPortTool.dll b/release/runner17_ValueDetect/SerialPortTool.dll
similarity index 100%
rename from release/runner17_twoStation/SerialPortTool.dll
rename to release/runner17_ValueDetect/SerialPortTool.dll
diff --git a/release/runner17_twoStation/TaskInfo.ini b/release/runner17_ValueDetect/TaskInfo.ini
similarity index 100%
rename from release/runner17_twoStation/TaskInfo.ini
rename to release/runner17_ValueDetect/TaskInfo.ini
diff --git a/release/runner17_twoStation/algorithmLib/caliCenter.dll b/release/runner17_ValueDetect/algorithmLib/caliCenter.dll
similarity index 100%
rename from release/runner17_twoStation/algorithmLib/caliCenter.dll
rename to release/runner17_ValueDetect/algorithmLib/caliCenter.dll
diff --git a/release/runner17_twoStation/algorithmLib/caliValve.dll b/release/runner17_ValueDetect/algorithmLib/caliValve.dll
similarity index 100%
rename from release/runner17_twoStation/algorithmLib/caliValve.dll
rename to release/runner17_ValueDetect/algorithmLib/caliValve.dll
diff --git a/release/runner17_twoStation/algorithmLib/valveDetector.dll b/release/runner17_ValueDetect/algorithmLib/valveDetector.dll
similarity index 74%
rename from release/runner17_twoStation/algorithmLib/valveDetector.dll
rename to release/runner17_ValueDetect/algorithmLib/valveDetector.dll
index 717cc67..d6e65b9 100644
Binary files a/release/runner17_twoStation/algorithmLib/valveDetector.dll and b/release/runner17_ValueDetect/algorithmLib/valveDetector.dll differ
diff --git a/release/runner17_twoStation/bgapi2_genicam.dll b/release/runner17_ValueDetect/bgapi2_genicam.dll
similarity index 100%
rename from release/runner17_twoStation/bgapi2_genicam.dll
rename to release/runner17_ValueDetect/bgapi2_genicam.dll
diff --git a/release/runner17_twoStation/bgapi2_gige.cti b/release/runner17_ValueDetect/bgapi2_gige.cti
similarity index 100%
rename from release/runner17_twoStation/bgapi2_gige.cti
rename to release/runner17_ValueDetect/bgapi2_gige.cti
diff --git a/release/runner17_twoStation/bgapi2_img.dll b/release/runner17_ValueDetect/bgapi2_img.dll
similarity index 100%
rename from release/runner17_twoStation/bgapi2_img.dll
rename to release/runner17_ValueDetect/bgapi2_img.dll
diff --git a/release/runner17_twoStation/bgapi2_usb.cti b/release/runner17_ValueDetect/bgapi2_usb.cti
similarity index 100%
rename from release/runner17_twoStation/bgapi2_usb.cti
rename to release/runner17_ValueDetect/bgapi2_usb.cti
diff --git a/release/runner17_twoStation/bsysgige.xml b/release/runner17_ValueDetect/bsysgige.xml
similarity index 100%
rename from release/runner17_twoStation/bsysgige.xml
rename to release/runner17_ValueDetect/bsysgige.xml
diff --git a/release/runner17_twoStation/bsysusb.xml b/release/runner17_ValueDetect/bsysusb.xml
similarity index 100%
rename from release/runner17_twoStation/bsysusb.xml
rename to release/runner17_ValueDetect/bsysusb.xml
diff --git a/release/runner17_twoStation/concrt140.dll b/release/runner17_ValueDetect/concrt140.dll
similarity index 100%
rename from release/runner17_twoStation/concrt140.dll
rename to release/runner17_ValueDetect/concrt140.dll
diff --git a/release/runner17_twoStation/config/camera.json b/release/runner17_ValueDetect/config/camera.json
similarity index 100%
rename from release/runner17_twoStation/config/camera.json
rename to release/runner17_ValueDetect/config/camera.json
diff --git a/release/runner17_twoStation/config/communicate.json b/release/runner17_ValueDetect/config/communicate.json
similarity index 100%
rename from release/runner17_twoStation/config/communicate.json
rename to release/runner17_ValueDetect/config/communicate.json
diff --git a/release/runner17_twoStation/config/corectrl.json b/release/runner17_ValueDetect/config/corectrl.json
similarity index 100%
rename from release/runner17_twoStation/config/corectrl.json
rename to release/runner17_ValueDetect/config/corectrl.json
diff --git a/release/runner17_twoStation/config/exposure.json b/release/runner17_ValueDetect/config/exposure.json
similarity index 100%
rename from release/runner17_twoStation/config/exposure.json
rename to release/runner17_ValueDetect/config/exposure.json
diff --git a/release/runner17_twoStation/config/paramshare.json b/release/runner17_ValueDetect/config/paramshare.json
similarity index 100%
rename from release/runner17_twoStation/config/paramshare.json
rename to release/runner17_ValueDetect/config/paramshare.json
diff --git a/release/runner17_twoStation/config/windows.json b/release/runner17_ValueDetect/config/windows.json
similarity index 100%
rename from release/runner17_twoStation/config/windows.json
rename to release/runner17_ValueDetect/config/windows.json
diff --git a/release/runner17_twoStation/dbLog.db b/release/runner17_ValueDetect/dbLog.db
similarity index 97%
rename from release/runner17_twoStation/dbLog.db
rename to release/runner17_ValueDetect/dbLog.db
index 6252261..2f8ab22 100644
Binary files a/release/runner17_twoStation/dbLog.db and b/release/runner17_ValueDetect/dbLog.db differ
diff --git a/release/runner17_twoStation/hubdetect.ini b/release/runner17_ValueDetect/hubdetect.ini
similarity index 100%
rename from release/runner17_twoStation/hubdetect.ini
rename to release/runner17_ValueDetect/hubdetect.ini
diff --git a/release/runner17_twoStation/iconengines/qsvgicon.dll b/release/runner17_ValueDetect/iconengines/qsvgicon.dll
similarity index 100%
rename from release/runner17_twoStation/iconengines/qsvgicon.dll
rename to release/runner17_ValueDetect/iconengines/qsvgicon.dll
diff --git a/release/runner17_twoStation/imageformats/qgif.dll b/release/runner17_ValueDetect/imageformats/qgif.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qgif.dll
rename to release/runner17_ValueDetect/imageformats/qgif.dll
diff --git a/release/runner17_twoStation/imageformats/qicns.dll b/release/runner17_ValueDetect/imageformats/qicns.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qicns.dll
rename to release/runner17_ValueDetect/imageformats/qicns.dll
diff --git a/release/runner17_twoStation/imageformats/qico.dll b/release/runner17_ValueDetect/imageformats/qico.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qico.dll
rename to release/runner17_ValueDetect/imageformats/qico.dll
diff --git a/release/runner17_twoStation/imageformats/qjpeg.dll b/release/runner17_ValueDetect/imageformats/qjpeg.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qjpeg.dll
rename to release/runner17_ValueDetect/imageformats/qjpeg.dll
diff --git a/release/runner17_twoStation/imageformats/qsvg.dll b/release/runner17_ValueDetect/imageformats/qsvg.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qsvg.dll
rename to release/runner17_ValueDetect/imageformats/qsvg.dll
diff --git a/release/runner17_twoStation/imageformats/qtga.dll b/release/runner17_ValueDetect/imageformats/qtga.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qtga.dll
rename to release/runner17_ValueDetect/imageformats/qtga.dll
diff --git a/release/runner17_twoStation/imageformats/qtiff.dll b/release/runner17_ValueDetect/imageformats/qtiff.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qtiff.dll
rename to release/runner17_ValueDetect/imageformats/qtiff.dll
diff --git a/release/runner17_twoStation/imageformats/qwbmp.dll b/release/runner17_ValueDetect/imageformats/qwbmp.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qwbmp.dll
rename to release/runner17_ValueDetect/imageformats/qwbmp.dll
diff --git a/release/runner17_twoStation/imageformats/qwebp.dll b/release/runner17_ValueDetect/imageformats/qwebp.dll
similarity index 100%
rename from release/runner17_twoStation/imageformats/qwebp.dll
rename to release/runner17_ValueDetect/imageformats/qwebp.dll
diff --git a/release/runner17_twoStation/language/English/calicenter_en.qm b/release/runner17_ValueDetect/language/English/calicenter_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/calicenter_en.qm
rename to release/runner17_ValueDetect/language/English/calicenter_en.qm
diff --git a/release/runner17_twoStation/language/English/calivalve_en.qm b/release/runner17_ValueDetect/language/English/calivalve_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/calivalve_en.qm
rename to release/runner17_ValueDetect/language/English/calivalve_en.qm
diff --git a/release/runner17_twoStation/language/English/lpdesigner_en.qm b/release/runner17_ValueDetect/language/English/lpdesigner_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/lpdesigner_en.qm
rename to release/runner17_ValueDetect/language/English/lpdesigner_en.qm
diff --git a/release/runner17_twoStation/language/English/lpmain_en.qm b/release/runner17_ValueDetect/language/English/lpmain_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/lpmain_en.qm
rename to release/runner17_ValueDetect/language/English/lpmain_en.qm
diff --git a/release/runner17_twoStation/language/English/lpreport_en.qm b/release/runner17_ValueDetect/language/English/lpreport_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/lpreport_en.qm
rename to release/runner17_ValueDetect/language/English/lpreport_en.qm
diff --git a/release/runner17_twoStation/language/English/quserinfo_en.qm b/release/runner17_ValueDetect/language/English/quserinfo_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/quserinfo_en.qm
rename to release/runner17_ValueDetect/language/English/quserinfo_en.qm
diff --git a/release/runner17_twoStation/language/English/rastersdg20_en.qm b/release/runner17_ValueDetect/language/English/rastersdg20_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/rastersdg20_en.qm
rename to release/runner17_ValueDetect/language/English/rastersdg20_en.qm
diff --git a/release/runner17_ValueDetect/language/English/report_en.qm b/release/runner17_ValueDetect/language/English/report_en.qm
new file mode 100644
index 0000000..8ef8825
Binary files /dev/null and b/release/runner17_ValueDetect/language/English/report_en.qm differ
diff --git a/release/runner17_twoStation/language/English/reportmodel_en.qm b/release/runner17_ValueDetect/language/English/reportmodel_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/reportmodel_en.qm
rename to release/runner17_ValueDetect/language/English/reportmodel_en.qm
diff --git a/release/runner17_twoStation/language/English/valvedetector_en.qm b/release/runner17_ValueDetect/language/English/valvedetector_en.qm
similarity index 100%
rename from release/runner17_twoStation/language/English/valvedetector_en.qm
rename to release/runner17_ValueDetect/language/English/valvedetector_en.qm
diff --git a/release/runner17_twoStation/libEGL.dll b/release/runner17_ValueDetect/libEGL.dll
similarity index 100%
rename from release/runner17_twoStation/libEGL.dll
rename to release/runner17_ValueDetect/libEGL.dll
diff --git a/release/runner17_twoStation/libGLESv2.dll b/release/runner17_ValueDetect/libGLESv2.dll
similarity index 100%
rename from release/runner17_twoStation/libGLESv2.dll
rename to release/runner17_ValueDetect/libGLESv2.dll
diff --git a/release/runner17_twoStation/libeay32.dll b/release/runner17_ValueDetect/libeay32.dll
similarity index 100%
rename from release/runner17_twoStation/libeay32.dll
rename to release/runner17_ValueDetect/libeay32.dll
diff --git a/release/runner17_twoStation/libnlopt-0.dll b/release/runner17_ValueDetect/libnlopt-0.dll
similarity index 100%
rename from release/runner17_twoStation/libnlopt-0.dll
rename to release/runner17_ValueDetect/libnlopt-0.dll
diff --git a/release/runner17_twoStation/lpCoreCtrl.dll b/release/runner17_ValueDetect/lpCoreCtrl.dll
similarity index 100%
rename from release/runner17_twoStation/lpCoreCtrl.dll
rename to release/runner17_ValueDetect/lpCoreCtrl.dll
diff --git a/release/runner17_ValueDetect/lpMain.dll b/release/runner17_ValueDetect/lpMain.dll
new file mode 100644
index 0000000..7dc8b71
Binary files /dev/null and b/release/runner17_ValueDetect/lpMain.dll differ
diff --git a/release/runner17_twoStation/lpbengine.dll b/release/runner17_ValueDetect/lpbengine.dll
similarity index 100%
rename from release/runner17_twoStation/lpbengine.dll
rename to release/runner17_ValueDetect/lpbengine.dll
diff --git a/release/runner17_twoStation/lpdesigner.dll b/release/runner17_ValueDetect/lpdesigner.dll
similarity index 100%
rename from release/runner17_twoStation/lpdesigner.dll
rename to release/runner17_ValueDetect/lpdesigner.dll
diff --git a/release/runner17_twoStation/msvcp140.dll b/release/runner17_ValueDetect/msvcp140.dll
similarity index 100%
rename from release/runner17_twoStation/msvcp140.dll
rename to release/runner17_ValueDetect/msvcp140.dll
diff --git a/release/runner17_twoStation/msvcp140_1.dll b/release/runner17_ValueDetect/msvcp140_1.dll
similarity index 100%
rename from release/runner17_twoStation/msvcp140_1.dll
rename to release/runner17_ValueDetect/msvcp140_1.dll
diff --git a/release/runner17_twoStation/msvcp140_2.dll b/release/runner17_ValueDetect/msvcp140_2.dll
similarity index 100%
rename from release/runner17_twoStation/msvcp140_2.dll
rename to release/runner17_ValueDetect/msvcp140_2.dll
diff --git a/release/runner17_twoStation/opencv_world341.dll b/release/runner17_ValueDetect/opencv_world341.dll
similarity index 100%
rename from release/runner17_twoStation/opencv_world341.dll
rename to release/runner17_ValueDetect/opencv_world341.dll
diff --git a/release/runner17_twoStation/platforms/qminimal.dll b/release/runner17_ValueDetect/platforms/qminimal.dll
similarity index 100%
rename from release/runner17_twoStation/platforms/qminimal.dll
rename to release/runner17_ValueDetect/platforms/qminimal.dll
diff --git a/release/runner17_twoStation/platforms/qoffscreen.dll b/release/runner17_ValueDetect/platforms/qoffscreen.dll
similarity index 100%
rename from release/runner17_twoStation/platforms/qoffscreen.dll
rename to release/runner17_ValueDetect/platforms/qoffscreen.dll
diff --git a/release/runner17_twoStation/platforms/qwindows.dll b/release/runner17_ValueDetect/platforms/qwindows.dll
similarity index 100%
rename from release/runner17_twoStation/platforms/qwindows.dll
rename to release/runner17_ValueDetect/platforms/qwindows.dll
diff --git a/release/runner17_twoStation/printsupport/windowsprintersupport.dll b/release/runner17_ValueDetect/printsupport/windowsprintersupport.dll
similarity index 100%
rename from release/runner17_twoStation/printsupport/windowsprintersupport.dll
rename to release/runner17_ValueDetect/printsupport/windowsprintersupport.dll
diff --git a/release/runner17_twoStation/raster.json b/release/runner17_ValueDetect/raster.json
similarity index 100%
rename from release/runner17_twoStation/raster.json
rename to release/runner17_ValueDetect/raster.json
diff --git a/release/runner17_twoStation/set.ini b/release/runner17_ValueDetect/set.ini
similarity index 100%
rename from release/runner17_twoStation/set.ini
rename to release/runner17_ValueDetect/set.ini
diff --git a/release/runner17_twoStation/showImg.ini b/release/runner17_ValueDetect/showImg.ini
similarity index 82%
rename from release/runner17_twoStation/showImg.ini
rename to release/runner17_ValueDetect/showImg.ini
index 89c57c0..445735b 100644
--- a/release/runner17_twoStation/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
diff --git a/release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/123/1_7_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/123/1_7_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/123/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/123/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/123/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/123/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/1_10_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/1_10_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/3333/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/3333/template.png b/release/runner17_ValueDetect/solutions/1_模型列表/3333/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/3333/template.png
rename to release/runner17_ValueDetect/solutions/1_模型列表/3333/template.png
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/1_11_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/1_11_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/4444/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/4444/template.png b/release/runner17_ValueDetect/solutions/1_模型列表/4444/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/4444/template.png
rename to release/runner17_ValueDetect/solutions/1_模型列表/4444/template.png
diff --git a/release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/5555/1_12_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/5555/1_12_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/5555/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/5555/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/5555/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/5555/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/666/1_13_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/666/1_13_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/666/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/666/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/666/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/666/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/1_2_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/1_2_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/A1/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/A1/template.png b/release/runner17_ValueDetect/solutions/1_模型列表/A1/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/A1/template.png
rename to release/runner17_ValueDetect/solutions/1_模型列表/A1/template.png
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/1_3_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/1_3_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/B2/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/B2/template.png b/release/runner17_ValueDetect/solutions/1_模型列表/B2/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/B2/template.png
rename to release/runner17_ValueDetect/solutions/1_模型列表/B2/template.png
diff --git a/release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/C3/1_4_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/C3/1_4_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/C3/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/C3/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/C3/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/C3/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/D4/1_5_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/D4/1_5_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/D4/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/D4/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/D4/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/D4/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/info.json b/release/runner17_ValueDetect/solutions/1_模型列表/info.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/info.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/info.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_16_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_16_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_16_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_16_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_17_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_17_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_17_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_17_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_18_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_19_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_20_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_21_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_22_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_7_in.wsf b/release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/1_1_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/1_1_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/taskinfo.json b/release/runner17_ValueDetect/solutions/1_模型列表/template/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/taskinfo.json
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/1_模型列表/template/template.png b/release/runner17_ValueDetect/solutions/1_模型列表/template/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/1_模型列表/template/template.png
rename to release/runner17_ValueDetect/solutions/1_模型列表/template/template.png
diff --git a/release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/2/1_6_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/2/1_6_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/2/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/2/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/2/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/2/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/1_10_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/1_10_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/3333/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/3333/template.png b/release/runner17_ValueDetect/solutions/2_模型列表/3333/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/3333/template.png
rename to release/runner17_ValueDetect/solutions/2_模型列表/3333/template.png
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/1_11_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/1_11_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/4444/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/4444/template.png b/release/runner17_ValueDetect/solutions/2_模型列表/4444/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/4444/template.png
rename to release/runner17_ValueDetect/solutions/2_模型列表/4444/template.png
diff --git a/release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/5555/1_12_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/5555/1_12_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/5555/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/5555/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/5555/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/5555/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/666/1_13_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/666/1_13_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/666/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/666/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/666/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/666/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/1_2_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/1_2_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/A1/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/A1/template.png b/release/runner17_ValueDetect/solutions/2_模型列表/A1/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/A1/template.png
rename to release/runner17_ValueDetect/solutions/2_模型列表/A1/template.png
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/1_3_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/1_3_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/B2/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/B2/template.png b/release/runner17_ValueDetect/solutions/2_模型列表/B2/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/B2/template.png
rename to release/runner17_ValueDetect/solutions/2_模型列表/B2/template.png
diff --git a/release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/C3/1_4_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/C3/1_4_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/C3/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/C3/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/C3/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/C3/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/D4/1_5_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/D4/1_5_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/D4/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/D4/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/D4/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/D4/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/info.json b/release/runner17_ValueDetect/solutions/2_模型列表/info.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/info.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/info.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_16_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_16_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_16_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_16_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_17_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_17_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_17_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_17_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_18_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_18_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_18_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_18_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_19_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_19_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_19_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_19_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_20_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_20_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_20_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_20_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_21_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_21_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_21_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_21_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_22_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_22_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_22_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_22_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_7_in.wsf b/release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_7_in.wsf
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/1_1_3_7_in.wsf
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/1_1_3_7_in.wsf
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/taskinfo.json b/release/runner17_ValueDetect/solutions/2_模型列表/template/taskinfo.json
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/taskinfo.json
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/taskinfo.json
diff --git a/release/runner17_twoStation/solutions/2_模型列表/template/template.png b/release/runner17_ValueDetect/solutions/2_模型列表/template/template.png
similarity index 100%
rename from release/runner17_twoStation/solutions/2_模型列表/template/template.png
rename to release/runner17_ValueDetect/solutions/2_模型列表/template/template.png
diff --git a/release/runner17_twoStation/sqldrivers/qsqlite.dll b/release/runner17_ValueDetect/sqldrivers/qsqlite.dll
similarity index 100%
rename from release/runner17_twoStation/sqldrivers/qsqlite.dll
rename to release/runner17_ValueDetect/sqldrivers/qsqlite.dll
diff --git a/release/runner17_twoStation/sqldrivers/qsqlmysql.dll b/release/runner17_ValueDetect/sqldrivers/qsqlmysql.dll
similarity index 100%
rename from release/runner17_twoStation/sqldrivers/qsqlmysql.dll
rename to release/runner17_ValueDetect/sqldrivers/qsqlmysql.dll
diff --git a/release/runner17_twoStation/sqldrivers/qsqlodbc.dll b/release/runner17_ValueDetect/sqldrivers/qsqlodbc.dll
similarity index 100%
rename from release/runner17_twoStation/sqldrivers/qsqlodbc.dll
rename to release/runner17_ValueDetect/sqldrivers/qsqlodbc.dll
diff --git a/release/runner17_twoStation/sqldrivers/qsqlpsql.dll b/release/runner17_ValueDetect/sqldrivers/qsqlpsql.dll
similarity index 100%
rename from release/runner17_twoStation/sqldrivers/qsqlpsql.dll
rename to release/runner17_ValueDetect/sqldrivers/qsqlpsql.dll
diff --git a/release/runner17_twoStation/tpAlgorithm.dll b/release/runner17_ValueDetect/tpAlgorithm.dll
similarity index 100%
rename from release/runner17_twoStation/tpAlgorithm.dll
rename to release/runner17_ValueDetect/tpAlgorithm.dll
diff --git a/release/runner17_twoStation/tpCam_100.dll b/release/runner17_ValueDetect/tpCam_100.dll
similarity index 100%
rename from release/runner17_twoStation/tpCam_100.dll
rename to release/runner17_ValueDetect/tpCam_100.dll
diff --git a/release/runner17_twoStation/tpCam_120.dll b/release/runner17_ValueDetect/tpCam_120.dll
similarity index 100%
rename from release/runner17_twoStation/tpCam_120.dll
rename to release/runner17_ValueDetect/tpCam_120.dll
diff --git a/release/runner17_twoStation/tpCam_140.dll b/release/runner17_ValueDetect/tpCam_140.dll
similarity index 100%
rename from release/runner17_twoStation/tpCam_140.dll
rename to release/runner17_ValueDetect/tpCam_140.dll
diff --git a/release/runner17_twoStation/tpCam_160.dll b/release/runner17_ValueDetect/tpCam_160.dll
similarity index 100%
rename from release/runner17_twoStation/tpCam_160.dll
rename to release/runner17_ValueDetect/tpCam_160.dll
diff --git a/release/runner17_twoStation/user/StandImage_1.jpg b/release/runner17_ValueDetect/user/StandImage_1.jpg
similarity index 100%
rename from release/runner17_twoStation/user/StandImage_1.jpg
rename to release/runner17_ValueDetect/user/StandImage_1.jpg
diff --git a/release/runner17_twoStation/user/StandImage_2.jpg b/release/runner17_ValueDetect/user/StandImage_2.jpg
similarity index 100%
rename from release/runner17_twoStation/user/StandImage_2.jpg
rename to release/runner17_ValueDetect/user/StandImage_2.jpg
diff --git a/release/runner17_twoStation/user/globalConfig.json b/release/runner17_ValueDetect/user/globalConfig.json
similarity index 77%
rename from release/runner17_twoStation/user/globalConfig.json
rename to release/runner17_ValueDetect/user/globalConfig.json
index a1a536d..b48ee30 100644
--- a/release/runner17_twoStation/user/globalConfig.json
+++ b/release/runner17_ValueDetect/user/globalConfig.json
@@ -1,5 +1,5 @@
 {
-    "StationScale_1": 0.002975225298935762,
+    "StationScale_1": 0.0016182722354650834,
     "StationScale_2": 1.7149011188014898,
     "StationXOffset_1": 0,
     "StationXOffset_2": 1,
@@ -8,14 +8,15 @@
     "length_1": 1,
     "length_2": 1000,
     "onlineMode": false,
-    "point1_x_1": 1315,
+    "point1_x_1": 1925,
     "point1_x_2": 1313,
-    "point1_y_1": 952,
+    "point1_y_1": 872,
     "point1_y_2": 952,
-    "point2_x_1": 1528,
+    "point2_x_1": 1312,
     "point2_x_2": 1216,
-    "point2_y_1": 1212,
+    "point2_y_1": 950,
     "point2_y_2": 1527,
+    "pointCircle": 50,
     "station_camkey_1": "MV-CA050-10GC 00784638609",
     "station_camkey_2": "MV-CA050-10GC 10784638609",
     "station_runModel_1": "B2",
diff --git a/release/runner17_twoStation/user/plcIndex.json b/release/runner17_ValueDetect/user/plcIndex.json
similarity index 100%
rename from release/runner17_twoStation/user/plcIndex.json
rename to release/runner17_ValueDetect/user/plcIndex.json
diff --git a/release/runner17_twoStation/user/selfdefine1.json b/release/runner17_ValueDetect/user/selfdefine1.json
similarity index 100%
rename from release/runner17_twoStation/user/selfdefine1.json
rename to release/runner17_ValueDetect/user/selfdefine1.json
diff --git a/release/runner17_twoStation/user/standparam.ini b/release/runner17_ValueDetect/user/standparam.ini
similarity index 100%
rename from release/runner17_twoStation/user/standparam.ini
rename to release/runner17_ValueDetect/user/standparam.ini
diff --git a/release/runner17_twoStation/user/systemConfig.ini b/release/runner17_ValueDetect/user/systemConfig.ini
similarity index 100%
rename from release/runner17_twoStation/user/systemConfig.ini
rename to release/runner17_ValueDetect/user/systemConfig.ini
diff --git a/release/runner17_twoStation/usersInfo.db b/release/runner17_ValueDetect/usersInfo.db
similarity index 100%
rename from release/runner17_twoStation/usersInfo.db
rename to release/runner17_ValueDetect/usersInfo.db
diff --git a/release/runner17_twoStation/vccorlib140.dll b/release/runner17_ValueDetect/vccorlib140.dll
similarity index 100%
rename from release/runner17_twoStation/vccorlib140.dll
rename to release/runner17_ValueDetect/vccorlib140.dll
diff --git a/release/runner17_twoStation/vcruntime140.dll b/release/runner17_ValueDetect/vcruntime140.dll
similarity index 100%
rename from release/runner17_twoStation/vcruntime140.dll
rename to release/runner17_ValueDetect/vcruntime140.dll
diff --git a/release/runner17_twoStation/Report.exe b/release/runner17_twoStation/Report.exe
deleted file mode 100644
index c9bdc0e..0000000
Binary files a/release/runner17_twoStation/Report.exe and /dev/null differ
diff --git a/release/runner17_twoStation/lpMain.dll b/release/runner17_twoStation/lpMain.dll
deleted file mode 100644
index 7d51412..0000000
Binary files a/release/runner17_twoStation/lpMain.dll and /dev/null differ
diff --git a/release/气门芯定位检测更新内容.txt b/release/气门芯定位检测更新内容.txt
index e38ad97..8a9d080 100644
--- a/release/气门芯定位检测更新内容.txt
+++ b/release/气门芯定位检测更新内容.txt
@@ -25,4 +25,13 @@
 2021-10-19
 1、增加中英翻译切换
 2、增加权限管理 只对系统参数设置和测试菜单进行保护
-3、增加翻译文件
\ No newline at end of file
+3、增加翻译文件
+
+2021-10-20
+1、增加查看记录软件的英文翻译
+2、增加单工位支持 （切换方法，删除solution文件夹下的2号文件夹，只保留一个，然后重启软件）
+3、修复算法一个bug
+
+2021-10-20 2
+1、增加视场标定圆大小半径参数保存到配置文件中，需要自定义大小时，修改配置文件中的圆半径参数即可。
+参数文件位置：user/globalConfig.json 文件夹内，pointCircle参数所对应的数值。默认最小是20
\ No newline at end of file
diff --git a/runner17/solutions/2_模型列表/2/1_6_3_18_in.wsf b/runner17/2_模型列表/2/1_6_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/2/1_6_3_18_in.wsf
rename to runner17/2_模型列表/2/1_6_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/2/1_6_3_19_in.wsf b/runner17/2_模型列表/2/1_6_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/2/1_6_3_19_in.wsf
rename to runner17/2_模型列表/2/1_6_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/2/1_6_3_20_in.wsf b/runner17/2_模型列表/2/1_6_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/2/1_6_3_20_in.wsf
rename to runner17/2_模型列表/2/1_6_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/2/1_6_3_21_in.wsf b/runner17/2_模型列表/2/1_6_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/2/1_6_3_21_in.wsf
rename to runner17/2_模型列表/2/1_6_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/2/1_6_3_22_in.wsf b/runner17/2_模型列表/2/1_6_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/2/1_6_3_22_in.wsf
rename to runner17/2_模型列表/2/1_6_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/2/1_6_3_7_in.wsf b/runner17/2_模型列表/2/1_6_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/2/1_6_3_7_in.wsf
rename to runner17/2_模型列表/2/1_6_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/2/taskinfo.json b/runner17/2_模型列表/2/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/2/taskinfo.json
rename to runner17/2_模型列表/2/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/3333/1_10_3_18_in.wsf b/runner17/2_模型列表/3333/1_10_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/1_10_3_18_in.wsf
rename to runner17/2_模型列表/3333/1_10_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/3333/1_10_3_19_in.wsf b/runner17/2_模型列表/3333/1_10_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/1_10_3_19_in.wsf
rename to runner17/2_模型列表/3333/1_10_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/3333/1_10_3_20_in.wsf b/runner17/2_模型列表/3333/1_10_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/1_10_3_20_in.wsf
rename to runner17/2_模型列表/3333/1_10_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/3333/1_10_3_21_in.wsf b/runner17/2_模型列表/3333/1_10_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/1_10_3_21_in.wsf
rename to runner17/2_模型列表/3333/1_10_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/3333/1_10_3_22_in.wsf b/runner17/2_模型列表/3333/1_10_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/1_10_3_22_in.wsf
rename to runner17/2_模型列表/3333/1_10_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/3333/1_10_3_7_in.wsf b/runner17/2_模型列表/3333/1_10_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/1_10_3_7_in.wsf
rename to runner17/2_模型列表/3333/1_10_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/3333/taskinfo.json b/runner17/2_模型列表/3333/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/taskinfo.json
rename to runner17/2_模型列表/3333/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/3333/template.png b/runner17/2_模型列表/3333/template.png
similarity index 100%
rename from runner17/solutions/2_模型列表/3333/template.png
rename to runner17/2_模型列表/3333/template.png
diff --git a/runner17/solutions/2_模型列表/4444/1_11_3_18_in.wsf b/runner17/2_模型列表/4444/1_11_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/1_11_3_18_in.wsf
rename to runner17/2_模型列表/4444/1_11_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/4444/1_11_3_19_in.wsf b/runner17/2_模型列表/4444/1_11_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/1_11_3_19_in.wsf
rename to runner17/2_模型列表/4444/1_11_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/4444/1_11_3_20_in.wsf b/runner17/2_模型列表/4444/1_11_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/1_11_3_20_in.wsf
rename to runner17/2_模型列表/4444/1_11_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/4444/1_11_3_21_in.wsf b/runner17/2_模型列表/4444/1_11_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/1_11_3_21_in.wsf
rename to runner17/2_模型列表/4444/1_11_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/4444/1_11_3_22_in.wsf b/runner17/2_模型列表/4444/1_11_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/1_11_3_22_in.wsf
rename to runner17/2_模型列表/4444/1_11_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/4444/1_11_3_7_in.wsf b/runner17/2_模型列表/4444/1_11_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/1_11_3_7_in.wsf
rename to runner17/2_模型列表/4444/1_11_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/4444/taskinfo.json b/runner17/2_模型列表/4444/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/taskinfo.json
rename to runner17/2_模型列表/4444/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/4444/template.png b/runner17/2_模型列表/4444/template.png
similarity index 100%
rename from runner17/solutions/2_模型列表/4444/template.png
rename to runner17/2_模型列表/4444/template.png
diff --git a/runner17/solutions/2_模型列表/5555/1_12_3_18_in.wsf b/runner17/2_模型列表/5555/1_12_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/5555/1_12_3_18_in.wsf
rename to runner17/2_模型列表/5555/1_12_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/5555/1_12_3_19_in.wsf b/runner17/2_模型列表/5555/1_12_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/5555/1_12_3_19_in.wsf
rename to runner17/2_模型列表/5555/1_12_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/5555/1_12_3_20_in.wsf b/runner17/2_模型列表/5555/1_12_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/5555/1_12_3_20_in.wsf
rename to runner17/2_模型列表/5555/1_12_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/5555/1_12_3_21_in.wsf b/runner17/2_模型列表/5555/1_12_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/5555/1_12_3_21_in.wsf
rename to runner17/2_模型列表/5555/1_12_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/5555/1_12_3_22_in.wsf b/runner17/2_模型列表/5555/1_12_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/5555/1_12_3_22_in.wsf
rename to runner17/2_模型列表/5555/1_12_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/5555/1_12_3_7_in.wsf b/runner17/2_模型列表/5555/1_12_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/5555/1_12_3_7_in.wsf
rename to runner17/2_模型列表/5555/1_12_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/5555/taskinfo.json b/runner17/2_模型列表/5555/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/5555/taskinfo.json
rename to runner17/2_模型列表/5555/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/666/1_13_3_18_in.wsf b/runner17/2_模型列表/666/1_13_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/666/1_13_3_18_in.wsf
rename to runner17/2_模型列表/666/1_13_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/666/1_13_3_19_in.wsf b/runner17/2_模型列表/666/1_13_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/666/1_13_3_19_in.wsf
rename to runner17/2_模型列表/666/1_13_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/666/1_13_3_20_in.wsf b/runner17/2_模型列表/666/1_13_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/666/1_13_3_20_in.wsf
rename to runner17/2_模型列表/666/1_13_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/666/1_13_3_21_in.wsf b/runner17/2_模型列表/666/1_13_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/666/1_13_3_21_in.wsf
rename to runner17/2_模型列表/666/1_13_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/666/1_13_3_22_in.wsf b/runner17/2_模型列表/666/1_13_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/666/1_13_3_22_in.wsf
rename to runner17/2_模型列表/666/1_13_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/666/1_13_3_7_in.wsf b/runner17/2_模型列表/666/1_13_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/666/1_13_3_7_in.wsf
rename to runner17/2_模型列表/666/1_13_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/666/taskinfo.json b/runner17/2_模型列表/666/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/666/taskinfo.json
rename to runner17/2_模型列表/666/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/A1/1_2_3_18_in.wsf b/runner17/2_模型列表/A1/1_2_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/1_2_3_18_in.wsf
rename to runner17/2_模型列表/A1/1_2_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/A1/1_2_3_19_in.wsf b/runner17/2_模型列表/A1/1_2_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/1_2_3_19_in.wsf
rename to runner17/2_模型列表/A1/1_2_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/A1/1_2_3_20_in.wsf b/runner17/2_模型列表/A1/1_2_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/1_2_3_20_in.wsf
rename to runner17/2_模型列表/A1/1_2_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/A1/1_2_3_21_in.wsf b/runner17/2_模型列表/A1/1_2_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/1_2_3_21_in.wsf
rename to runner17/2_模型列表/A1/1_2_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/A1/1_2_3_22_in.wsf b/runner17/2_模型列表/A1/1_2_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/1_2_3_22_in.wsf
rename to runner17/2_模型列表/A1/1_2_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/A1/1_2_3_7_in.wsf b/runner17/2_模型列表/A1/1_2_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/1_2_3_7_in.wsf
rename to runner17/2_模型列表/A1/1_2_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/A1/taskinfo.json b/runner17/2_模型列表/A1/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/taskinfo.json
rename to runner17/2_模型列表/A1/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/A1/template.png b/runner17/2_模型列表/A1/template.png
similarity index 100%
rename from runner17/solutions/2_模型列表/A1/template.png
rename to runner17/2_模型列表/A1/template.png
diff --git a/runner17/solutions/2_模型列表/B2/1_3_3_18_in.wsf b/runner17/2_模型列表/B2/1_3_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/1_3_3_18_in.wsf
rename to runner17/2_模型列表/B2/1_3_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/B2/1_3_3_19_in.wsf b/runner17/2_模型列表/B2/1_3_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/1_3_3_19_in.wsf
rename to runner17/2_模型列表/B2/1_3_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/B2/1_3_3_20_in.wsf b/runner17/2_模型列表/B2/1_3_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/1_3_3_20_in.wsf
rename to runner17/2_模型列表/B2/1_3_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/B2/1_3_3_21_in.wsf b/runner17/2_模型列表/B2/1_3_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/1_3_3_21_in.wsf
rename to runner17/2_模型列表/B2/1_3_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/B2/1_3_3_22_in.wsf b/runner17/2_模型列表/B2/1_3_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/1_3_3_22_in.wsf
rename to runner17/2_模型列表/B2/1_3_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/B2/1_3_3_7_in.wsf b/runner17/2_模型列表/B2/1_3_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/1_3_3_7_in.wsf
rename to runner17/2_模型列表/B2/1_3_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/B2/taskinfo.json b/runner17/2_模型列表/B2/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/taskinfo.json
rename to runner17/2_模型列表/B2/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/B2/template.png b/runner17/2_模型列表/B2/template.png
similarity index 100%
rename from runner17/solutions/2_模型列表/B2/template.png
rename to runner17/2_模型列表/B2/template.png
diff --git a/runner17/solutions/2_模型列表/C3/1_4_3_18_in.wsf b/runner17/2_模型列表/C3/1_4_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/C3/1_4_3_18_in.wsf
rename to runner17/2_模型列表/C3/1_4_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/C3/1_4_3_19_in.wsf b/runner17/2_模型列表/C3/1_4_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/C3/1_4_3_19_in.wsf
rename to runner17/2_模型列表/C3/1_4_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/C3/1_4_3_20_in.wsf b/runner17/2_模型列表/C3/1_4_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/C3/1_4_3_20_in.wsf
rename to runner17/2_模型列表/C3/1_4_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/C3/1_4_3_21_in.wsf b/runner17/2_模型列表/C3/1_4_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/C3/1_4_3_21_in.wsf
rename to runner17/2_模型列表/C3/1_4_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/C3/1_4_3_22_in.wsf b/runner17/2_模型列表/C3/1_4_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/C3/1_4_3_22_in.wsf
rename to runner17/2_模型列表/C3/1_4_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/C3/1_4_3_7_in.wsf b/runner17/2_模型列表/C3/1_4_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/C3/1_4_3_7_in.wsf
rename to runner17/2_模型列表/C3/1_4_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/C3/taskinfo.json b/runner17/2_模型列表/C3/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/C3/taskinfo.json
rename to runner17/2_模型列表/C3/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/D4/1_5_3_18_in.wsf b/runner17/2_模型列表/D4/1_5_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/D4/1_5_3_18_in.wsf
rename to runner17/2_模型列表/D4/1_5_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/D4/1_5_3_19_in.wsf b/runner17/2_模型列表/D4/1_5_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/D4/1_5_3_19_in.wsf
rename to runner17/2_模型列表/D4/1_5_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/D4/1_5_3_20_in.wsf b/runner17/2_模型列表/D4/1_5_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/D4/1_5_3_20_in.wsf
rename to runner17/2_模型列表/D4/1_5_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/D4/1_5_3_21_in.wsf b/runner17/2_模型列表/D4/1_5_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/D4/1_5_3_21_in.wsf
rename to runner17/2_模型列表/D4/1_5_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/D4/1_5_3_22_in.wsf b/runner17/2_模型列表/D4/1_5_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/D4/1_5_3_22_in.wsf
rename to runner17/2_模型列表/D4/1_5_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/D4/1_5_3_7_in.wsf b/runner17/2_模型列表/D4/1_5_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/D4/1_5_3_7_in.wsf
rename to runner17/2_模型列表/D4/1_5_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/D4/taskinfo.json b/runner17/2_模型列表/D4/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/D4/taskinfo.json
rename to runner17/2_模型列表/D4/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/info.json b/runner17/2_模型列表/info.json
similarity index 100%
rename from runner17/solutions/2_模型列表/info.json
rename to runner17/2_模型列表/info.json
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_16_in.wsf b/runner17/2_模型列表/template/1_1_3_16_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_16_in.wsf
rename to runner17/2_模型列表/template/1_1_3_16_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_17_in.wsf b/runner17/2_模型列表/template/1_1_3_17_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_17_in.wsf
rename to runner17/2_模型列表/template/1_1_3_17_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_18_in.wsf b/runner17/2_模型列表/template/1_1_3_18_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_18_in.wsf
rename to runner17/2_模型列表/template/1_1_3_18_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_19_in.wsf b/runner17/2_模型列表/template/1_1_3_19_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_19_in.wsf
rename to runner17/2_模型列表/template/1_1_3_19_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_20_in.wsf b/runner17/2_模型列表/template/1_1_3_20_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_20_in.wsf
rename to runner17/2_模型列表/template/1_1_3_20_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_21_in.wsf b/runner17/2_模型列表/template/1_1_3_21_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_21_in.wsf
rename to runner17/2_模型列表/template/1_1_3_21_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_22_in.wsf b/runner17/2_模型列表/template/1_1_3_22_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_22_in.wsf
rename to runner17/2_模型列表/template/1_1_3_22_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/1_1_3_7_in.wsf b/runner17/2_模型列表/template/1_1_3_7_in.wsf
similarity index 100%
rename from runner17/solutions/2_模型列表/template/1_1_3_7_in.wsf
rename to runner17/2_模型列表/template/1_1_3_7_in.wsf
diff --git a/runner17/solutions/2_模型列表/template/taskinfo.json b/runner17/2_模型列表/template/taskinfo.json
similarity index 100%
rename from runner17/solutions/2_模型列表/template/taskinfo.json
rename to runner17/2_模型列表/template/taskinfo.json
diff --git a/runner17/solutions/2_模型列表/template/template.png b/runner17/2_模型列表/template/template.png
similarity index 100%
rename from runner17/solutions/2_模型列表/template/template.png
rename to runner17/2_模型列表/template/template.png
diff --git a/runner17/algorithmLib/valveDetector.dll b/runner17/algorithmLib/valveDetector.dll
index 717cc67..d6e65b9 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 1b19fb3..f437a09 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 7d51412..7dc8b71 100644
Binary files a/runner17/lpMain.dll and b/runner17/lpMain.dll differ
diff --git a/runner17/lpMaind.dll b/runner17/lpMaind.dll
index 0e79cda..6e6b616 100644
Binary files a/runner17/lpMaind.dll and b/runner17/lpMaind.dll differ
diff --git a/runner17/showImg.ini b/runner17/showImg.ini
index 821f6e3..d07bc3a 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.1829515775204701
+Scale_Standard_1=2.385268960095239
 Scale_Standard_2=0.2032795305783001
-ScaleA=0.22807097164814868
+ScaleA=0.46703665939247824
 ScaleB=0.23141863221833192
diff --git a/src/lpMain/cryptokey/lpCryptokey.cpp b/src/lpMain/cryptokey/lpCryptokey.cpp
index ff66ae0..ec07b09 100644
--- a/src/lpMain/cryptokey/lpCryptokey.cpp
+++ b/src/lpMain/cryptokey/lpCryptokey.cpp
@@ -80,7 +80,7 @@ bool lpCheckKey::checkLinese()
 	std::string macID = lpHardwareInfo::instance()->getMacAddress();
 	if (hardDriveID.size() > 0)
 	{
-		m_SerialNo = lpCryptokey::genSerialNumber(QString(hardDriveID.c_str()) + QString(cpuID.c_str()));
+		m_SerialNo = lpCryptokey::genSerialNumber(QString(hardDriveID.c_str())/* + QString(cpuID.c_str())*/);
 	}
 	else {
 		m_SerialNo = lpCryptokey::genSerialNumber(QString(BoardID.c_str()) + QString(macID.c_str()));
diff --git a/src/lpMain/lpImageCaliUI.cpp b/src/lpMain/lpImageCaliUI.cpp
index e10e62c..4ea29ec 100644
--- a/src/lpMain/lpImageCaliUI.cpp
+++ b/src/lpMain/lpImageCaliUI.cpp
@@ -71,6 +71,14 @@ _Widget* lpImageCaliUI::replaceWidget(QWidget* pSrcWidget)
 	return pDstWidget;
 }
 
+void lpImageCaliUI::setStationFlags(bool bDouble)
+{
+	if (bDouble == false)
+	{
+		ui.tabWidget->removeTab(1);
+	}
+}
+
 void lpImageCaliUI::showEvent(QShowEvent *event)
 {
 	{
diff --git a/src/lpMain/lpImageCaliUI.h b/src/lpMain/lpImageCaliUI.h
index edb97f1..82aa546 100644
--- a/src/lpMain/lpImageCaliUI.h
+++ b/src/lpMain/lpImageCaliUI.h
@@ -16,7 +16,7 @@ public:
 	template<typename _Widget>
 	_Widget* replaceWidget(QWidget* pSrcWidget);
 
-	
+	void setStationFlags(bool bDouble);
 protected:
 	double CalLength(QPoint &p1, QPoint &p2);
 	void AddPoint(QPoint &p, QString strName);
diff --git a/tpvs17/lpMain/CMainWin.cpp b/tpvs17/lpMain/CMainWin.cpp
index bcb386c..185fa1a 100644
--- a/tpvs17/lpMain/CMainWin.cpp
+++ b/tpvs17/lpMain/CMainWin.cpp
@@ -136,6 +136,12 @@ CMainWin::CMainWin(QWidget *parent)
 	//ui.actionSystem->setDisabled(true);
 	//ui.actionTest->setDisabled(true);
 	//ui.actionStandard->setDisabled(true);
+
+	m_solotions = m_pDetectorEngine->getSolutionMgr()->GetAllSolutions().keys();
+	if (m_solotions.size() <= 1)
+	{
+		ui.groupBox_2->setVisible(false);
+	}
 }
 
 CMainWin::~CMainWin()
@@ -608,6 +614,8 @@ Q_SLOT void CMainWin::onActionClicked()
 		QStringList camkeys = m_pCoreCtrl->ICameraKeys();
 		QStringList solutions = m_pDetectorEngine->getSolutionMgr()->GetAllSolutions().keys();
 		m_devMgrWid.setSystemConfig(camkeys, solutions);
+		if (solutions.size() <= 1)
+			m_devMgrWid.setStationFlags(false);
 		m_devMgrWid.show();
 	}
 	else if ("main_Login_action" == strObj) {//用户登陆
@@ -653,6 +661,8 @@ Q_SLOT void CMainWin::onActionClicked()
 			m_pImageCaliUI->setWindowIcon(QIcon(WINDOWS_ICON));
 			m_pImageCaliUI->setWindowModality(Qt::ApplicationModal);
 			m_pImageCaliUI->setAttribute(Qt::WA_ShowModal, true);
+			if (m_solotions.size() <= 1)
+				m_pImageCaliUI->setStationFlags(false);
 			m_pImageCaliUI->show();
 		}
 	}
@@ -1334,6 +1344,8 @@ void CMainWin::IEngineResult(QVariantMap vMap)
 	QString solutionName = vMap.value("solutionName").toString();
 	QString taskName = vMap.value("taskName").toString();
 	double taskTime = vMap.value("tasktime").toDouble();
+	if (solutionName.isEmpty())
+		return;
 	if (taskCali == false)//模板未标定
 	{
 		int stationID = 0;
diff --git a/tpvs17/lpMain/CMainWin.h b/tpvs17/lpMain/CMainWin.h
index 86d37af..6586a91 100644
--- a/tpvs17/lpMain/CMainWin.h
+++ b/tpvs17/lpMain/CMainWin.h
@@ -164,7 +164,7 @@ private:
 
 	QList<QDiskCleanThread*> m_pDCThreadList;
 
-
+	QStringList m_solotions;//����������б� 
 
 };
 
diff --git a/tpvs17/lpMain/QAboutUI.ui b/tpvs17/lpMain/QAboutUI.ui
index 6697774..5e54e7c 100644
--- a/tpvs17/lpMain/QAboutUI.ui
+++ b/tpvs17/lpMain/QAboutUI.ui
@@ -22,7 +22,7 @@
       </font>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Main Version: 1.6.1019&lt;/p&gt;&lt;p&gt;Tadpole Version: 3.0.00&lt;/p&gt;&lt;p&gt;Final update date:20211019 11:00:00&lt;/p&gt;&lt;p&gt;Final Test data:20211019 11:00:00&lt;/p&gt;&lt;p&gt;单工位汽轮定位型号判别&lt;/p&gt;&lt;p&gt;CopyRight (C) 2016-2025 HangZhou Leaper &lt;/p&gt;&lt;p&gt;摩汽配件产品部&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Main Version: 1.6.1020&lt;/p&gt;&lt;p&gt;Tadpole Version: 3.0.00&lt;/p&gt;&lt;p&gt;Final update date:20211020 11:00:00&lt;/p&gt;&lt;p&gt;Final Test data:20211020 11:00:00&lt;/p&gt;&lt;p&gt;单工位汽轮定位型号判别&lt;/p&gt;&lt;p&gt;CopyRight (C) 2016-2025 HangZhou Leaper &lt;/p&gt;&lt;p&gt;摩汽配件产品部&lt;/p&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
     </widget>
    </item>
diff --git a/tpvs17/lpMain/QDeviceMgrUI.cpp b/tpvs17/lpMain/QDeviceMgrUI.cpp
index 5b5b66c..551fd98 100644
--- a/tpvs17/lpMain/QDeviceMgrUI.cpp
+++ b/tpvs17/lpMain/QDeviceMgrUI.cpp
@@ -110,3 +110,16 @@ void QDeviceMgrUI::setSystemConfig(QStringList camkeys, QStringList solutions)
 	ui.comboBox_solution1->setCurrentText(lpGlobalConfig::instance()->m_StationSolution_1);
 	ui.comboBox_solution2->setCurrentText(lpGlobalConfig::instance()->m_StationSolution_2);
 }
+
+void QDeviceMgrUI::setStationFlags(bool bDouble)
+{
+	if (bDouble == false)
+	{
+		ui.label_5->setVisible(false);
+		ui.comboBox_solution2->setVisible(false);
+		ui.label_4->setVisible(false);
+		ui.comboBox_cam2->setVisible(false);
+		ui.checkBox_SaveRltImg_st2->setVisible(false);
+		ui.checkBox_SaveSrcImg_st2->setVisible(false);
+	}
+}
diff --git a/tpvs17/lpMain/QDeviceMgrUI.h b/tpvs17/lpMain/QDeviceMgrUI.h
index 49b7cc5..102ba4d 100644
--- a/tpvs17/lpMain/QDeviceMgrUI.h
+++ b/tpvs17/lpMain/QDeviceMgrUI.h
@@ -18,6 +18,7 @@ public:
 	
 
 	void setSystemConfig(QStringList camkeys, QStringList solutions);
+	void setStationFlags(bool bDouble);
 protected:
 	virtual void showEvent(QShowEvent *event);
 	virtual void changeEvent(QEvent *event);
diff --git a/tpvs17/lpMain/lpGlobalConfig.cpp b/tpvs17/lpMain/lpGlobalConfig.cpp
index fb8b922..b6b12b0 100644
--- a/tpvs17/lpMain/lpGlobalConfig.cpp
+++ b/tpvs17/lpMain/lpGlobalConfig.cpp
@@ -67,6 +67,8 @@ void lpGlobalConfig::readConfig()
 			m_StationScale_2 = rootObj.value("StationScale_2").toDouble(1.0);
 			m_StationXOffset_2 = rootObj.value("StationXOffset_2").toDouble(0.0);
 			m_StationYOffset_2 = rootObj.value("StationYOffset_2").toDouble(0.0);
+
+			pointCircle = rootObj.value("pointCircle").toInt(20);
 		}
 	}
 	file.close();
@@ -107,6 +109,7 @@ void lpGlobalConfig::writeConfig()
 		rootObj.insert("StationScale_2",m_StationScale_2);
 		rootObj.insert("StationXOffset_2",m_StationXOffset_2);
 		rootObj.insert("StationYOffset_2",m_StationYOffset_2);
+		rootObj.insert("pointCircle", pointCircle);
 
 		QJsonDocument doc(rootObj);
 		QByteArray writeData = doc.toJson();
diff --git a/tpvs17/newValue_tp17.sln b/tpvs17/newValue_tp17.sln
index fb05681..6bd6d42 100644
--- a/tpvs17/newValue_tp17.sln
+++ b/tpvs17/newValue_tp17.sln
@@ -9,26 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "valveDetector", "valveDetec
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "caliValve", "caliValve\caliValve.vcxproj", "{E2DA7636-5531-47F1-ADE1-E5DD6E19154A}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QUserInfo", "QUserInfo\QUserInfo.vcxproj", "{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Enchanter", "Enchanter\Enchanter.vcxproj", "{7B76D75A-0E01-451E-880E-FB9AC63A914B}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpbengine", "lpbengine\lpbengine.vcxproj", "{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpCoreCtrl", "lpCoreCtrl\lpCoreCtrl.vcxproj", "{784071A9-BF94-4D27-B62E-588ACD7E0633}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpdesigner", "lpdesigner\lpdesigner.vcxproj", "{616EB73F-66E3-46FF-B423-1A5B7E6AAB8B}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lpMain", "lpMain\lpMain.vcxproj", "{783A56EA-8A72-4BC9-B8DF-23B76D4FE0E0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamBaumer", "tpCamBaumer\tpCamBaumer.vcxproj", "{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamGige", "tpCamGige\tpCamGige.vcxproj", "{161A44DD-FBCB-46E9-AAC9-5A41EF0169BF}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamHik", "tpCamHik\tpCamHik.vcxproj", "{64C9A32D-82E8-4C36-9AA6-52D58B23F687}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tpCamVirtual", "tpCamVirtual\tpCamVirtual.vcxproj", "{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Report", "Report\Report.vcxproj", "{B12702AD-ABFB-343A-A199-8E24837244A3}"
 EndProject
 Global
@@ -59,72 +41,12 @@ Global
 		{E2DA7636-5531-47F1-ADE1-E5DD6E19154A}.Release|x64.ActiveCfg = Release|x64
 		{E2DA7636-5531-47F1-ADE1-E5DD6E19154A}.Release|x64.Build.0 = Release|x64
 		{E2DA7636-5531-47F1-ADE1-E5DD6E19154A}.Release|x86.ActiveCfg = Release|x64
-		{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x64.ActiveCfg = Debug|x64
-		{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x64.Build.0 = Debug|x64
-		{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Debug|x86.ActiveCfg = Debug|x64
-		{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x64.ActiveCfg = Release|x64
-		{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x64.Build.0 = Release|x64
-		{D7AF8AA1-0F2C-407F-B135-FBDA4448EE16}.Release|x86.ActiveCfg = Release|x64
-		{7B76D75A-0E01-451E-880E-FB9AC63A914B}.Debug|x64.ActiveCfg = Debug|x64
-		{7B76D75A-0E01-451E-880E-FB9AC63A914B}.Debug|x64.Build.0 = Debug|x64
-		{7B76D75A-0E01-451E-880E-FB9AC63A914B}.Debug|x86.ActiveCfg = Debug|x64
-		{7B76D75A-0E01-451E-880E-FB9AC63A914B}.Release|x64.ActiveCfg = Release|x64
-		{7B76D75A-0E01-451E-880E-FB9AC63A914B}.Release|x64.Build.0 = Release|x64
-		{7B76D75A-0E01-451E-880E-FB9AC63A914B}.Release|x86.ActiveCfg = Release|x64
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Debug|x64.ActiveCfg = Debug|x64
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Debug|x64.Build.0 = Debug|x64
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Debug|x86.ActiveCfg = Debug|Win32
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Debug|x86.Build.0 = Debug|Win32
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Release|x64.ActiveCfg = Release|x64
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Release|x64.Build.0 = Release|x64
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Release|x86.ActiveCfg = Release|Win32
-		{DC221ADF-9D25-40E0-90AD-CC2C497F6FB9}.Release|x86.Build.0 = Release|Win32
-		{784071A9-BF94-4D27-B62E-588ACD7E0633}.Debug|x64.ActiveCfg = Debug|x64
-		{784071A9-BF94-4D27-B62E-588ACD7E0633}.Debug|x64.Build.0 = Debug|x64
-		{784071A9-BF94-4D27-B62E-588ACD7E0633}.Debug|x86.ActiveCfg = Debug|x64
-		{784071A9-BF94-4D27-B62E-588ACD7E0633}.Release|x64.ActiveCfg = Release|x64
-		{784071A9-BF94-4D27-B62E-588ACD7E0633}.Release|x64.Build.0 = Release|x64
-		{784071A9-BF94-4D27-B62E-588ACD7E0633}.Release|x86.ActiveCfg = Release|x64
-		{616EB73F-66E3-46FF-B423-1A5B7E6AAB8B}.Debug|x64.ActiveCfg = Debug|x64
-		{616EB73F-66E3-46FF-B423-1A5B7E6AAB8B}.Debug|x64.Build.0 = Debug|x64
-		{616EB73F-66E3-46FF-B423-1A5B7E6AAB8B}.Debug|x86.ActiveCfg = Debug|x64
-		{616EB73F-66E3-46FF-B423-1A5B7E6AAB8B}.Release|x64.ActiveCfg = Release|x64
-		{616EB73F-66E3-46FF-B423-1A5B7E6AAB8B}.Release|x64.Build.0 = Release|x64
-		{616EB73F-66E3-46FF-B423-1A5B7E6AAB8B}.Release|x86.ActiveCfg = Release|x64
 		{783A56EA-8A72-4BC9-B8DF-23B76D4FE0E0}.Debug|x64.ActiveCfg = Debug|x64
 		{783A56EA-8A72-4BC9-B8DF-23B76D4FE0E0}.Debug|x64.Build.0 = Debug|x64
 		{783A56EA-8A72-4BC9-B8DF-23B76D4FE0E0}.Debug|x86.ActiveCfg = Debug|x64
 		{783A56EA-8A72-4BC9-B8DF-23B76D4FE0E0}.Release|x64.ActiveCfg = Release|x64
 		{783A56EA-8A72-4BC9-B8DF-23B76D4FE0E0}.Release|x64.Build.0 = Release|x64
 		{783A56EA-8A72-4BC9-B8DF-23B76D4FE0E0}.Release|x86.ActiveCfg = Release|x64
-		{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Debug|x64.ActiveCfg = Debug|x64
-		{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Debug|x64.Build.0 = Debug|x64
-		{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Debug|x86.ActiveCfg = Debug|x64
-		{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Release|x64.ActiveCfg = Release|x64
-		{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Release|x64.Build.0 = Release|x64
-		{4CB8DBEB-EE73-4CEA-B662-E18B79EE113C}.Release|x86.ActiveCfg = Release|x64
-		{161A44DD-FBCB-46E9-AAC9-5A41EF0169BF}.Debug|x64.ActiveCfg = Debug|x64
-		{161A44DD-FBCB-46E9-AAC9-5A41EF0169BF}.Debug|x64.Build.0 = Debug|x64
-		{161A44DD-FBCB-46E9-AAC9-5A41EF0169BF}.Debug|x86.ActiveCfg = Debug|x64
-		{161A44DD-FBCB-46E9-AAC9-5A41EF0169BF}.Release|x64.ActiveCfg = Release|x64
-		{161A44DD-FBCB-46E9-AAC9-5A41EF0169BF}.Release|x64.Build.0 = Release|x64
-		{161A44DD-FBCB-46E9-AAC9-5A41EF0169BF}.Release|x86.ActiveCfg = Release|x64
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x64.ActiveCfg = Debug|x64
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x64.Build.0 = Debug|x64
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x86.ActiveCfg = Debug|Win32
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Debug|x86.Build.0 = Debug|Win32
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x64.ActiveCfg = Release|x64
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x64.Build.0 = Release|x64
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x86.ActiveCfg = Release|Win32
-		{64C9A32D-82E8-4C36-9AA6-52D58B23F687}.Release|x86.Build.0 = Release|Win32
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x64.ActiveCfg = Debug|x64
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x64.Build.0 = Debug|x64
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x86.ActiveCfg = Debug|Win32
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Debug|x86.Build.0 = Debug|Win32
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x64.ActiveCfg = Release|x64
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x64.Build.0 = Release|x64
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.ActiveCfg = Release|Win32
-		{707DDF6F-B78B-42F7-9EAD-E786C0FCD5FF}.Release|x86.Build.0 = Release|Win32
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.ActiveCfg = Debug|x64
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x64.Build.0 = Debug|x64
 		{B12702AD-ABFB-343A-A199-8E24837244A3}.Debug|x86.ActiveCfg = Debug|x64
diff --git a/tpvs17/valveDetector/algEg.cpp b/tpvs17/valveDetector/algEg.cpp
index 18ff434..837b7ef 100644
--- a/tpvs17/valveDetector/algEg.cpp
+++ b/tpvs17/valveDetector/algEg.cpp
@@ -193,7 +193,10 @@ bool algEg::Exec(IDetectorTask *lpTask, IDetectorAlgorithm* lpAlgorithm)
 	lpTask->GetTaskInfo()->property = vMap;
 
 	//paramOutput.dAngleRes = (paramOutput.dAngle - paramInput.nValveOffset) / paramInput.nMaxAngle * 360.0;
-	paramOutput.dAngleRes = (paramOutput.dAngle - paramInput.nStartOffset) / paramInput.nMaxAngle * 360.0;
+	if (paramOutput.dAngle >= 3610)
+		paramOutput.dAngleRes = 3610;
+	else
+		paramOutput.dAngleRes = (paramOutput.dAngle - paramInput.nStartOffset) / paramInput.nMaxAngle * 360.0;
 	paramOutput.dAngleRes = m_objDetect.ruleData(paramOutput.dAngleRes, paramOutput.nErrorType);//随机数
 	paramOutput.strResultTip = m_objDetect.genResultTip(paramOutput.strResultTip, paramOutput.nErrorType);
 	paramOutput.dTime = (double)(cv::getTickCount() - nStart) / cv::getTickFrequency() * 1000.0;
diff --git a/tpvs17/valveDetector/valveDetector.cpp b/tpvs17/valveDetector/valveDetector.cpp
index 2915e74..bec1c72 100644
--- a/tpvs17/valveDetector/valveDetector.cpp
+++ b/tpvs17/valveDetector/valveDetector.cpp
@@ -900,7 +900,7 @@ bool imageRotateMatch(Mat & imgSrc, InputParam &paramIn, OutputParam &paramOut,
 	double disVal = tempScoreShoot(roi, templates[55], detectMode::shootTargetMatch);
 	return true;
 }
-
+//��λʶ��
 bool ValveDetector::detect(Mat & imgSrc, InputParam &paramIn, OutputParam &paramOut, Mat &imgDst /*= Mat()*/)
 {
 	int rtWidth = 100;
@@ -914,13 +914,18 @@ bool ValveDetector::detect(Mat & imgSrc, InputParam &paramIn, OutputParam &param
 	if (paramIn.barNum <= 0)
 		return false;
 
+	//�ٳ�Բ���ĵ�ͼƬ
 	cv::Mat imgCenter = imgSrc(Rect(paramIn.ptCenter.x - rtWidth, paramIn.ptCenter.y - rtWidth, 2 * rtWidth, 2 * rtWidth));
 	Scalar scMean = cv::mean(imgCenter);
-	if (scMean[0] < 20) {
+	if (scMean[0] < 20)
+	{
 		paramOut.dAngle = 3610;
 		paramOut.dScore = 0;
+		//return true;
 	}
-	else {
+	else
+	{
+		//չ���ͻ�ȡ���� ����о��ͼƬ
 		float fValveWidth = paramIn.fValveWidth;
 		float fValveDis = paramIn.fValveDis;
 		int offset = 10;
@@ -931,7 +936,7 @@ bool ValveDetector::detect(Mat & imgSrc, InputParam &paramIn, OutputParam &param
 
 		Mat imgMatch, barCompare;
 		if (paramIn.flagCircle == 1 )
-		{
+		{//ģ��ƥ��
 			luffy_match::LoopMatMatch(img2Rect, paramIn.barTemplate, luffy_match::emLoopMatX, barCompare);
 			double score = 0;
 			int tarPos;
@@ -940,7 +945,7 @@ bool ValveDetector::detect(Mat & imgSrc, InputParam &paramIn, OutputParam &param
 			paramOut.dScore = score;
 		}
 		else
-		{
+		{//��������ģ��ƥ��
 			luffy_match::LoopMatMatch(img2Rect, paramIn.barTemplate, luffy_match::emLoopMatX, barCompare);
 			vector<Point> candidatePoints;
 			findCandidateValsInMat(barCompare, candidatePoints, paramIn);
@@ -1089,7 +1094,6 @@ bool ValveDetector::detect(Mat & imgSrc, InputParam &paramIn, OutputParam &param
 							}
 							else
 							{
-
 								Mat imgRet;
 								matchTemplate(vecImg[k], imgTemplate, imgRet, CV_TM_CCORR_NORMED);
 								Point pnt;
@@ -1158,6 +1162,7 @@ bool ValveDetector::detect(Mat & imgSrc, InputParam &paramIn, OutputParam &param
 	return true;
 }
 
+//���Ƽ������Ϣ��ͼƬ��
 void ValveDetector::drawResult(Mat &img, InputParam &paramIn, OutputParam &paramOut)
 {
 	if (img.empty()) {
@@ -1218,7 +1223,7 @@ void ValveDetector::drawResult(Mat &img, InputParam &paramIn, OutputParam &param
 		int tmpY2 = paramIn.ptCenter.y - paramIn.fValveDis * luffy_base::luffy_triangle::getSin(paramIn.nMaxAngle, paramIn.nStartOffset);
 		//qDebug() << "x, y : " << tmpX2 << tmpY2;
 		Point ptValveBase(tmpX2, tmpY2);
-		cv::line(img, paramIn.ptCenter, ptValveBase, LP_COLOR_GREEN, 2);//���Ʊ궨����Բ�ĵ�ֱ��
+		cv::line(img, paramIn.ptCenter, ptValveBase, LP_COLOR_GREEN, 3);//���Ʊ궨����Բ�ĵ�ֱ��
 		cv::circle(img, ptValveBase, 3, LP_COLOR_GREEN, 3);//���Ʊ궨��Բ�� �Ŵ�
 
 		/*��������оλ�úͻ�������о*/
@@ -1226,25 +1231,25 @@ void ValveDetector::drawResult(Mat &img, InputParam &paramIn, OutputParam &param
 		int tmpX = paramIn.ptCenter.x + paramIn.fValveDis * luffy_base::luffy_triangle::getCos(paramIn.nMaxAngle, angle);
 		int tmpY = paramIn.ptCenter.y - paramIn.fValveDis * luffy_base::luffy_triangle::getSin(paramIn.nMaxAngle, angle);
 		Point ptValve(tmpX, tmpY);
-		cv::line(img, paramIn.ptCenter, ptValve, LP_COLOR_RED, 2);
+		cv::line(img, paramIn.ptCenter, ptValve, LP_COLOR_RED, 3);
 
-		cv::circle(img, ptValve, paramIn.fValveWidth, LP_COLOR_RED, 2);
+		cv::circle(img, ptValve, paramIn.fValveWidth, LP_COLOR_RED, 3);
 		cv::circle(img, ptValve, 3, LP_COLOR_BLUE, 3);
 		double startAlg = paramIn.nStartOffset*1.0 / 10;
 		double endAlg = angle * 1.0 / 10;
 		if (startAlg < endAlg)
 		{
-			cv::ellipse(img, paramIn.ptCenter, Size(150, 150), 0, 360-startAlg, 360-endAlg,Scalar(255,0,255),2);
+			cv::ellipse(img, paramIn.ptCenter, Size(150, 150), 0, 360-startAlg, 360-endAlg,Scalar(255,0,255),3);
 		}
 		else {
-			cv::ellipse(img, paramIn.ptCenter, Size(150, 150), 0, 0, -endAlg, Scalar(255, 0, 255), 2);
-			cv::ellipse(img, paramIn.ptCenter, Size(150, 150), 0, 0, 360-startAlg, Scalar(255, 0, 255), 2);
+			cv::ellipse(img, paramIn.ptCenter, Size(150, 150), 0, 0, -endAlg, Scalar(255, 0, 255), 3);
+			cv::ellipse(img, paramIn.ptCenter, Size(150, 150), 0, 0, 360-startAlg, Scalar(255, 0, 255), 3);
 		}
 	}
- 	cv::circle(img, paramIn.ptCenter, 3, LP_COLOR_BLUE, 2);
+ 	cv::circle(img, paramIn.ptCenter, 3, LP_COLOR_BLUE, 3);
 	if (paramIn.nCenterAlg == 1)
 	{
-		cv::circle(img, paramIn.originalPoint, 3, LP_COLOR_GREEN, 2);
+		cv::circle(img, paramIn.originalPoint, 3, LP_COLOR_GREEN, 3);
 	}
 }