patrick
2019-12-10 1c4426810c71eead57084be8a18ade8d314dd8c4
src/A032.Process/AGVPath.cs
@@ -3,13 +3,10 @@
using Bro.Common.Model;
using Bro.Common.Model.Interface;
using Bro.Device.HikCamera;
using System;
using Newtonsoft.Json;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing.Design;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace A032.Process
{
@@ -48,6 +45,10 @@
        [TypeConverter(typeof(PLCDeviceConverter))]
        public string DeviceOwner { get; set; }
        [Browsable(false)]
        [JsonIgnore]
        public bool IsOccupied { get; set; } = false;
        public string GetDisplayText()
        {
            return $"{PositionCode}-{Description}";
@@ -83,6 +84,18 @@
        [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
        public HikCameraOperationConfig CameraOpConfig { get; set; } = new HikCameraOperationConfig();
        [Category("示教配置")]
        [Description("机器人拍照位置")]
        [TypeConverter(typeof(ComplexObjectConvert))]
        [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
        public RobotPoint RobotSnapshotPoint { get; set; } = new RobotPoint();
        [Category("示教配置")]
        [Description("机器人示教位置到实际抓取位置的偏移")]
        [TypeConverter(typeof(ComplexObjectConvert))]
        [Editor(typeof(PropertyObjectEditor), typeof(UITypeEditor))]
        public RobotPoint RobotShift { get; set; } = new RobotPoint();
        public string GetDisplayText()
        {
            return $"{PositionCode}:曝光:{CameraOpConfig.Exposure};标定矩阵:{string.Join(",", Matrix)}";