添加配置文件的DataShift2

patrick.xu

2022-02-24 3322022068ab818912d6f5d9e5eb31f51cc639c2

添加配置文件的DataShift2

 src/Bro.M071.Process/M071Process.cs

@@ -54,6 +54,8 @@
        string _precision = "f3";
        double _allowedShift = 0;

        double _allowedShift2 = 0;

        public override void Open()
        {
            InitialSetting();
@@ -84,11 +86,39 @@
                DataUploadMethod = InitialMESWebServiceMethod(DataUploadMethodName, out DataUploadObj);
            }

            PrepareDataShift();
        }

        private void PrepareDataShift()
        {
            var allowedShiftStr = ConfigurationManager.AppSettings["DataShift"];
            if (!double.TryParse(allowedShiftStr, out _allowedShift))
            {
                _allowedShift = 0;
            }

            string path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "dataShift");
            if (!File.Exists(path))
            {
                _allowedShift2 = 0;
            }
            else
            {
                using (StreamReader reader = new StreamReader(path, System.Text.Encoding.UTF8))
                {
                    string data = reader.ReadToEnd();

                    if (!string.IsNullOrWhiteSpace(data))
                    {
                        if (double.TryParse(data, out double dataValue))
                        {
                            _allowedShift2 = dataValue;
                        }
                    }
                }
            }

            _allowedShift += _allowedShift2;
        }

        private void InitialMotionCardBaseAxisAlarm()
@@ -571,6 +601,16 @@
                }
            }

            return new ProcessResponse(true);
        }

        [ProcessMethod("", "SortKeyUnits", "单键配置排序", InvokeType.TestInvoke)]
        public ProcessResponse SortKeyUnits(IOperationConfig opConfig, IDevice invokeDevice, IDevice sourceDevice)
        {
            if (Config.KeyUnitCollection.Count > 0)
            {
                Config.KeyUnitCollection = Config.KeyUnitCollection.OrderBy(u => u.SnapshotPointId).ThenBy(u => u.ImageSeq).ToList();
            }
            return new ProcessResponse(true);
        }
        #endregion
@@ -1473,7 +1513,7 @@
                                }
                                else
                                {
                                    var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").DArr.ToList();
                                    var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
                                    if (results.Count == 0 || results.Any(u => u < 0))
                                    {
                                        LogAsync(DateTime.Now, $"{k.AliasName}原始数据{string.Join(",", results)}异常", "");

 src/Bro.M071.Process/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.7.0")]
[assembly: AssemblyFileVersion("1.0.7.0")]
[assembly: AssemblyVersion("1.0.7.1")]
[assembly: AssemblyFileVersion("1.0.7.1")]