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 | 51 +++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 43 insertions(+), 8 deletions(-)
diff --git a/SizeDetection.cs b/SizeDetection.cs
index df03200..79e2658 100644
--- a/SizeDetection.cs
+++ b/SizeDetection.cs
@@ -232,6 +232,7 @@
timeStr, CommonUtil.StepControl.ToString()));
HObject hImage = null;
+ string tempFileName = "";
try
{
Thread.Sleep(50);
@@ -242,7 +243,7 @@
{
return;
}
- string tempFileName = GetCurrentProductSN(detectID);
+ tempFileName = GetCurrentProductSN(detectID);
string productNo = GetProductNo(detectID);
int times = 3;
@@ -289,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);
@@ -394,13 +396,13 @@
}
else
{
- Type t = opcConfig.standardCompensationL.GetType();
+ Type t = opcConfig.compensationL.GetType();
FieldInfo fi = t.GetField(string.Format("station{0}", CommonUtil.mainForm.PlateID));
- compL = (double)fi.GetValue(opcConfig.standardCompensationL);
+ compL = (double)fi.GetValue(opcConfig.compensationL);
- t = opcConfig.standardCompensationW.GetType();
+ t = opcConfig.compensationW.GetType();
fi = t.GetField(string.Format("station{0}", CommonUtil.mainForm.PlateID));
- compW = (double)fi.GetValue(opcConfig.standardCompensationW);
+ compW = (double)fi.GetValue(opcConfig.compensationW);
btyLength += compL;
btyWidth += compW;
@@ -410,13 +412,45 @@
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);
+ //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);
}
}
@@ -466,6 +500,7 @@
catch (Exception ex)
{
CommonUtil.WriteLog(LogType.Exc, string.Format("浜у搧灏哄妫�娴嬪嚭鐜板紓甯革細{0}", ex.Message));
+ fileName = VisionDetect.SaveImageAs(hImage, $"{CommonUtil.ProductSizeImageDir}_NA\\{tempFileName}");
}
finally
{
--
Gitblit v1.8.0