Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

xcd

2020-07-02 a332decd68d6d8bb5678d8ec95e6c65e0ccf9f33

 src/Bro.Process/ProcessControl.cs

@@ -342,6 +342,31 @@
            }
        }

        public void CreateNewConfig(IProcessConfig config, string newProductionCode)
        {
            try
            {
                if (config == null)
                    throw new ProcessException("保存的配置信息不能为空");
                ProductionCode = newProductionCode;
                //生成config.json
                string newConfig = JsonConvert.SerializeObject(config, new JsonSerializerSettings() { TypeNameHandling = TypeNameHandling.All });
                using (StreamWriter writer = new StreamWriter(_configPath, false, System.Text.Encoding.UTF8))
                {
                    writer.Write(newConfig);
                    writer.Flush();
                    writer.Close();
                }

                //添加到Setting.json
                SettingHelper.AddNewProductionCode(ProductionCode);
            }
            catch (Exception ex)
            {
                throw new ProcessException(ex.Message, null);
            }
        }

        private void SaveBackupConfig()
        {
            string backPath = Path.GetDirectoryName(_configPath);
@@ -398,7 +423,7 @@
        #endregion

        #region Halcon算子设置
        private void InitialHalconTool()
        protected virtual void InitialHalconTool()
        {
            foreach (HDevEngineTool tool in _halconToolDict.Values)
            {
@@ -413,20 +438,25 @@
                {
                    toolPath.GetHalconToolPathList().ForEach(path =>
                    {
                        if (!string.IsNullOrWhiteSpace(path))
                        {
                            string directoryPath = Path.GetDirectoryName(path);
                            string fileName = Path.GetFileNameWithoutExtension(path);

                            HDevEngineTool tool = new HDevEngineTool(directoryPath);
                            tool.LoadProcedure(fileName);

                            //使用“|”作为间隔符
                            _halconToolDict[monitorSet.Id + "|" + path] = tool;
                        }
                        LoadHalconTool(path, monitorSet.Id);
                    });
                }
            });
        }

        protected void LoadHalconTool(string algorithemPath, string prefix)
        {
            if (!string.IsNullOrWhiteSpace(algorithemPath))
            {
                string directoryPath = Path.GetDirectoryName(algorithemPath);
                string fileName = Path.GetFileNameWithoutExtension(algorithemPath);

                HDevEngineTool tool = new HDevEngineTool(directoryPath);
                tool.LoadProcedure(fileName);

                //使用“|”作为间隔符
                _halconToolDict[prefix + "|" + algorithemPath] = tool;
            }
        }

        /// <summary>
@@ -479,7 +509,7 @@
        #endregion

        #region IMonitor监听
        protected virtual void OnMonitorInvoke(DateTime dt, string deviceId, IDevice sourceDevice, MonitorSet monitorSet)
        protected virtual void OnMonitorInvoke(DateTime dt, string deviceId, IDevice sourceDevice, IMonitorSet monitorSet)
        {
            string methodCode = monitorSet.MethodCode;

@@ -576,7 +606,7 @@
        #region 图像处理
        protected HImage CollectHImage(CameraBase camera, IOperationConfig opConfig, out string imgSetId, [CallerMemberName]string methodCode = "")
        {
            ImageSet set = null;
            IImageSet set = null;

            if (IConfig.IsImageOffline)
            {
@@ -623,7 +653,7 @@
                TimeRecordCSV(DateTime.Now, camera.Name, methodCode + "采图", (int)sw.ElapsedMilliseconds);
            }

            imgSetId = set.Id;
            imgSetId = set?.Id;
            return set.HImage;
        }

@@ -637,9 +667,9 @@
        #endregion

        #region 报警和DownTime
        ObservableCollection<WarningSet> _warningRemains = new ObservableCollection<WarningSet>();
        ObservableCollection<IWarningSet> _warningRemains = new ObservableCollection<IWarningSet>();

        protected virtual void OnMonitorAlarm(DateTime dt, IDevice device, WarningSet warning)
        protected virtual void OnMonitorAlarm(DateTime dt, IDevice device, IWarningSet warning)
        {
            if (warning.CurrentStatus)
            {