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 | 58 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/SizeDetection.cs b/SizeDetection.cs
index 79e2658..d8ae93e 100644
--- a/SizeDetection.cs
+++ b/SizeDetection.cs
@@ -418,39 +418,43 @@
}
else
{
- //if (btyLength >= MaxLength || btyLength <= MinLength)
- //{
- // lengthMeasureState = MeasureState.NA;
- // ms = MeasureState.NA;
- //}
- //if (btyWidth >= MaxWidth || btyWidth <= MinWidth)
- //{
- // widthMeasureState = MeasureState.NA;
- // ms = MeasureState.NA;
- //}
+ //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}");
- // }
- //}
-
+ 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);
+ //fileName = VisionDetect.SaveImageAs(hImage, CommonUtil.ProductSizeImageDir + @"\" + tempFileName);
}
}
--
Gitblit v1.8.0