From 1c4426810c71eead57084be8a18ade8d314dd8c4 Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期二, 10 十二月 2019 14:24:31 +0800
Subject: [PATCH] 1. 重构项目
---
src/A032.Process/AGVPath.cs | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/src/A032.Process/AGVPath.cs b/src/A032.Process/AGVPath.cs
index 2e19e32..f908ae3 100644
--- a/src/A032.Process/AGVPath.cs
+++ b/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)}";
--
Gitblit v1.8.0