From ed8d469ccdc0e627d8f180bb92a9d78dbdb008b1 Mon Sep 17 00:00:00 2001
From: jace.tang <1536884497@qq.com>
Date: 星期六, 11 二月 2023 21:34:01 +0800
Subject: [PATCH] 调整sizeDetection输出结果的判断
---
SizeDetection.cs | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 deletions(-)
diff --git a/SizeDetection.cs b/SizeDetection.cs
index d883a81..d8ae93e 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);
@@ -347,7 +348,7 @@
{
ms = MeasureState.OK;
- if (opcConfig.IsSaveSizeOKImage || CommonUtil.DetectionOption == DetectionOption.doStandardBlock)
+ if (opcConfig.IsSaveSizeOKImage)
{
DateTime dt = DateTime.Now;
@@ -411,13 +412,49 @@
if (lengthMeasureState == MeasureState.OK && widthMeasureState == MeasureState.OK)
{
- ms = MeasureState.OK;
+ //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);
+ //ms = MeasureState.NG;
+ if (btyLength >= MaxLength || btyLength <= MinLength || btyWidth >= MaxWidth || btyWidth <= MinWidth)
+ {
+ lengthMeasureState = MeasureState.NA;
+ widthMeasureState = MeasureState.NA;
+ ms = MeasureState.NA;
+ }
+ else
+ {
+ ms = MeasureState.NG;
+ }
+
+ 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}");
+ }
+ }
+ else
+ {
+ 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