From 9bc010fc2b51ff02d1f7d09accc2847e3d925777 Mon Sep 17 00:00:00 2001
From: jace.tang <1536884497@qq.com>
Date: 星期五, 17 六月 2022 11:00:01 +0800
Subject: [PATCH] 1.获取高度结果的判断流程修改
---
SizeDetection.cs | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/SizeDetection.cs b/SizeDetection.cs
index 8bd934c..79e2658 100644
--- a/SizeDetection.cs
+++ b/SizeDetection.cs
@@ -290,6 +290,7 @@
tupleDictionary.Add("OUTPUT_RectArea", new HTuple());
tupleDictionary.Add("INPUT_Rect", rectROI);
tupleDictionary.Add("INPUT_RectThreshold", rectThreshold);
+ tupleDictionary.Add("INPUT_Type", CommonUtil.DetectionOption == DetectionOption.doStandardBlock ? 2 : 1);
#endregion
_tool.SetDictionary(tupleDictionary, imageDictionary);
@@ -411,15 +412,45 @@
if (lengthMeasureState == MeasureState.OK && widthMeasureState == MeasureState.OK)
{
- ms = MeasureState.OK;
- VisionDetect.SaveImageAs(hImage, CommonUtil.ScreenshotsDir + @"\" + tempFileName);
+ //ms = MeasureState.OK;
+ //VisionDetect.SaveImageAs(hImage, CommonUtil.ScreenshotsDir + @"\" + tempFileName);
VisionDetect.SaveImageAs(hImage, CommonUtil.ProductSizeImageDir + @"\" + tempFileName);
}
else
{
- ms = MeasureState.NG;
- fileName = VisionDetect.SaveImageAs(hImage, CommonUtil.ScreenshotsDir + @"_NG\" + tempFileName);
- VisionDetect.SaveImageAs(hImage, CommonUtil.ProductSizeImageDir + @"\" + tempFileName);
+ //if (btyLength >= MaxLength || btyLength <= MinLength)
+ //{
+ // lengthMeasureState = MeasureState.NA;
+ // ms = MeasureState.NA;
+ //}
+ //if (btyWidth >= MaxWidth || btyWidth <= MinWidth)
+ //{
+ // widthMeasureState = MeasureState.NA;
+ // ms = MeasureState.NA;
+ //}
+
+ //if (ms != MeasureState.NA)
+ //{
+ // if (!isNA)
+ // {
+ // ms = MeasureState.NG;
+ // fileName=VisionDetect.SaveImageAs(hImage, CommonUtil.ProductSizeImageDir + @"\" + tempFileName);
+ // }
+ // else
+ // {
+ // lengthMeasureState = MeasureState.NA;
+ // widthMeasureState = MeasureState.NA;
+ // ms = MeasureState.NA;
+ // fileName=VisionDetect.SaveImageAs(hImage, CommonUtil.ProductSizeImageDir + $"_{ms.ToString()}\\{ tempFileName}");
+ // }
+ //}
+
+
+
+
+ //ms = MeasureState.NG;
+ //fileName = VisionDetect.SaveImageAs(hImage, CommonUtil.ScreenshotsDir + @"_NG\" + tempFileName);
+ fileName = VisionDetect.SaveImageAs(hImage, CommonUtil.ProductSizeImageDir + @"\" + tempFileName);
}
}
--
Gitblit v1.8.0