From c01cce7ac1dc691c6b667b298ce0637b924102ea Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期二, 14 七月 2020 16:29:09 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.Common.Model/Helper/EnumHelper.cs | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 deletions(-)
diff --git a/src/Bro.Common.Model/Helper/EnumHelper.cs b/src/Bro.Common.Model/Helper/EnumHelper.cs
index 703be4a..f22bca9 100644
--- a/src/Bro.Common.Model/Helper/EnumHelper.cs
+++ b/src/Bro.Common.Model/Helper/EnumHelper.cs
@@ -392,6 +392,26 @@
Measuring = 21,
MeasureDoneOK = 22,
MeasureDoneNG = 23,
+
+ CanStretchLeft = 41,
+ CanStretchRight = 42,
+ CanStretchTop = 43,
+ CanStretchBottom = 44,
+
+ CanStretchLeftUpperCorner = 45,
+ CanStretchLeftLowerCorner = 46,
+ CanStretchRightUpperCorner = 47,
+ CanStretchRightLowerCorner = 48,
+
+ StretchingLeft = 31,
+ StretchingRight = 32,
+ StretchingTop = 33,
+ StretchingBottom = 34,
+
+ StretchingLeftUpperCorner = 35,
+ StretchingLeftLowerCorner = 36,
+ StretchingRightUpperCorner = 37,
+ StretchingRightLowerCorner = 38,
}
public enum MouseState
@@ -400,15 +420,21 @@
HoverElement = 2,
InSideElement = 3,
+ MoveElement = 4,
+
StretchingLeft = 11,
StretchingRight = 12,
- StretchingUp = 13,
- StretchingDown = 14,
- MoveElement = 15,
+ StretchingTop = 13,
+ StretchingBottom = 14,
+
+ StretchingLeftUpperCorner = 15,
+ StretchingLeftLowerCorner = 16,
+ StretchingRightUpperCorner =17,
+ StretchingRightLowerCorner = 18,
New = 21,
Editing = 22,
- SelectedElement = 23,
+ //SelectedElement = 23,
MovingAll = 31,
@@ -447,7 +473,7 @@
/// <summary>
/// 椹揪/杩愬姩鏉垮崱杩愯妯″紡
/// </summary>
- public enum MotorMoveMode
+ public enum MotionMode
{
/// <summary>
/// 鏅�氱偣浣嶈繍鍔�
@@ -532,9 +558,9 @@
[Description("鎸囩ず鐏�-榛�")]
Light_Yellow = 1,
- [Description("鎸囩ず鐏�-绾�")]
- Light_Green = 2,
[Description("鎸囩ず鐏�-缁�")]
+ Light_Green = 2,
+ [Description("鎸囩ず鐏�-绾�")]
Light_Red = 3,
[Description("铚傞福鍣�")]
Beep = 4,
@@ -611,6 +637,7 @@
Running,
Alarm,
Pause,
+ Resetting,
}
}
}
--
Gitblit v1.8.0