jace.tang
2023-02-11 ed8d469ccdc0e627d8f180bb92a9d78dbdb008b1
调整sizeDetection输出结果的判断
2个文件已修改
58 ■■■■ 已修改文件
HeightDetection.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
SizeDetection.cs 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HeightDetection.cs
@@ -332,7 +332,7 @@
                {
                    tempFileName = DateTime.Now.ToString("HHmmssfff");
                }
                VisionDetect.SaveImageAs(ihImage, $"{CommonUtil.ProductSizeImageDir}_NA\\{tempFileName}");
                VisionDetect.SaveImageAs(ihImage, $"{CommonUtil.ProductNoImageDir}_NA\\{tempFileName}");
            }
            finally
            {
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;
                            //}
                            //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 (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);
                            //fileName = VisionDetect.SaveImageAs(hImage, CommonUtil.ProductSizeImageDir + @"\" + tempFileName);
                        }
                    }