diff --git a/halftoneproject-master/BanBoShi/Properties/AssemblyInfo.cs b/halftoneproject-master/BanBoShi/Properties/AssemblyInfo.cs index 55d692b4..4a399966 100644 --- a/halftoneproject-master/BanBoShi/Properties/AssemblyInfo.cs +++ b/halftoneproject-master/BanBoShi/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //通过使用 "*"，如下所示: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.2.0")] -[assembly: AssemblyFileVersion("2.0.2.0")] +[assembly: AssemblyVersion("2.0.3.0")] +[assembly: AssemblyFileVersion("2.0.3.0")] diff --git a/halftoneproject-master/BanBoShi/SysCtrl/ConfMgr.cs b/halftoneproject-master/BanBoShi/SysCtrl/ConfMgr.cs index 3ca8e5b7..b319071e 100644 --- a/halftoneproject-master/BanBoShi/SysCtrl/ConfMgr.cs +++ b/halftoneproject-master/BanBoShi/SysCtrl/ConfMgr.cs @@ -399,6 +399,11 @@ namespace MaiMuAOI.SysCtrl public Dictionary ExcelData { get; set; } #endregion + #region 老流程PT线宽补偿 + public double Pt_offset { get; set; } + public double Line_offset { get; set; } + #endregion + public SysConfigParams() { DefectBigImag = new ImageSaveParam("D:\\AllImageSave\\DefectBigImag"); @@ -1073,6 +1078,12 @@ namespace MaiMuAOI.SysCtrl else sysParams.ExcelData = JsonConvert.DeserializeObject>(sValue); + iniHelper.ReadDouble("Offset", "Pt_offset", out dValue); + sysParams.Pt_offset = dValue; + iniHelper.ReadDouble("Offset", "Line_offset", out dValue); + sysParams.Line_offset = dValue; + + SysConfigParams = sysParams; return sysParams; } diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs index fc86be2e..22823d53 100644 --- a/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs +++ b/halftoneproject-master/BanBoShi/SysCtrl/SysMgr.cs @@ -3680,8 +3680,8 @@ namespace MaiMuAOI.SysCtrl //PT测量 lock (lstPT) { - lstPT.Add(Math.Round(res.PT1, 4)); - Log($"PT值", $"PT{lstPT.Count}:{Math.Round(res.PT1, 4)}"); + lstPT.Add(Math.Round(res.PT1 + confMgr.SysConfigParams.Pt_offset, 4)); + Log($"PT值", $"PT{lstPT.Count}:{Math.Round(res.PT1 + confMgr.SysConfigParams.Pt_offset, 4)}"); OnAutoRuning(new RunEventArgs(22, lstPT, model.PTBaseValue + model.PTUpFloatValue, model.PTBaseValue - model.PTDownFloatValue)); double PtValue = Math.Round(lstPT.Average(), 4); @@ -3690,15 +3690,15 @@ namespace MaiMuAOI.SysCtrl if (order != null) { if (lstPT.Count == 1) - order.PT1 = Math.Round(res.PT1, 4); + order.PT1 = Math.Round(res.PT1 + confMgr.SysConfigParams.Pt_offset, 4); else if (lstPT.Count == 2) - order.PT2 = Math.Round(res.PT1, 4); + order.PT2 = Math.Round(res.PT1 + confMgr.SysConfigParams.Pt_offset, 4); else if (lstPT.Count == 3) - order.PT3 = Math.Round(res.PT1, 4); + order.PT3 = Math.Round(res.PT1 + confMgr.SysConfigParams.Pt_offset, 4); else if (lstPT.Count == 4) - order.PT5 = Math.Round(res.PT1, 4); + order.PT5 = Math.Round(res.PT1 + confMgr.SysConfigParams.Pt_offset, 4); else if (lstPT.Count == 5) - order.PT6 = Math.Round(res.PT1, 4); + order.PT6 = Math.Round(res.PT1 + confMgr.SysConfigParams.Pt_offset, 4); } double PtUpper = model.PTBaseValue + model.PTUpFloatValue; @@ -3715,7 +3715,7 @@ namespace MaiMuAOI.SysCtrl //线宽测量 lock (lstLineWidth) { - double lineWidthValue = res.Shanxian > 0 ? Math.Round(res.Shanxian, 2) : 0; + double lineWidthValue = res.Shanxian > 0 ? Math.Round(res.Shanxian + confMgr.SysConfigParams.Line_offset, 2) : 0; lstLineWidth.Add(lineWidthValue); Log($"线宽值", $"线宽{lstLineWidth.Count}:{lineWidthValue}"); OnAutoRuning(new RunEventArgs(23, lstLineWidth, model.LineWidthBaseValue + model.LineWidthUpFloatValue, model.LineWidthBaseValue - model.LineWidthDownFloatValue)); @@ -4201,6 +4201,7 @@ namespace MaiMuAOI.SysCtrl if (tensionValue < 0) { Log("张力读取", "张力读取失败，忽略此次测试!"); + ioCardDev.WriteBitState(GetIOPortIndex((int)DOName.触发张力按钮灯), GetIOBitIndex((int)DOName.触发张力按钮灯), false); return stepIndex; } tempDataList.Add( tensionValue ); @@ -5567,22 +5568,28 @@ namespace MaiMuAOI.SysCtrl X_For = (int)(Pdt_Width / confMgr.SysConfigParams.DefectCamViewX) + 1; Y_For = (int)(Pdt_Height / confMgr.SysConfigParams.DefectCamViewY) + 1; - double temp_dis = ((X_For * confMgr.SysConfigParams.DefectCamViewX - Pdt_Width) / 2); - if (temp_dis < (confMgr.SysConfigParams.DefectCamViewX / 5)) - { - X_For = X_For + 1; - temp_dis = ((X_For * confMgr.SysConfigParams.DefectCamViewX - Pdt_Width) / 2); - } + //左上角加入视野大小10%的补偿 + double temp_dis = confMgr.SysConfigParams.DefectCamViewX * 0.1; Left_X = double.Parse(PosAndSize[4]) - temp_dis; - - temp_dis = ((Y_For * confMgr.SysConfigParams.DefectCamViewY - Pdt_Height) / 2); - if (temp_dis < (confMgr.SysConfigParams.DefectCamViewY / 5)) - { - Y_For++; - temp_dis = ((Y_For * confMgr.SysConfigParams.DefectCamViewY - Pdt_Height) / 2); - } + temp_dis = confMgr.SysConfigParams.DefectCamViewY * 0.1; Left_Y = double.Parse(PosAndSize[5]) + temp_dis; + //double temp_dis = ((X_For * confMgr.SysConfigParams.DefectCamViewX - Pdt_Width) / 2); + //if (temp_dis < (confMgr.SysConfigParams.DefectCamViewX / 5)) + //{ + // X_For = X_For + 1; + // temp_dis = ((X_For * confMgr.SysConfigParams.DefectCamViewX - Pdt_Width) / 2); + //} + //Left_X = double.Parse(PosAndSize[4]) - temp_dis; + + //temp_dis = ((Y_For * confMgr.SysConfigParams.DefectCamViewY - Pdt_Height) / 2); + //if (temp_dis < (confMgr.SysConfigParams.DefectCamViewY / 5)) + //{ + // Y_For++; + // temp_dis = ((Y_For * confMgr.SysConfigParams.DefectCamViewY - Pdt_Height) / 2); + //} + //Left_Y = double.Parse(PosAndSize[5]) + temp_dis; + //if (Pdt_Width % confMgr.SysConfigParams.DefectCamViewX > 0) // X_For = (int)(Pdt_Width / confMgr.SysConfigParams.DefectCamViewX) + 1; //else @@ -5592,6 +5599,8 @@ namespace MaiMuAOI.SysCtrl //else // Y_For = (int)(Pdt_Height / confMgr.SysConfigParams.DefectCamViewY); + + X_For_Index = 0; Y_For_Index = 0; //////////////////// @@ -7457,7 +7466,7 @@ namespace MaiMuAOI.SysCtrl Code = item[3], X = double.Parse(item[1]), Y = double.Parse(item[2]), - ZXD = double.Parse(item[4]), + ZXD = double.Parse(item[4]), ModifyUserCode = UserMgr.LoginUser.Code, CreateUserCode = UserMgr.LoginUser.Code, }); diff --git a/halftoneproject-master/BanBoShi/SysCtrl/SysUpdata.cs b/halftoneproject-master/BanBoShi/SysCtrl/SysUpdata.cs index 97325864..db282b3c 100644 --- a/halftoneproject-master/BanBoShi/SysCtrl/SysUpdata.cs +++ b/halftoneproject-master/BanBoShi/SysCtrl/SysUpdata.cs @@ -9,7 +9,7 @@ namespace MaiMuAOI.SysCtrl public class SysUpdata { //系统信息 - public static string Info = "软件名称：版博士\r\n软件版本：V2.0.2\r\n公司：迈沐智能科技有限公司\r\n"; + public static string Info = "软件名称：版博士\r\n软件版本：V2.0.3\r\n公司：迈沐智能科技有限公司\r\n"; public static string Updata = "V2.0:\r\n" + "\t新版本，新流程，兼容老流程\r\n" + @@ -39,6 +39,8 @@ namespace MaiMuAOI.SysCtrl "\t2.加入产品服务器，新建产品可以发生到连接的客户端上\r\n" + "\t3.加入缺陷分布查看\r\n" + "\t4.加入是否启用产品放置检测\r\n" + - "\t5.加入新的尺寸检测功能\r\n"; + "\t5.加入新的尺寸检测功能\r\n" + + "V2.0.3:\r\n" + + "\t1.后相机尺寸检测靠左上角\r\n" ; } } diff --git a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DebugTestFrm.cs b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DebugTestFrm.cs index 0cbac2cb..9ee82ab4 100644 --- a/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DebugTestFrm.cs +++ b/halftoneproject-master/BanBoShi/SysUI/DefectPicShow/DebugTestFrm.cs @@ -485,7 +485,7 @@ namespace MaiMuAOI.SysUI.DefectPicShow } else { - BtnHeightAck.Text = "高度传感器上升"; + BtnHeightAck.Text = "高度传感器下降"; SysMgr.Instance.RunThickness(false); } } diff --git a/halftoneproject-master/Models/Order.cs b/halftoneproject-master/Models/Order.cs index d8c51c2f..2bae31ea 100644 --- a/halftoneproject-master/Models/Order.cs +++ b/halftoneproject-master/Models/Order.cs @@ -284,7 +284,10 @@ namespace Models public double X { get; set; } public double Y { get; set; } - public double ZXD { get; set; } + public double ZXD { get; set; } + + //[SugarColumn(IsNullable = true)] + //public string PicName { get; set; } } //2023-12-27 新表，存储单点尺寸测试数据