From 6428fad15dbe79e30a48ffc9aabe31e03a45426c Mon Sep 17 00:00:00 2001 From: patrick <patrick.xu@broconcentric.com> Date: 星期四, 05 十二月 2019 12:50:13 +0800 Subject: [PATCH] 1. 添加部分log信息 2. 修改部分机器人动作流程 3. 开放OperationConfig的InputData参数 --- src/A032.Process/ProcessConfig.cs | 20 +++++++++++++------- 1 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/A032.Process/ProcessConfig.cs b/src/A032.Process/ProcessConfig.cs index 200811f..c7cbb46 100644 --- a/src/A032.Process/ProcessConfig.cs +++ b/src/A032.Process/ProcessConfig.cs @@ -102,18 +102,20 @@ [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))] public string LogPath { get; set; } - [Category("鏃ュ織閰嶇疆")] - [Description("GRR鏃ュ織鏂囦欢澶硅矾寰�")] - [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))] - public string GRRLogPath { get; set; } + //[Category("鏃ュ織閰嶇疆")] + //[Description("GRR鏃ュ織鏂囦欢澶硅矾寰�")] + //[Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))] + //public string GRRLogPath { get; set; } [Category("CSV鏂囦欢閰嶇疆")] [Description("鏄惁鍋欳SV鏂囦欢杈撳嚭")] + [Browsable(false)] public bool IsCSVOutput { get; set; } = false; [Category("CSV鏂囦欢閰嶇疆")] [Description("CSV杈撳嚭鏂囦欢澶硅矾寰�")] [Editor(typeof(FoldDialogEditor), typeof(UITypeEditor))] + [Browsable(false)] public string CSVFilePath { get; set; } #endregion @@ -123,9 +125,9 @@ //[Editor(typeof(ComplexCollectionEditor<WarningSet>), typeof(UITypeEditor))] //public List<WarningSet> WarningSets { get; set; } = new List<WarningSet>(); - [Category("PLC鐩稿叧閰嶇疆")] - [Description("浜у搧鍑哄垪鏃舵槸鍚︽湁纭鍔ㄤ綔銆倀rue锛氭湁纭鍔ㄤ綔锛岀‘璁ゅ悗浜у搧鍑哄垪锛沠alse锛氭病鏈夌‘璁ゅ姩浣滐紝鏌ヨ鏃朵骇鍝佸嚭鍒�")] - public bool IsConfirmWhenProductionDone { get; set; } = false; + //[Category("PLC鐩稿叧閰嶇疆")] + //[Description("浜у搧鍑哄垪鏃舵槸鍚︽湁纭鍔ㄤ綔銆倀rue锛氭湁纭鍔ㄤ綔锛岀‘璁ゅ悗浜у搧鍑哄垪锛沠alse锛氭病鏈夌‘璁ゅ姩浣滐紝鏌ヨ鏃朵骇鍝佸嚭鍒�")] + //public bool IsConfirmWhenProductionDone { get; set; } = false; [Category("NG鍥剧墖淇濆瓨閰嶇疆")] [Description("NG鍥剧墖淇濆瓨鐩綍")] @@ -149,6 +151,10 @@ [Editor(typeof(ComplexCollectionEditor<PositionVisionConfig>), typeof(UITypeEditor))] public List<PositionVisionConfig> VisionConfigCollection { get; set; } = new List<PositionVisionConfig>(); + [Category("瑙嗚閰嶇疆")] + [Description("鏄惁鍚敤瑙嗚寮曞")] + public bool IsEnableVisionGuide { get; set; } = false; + /// <summary> /// 绌篢ray涓婃枡闃堝�硷紝AGV涓婄殑绌簍ray鏁伴噺涓嶅ぇ浜庤鏁板�兼椂锛孉GV鍙互鎵ц绌篢ray涓婃枡浠诲姟 /// </summary> -- Gitblit v1.8.0