From 00ea1cd461d6d8d128d727f6a40edca75da9ccdd Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 08 七月 2020 16:38:46 +0800
Subject: [PATCH] 相机运行界面基类添加操作配置 gocator驱动修正长宽比例，输出进行复制插值处理 显示基元添加8个方向的拉伸和移动处理 标签基元实现3个方向的拉伸和移动
---
src/Bro.Common.Model/Model/MotionCardRelated.cs | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/src/Bro.Common.Model/Model/MotionCardRelated.cs b/src/Bro.Common.Model/Model/MotionCardRelated.cs
index a285cdc..757cb42 100644
--- a/src/Bro.Common.Model/Model/MotionCardRelated.cs
+++ b/src/Bro.Common.Model/Model/MotionCardRelated.cs
@@ -193,6 +193,52 @@
}
/// <summary>
+ /// 鏉垮崱杩愬姩鐘舵�佸璞�
+ /// </summary>
+ public class AxisMovingStatus : IComplexDisplay
+ {
+ /// <summary>
+ /// 杞寸储寮�
+ /// </summary>
+ public int AxisIndex { get; set; }
+
+ /// <summary>
+ /// 杞村悕绉�
+ /// </summary>
+ public string AxisName { get; set; }
+
+ /// <summary>
+ /// 杩愬姩妯″紡
+ /// </summary>
+ public MotionMode MoveMode { get; set; }
+
+ /// <summary>
+ /// 褰撳墠浣嶇疆
+ /// </summary>
+ public int CurPosition { get; set; }
+
+ /// <summary>
+ /// 鐩殑鍦�
+ /// </summary>
+ public int Destination { get; set; }
+
+ /// <summary>
+ /// 褰撳墠閫熷害鍙傛暟
+ /// </summary>
+ public VelocityPara CurVelocityPara { get; set; }
+
+ /// <summary>
+ /// 瑙勫垝閫熷害鍙傛暟
+ /// </summary>
+ public VelocityPara VelocityPara { get; set; }
+
+ public string GetDisplayText()
+ {
+ return $"杞磠AxisIndex}:{AxisName}-{MoveMode.ToString()}-褰撳墠锛歿CurPosition}-瑙勫垝锛歿Destination}";
+ }
+ }
+
+ /// <summary>
/// 杩愬姩瀵硅薄
/// </summary>
public class MovingOption : INotifyPropertyChanged, IComplexDisplay
@@ -216,11 +262,11 @@
}
}
- private MotorMoveMode moveMode = MotorMoveMode.Normal;
+ private MotionMode moveMode = MotionMode.Normal;
[Category("杩愬姩閰嶇疆")]
[DisplayName("杩愬姩妯″紡")]
[Description("MoveMode锛氳繍鍔ㄦā寮�")]
- public MotorMoveMode MoveMode
+ public MotionMode MoveMode
{
get => moveMode;
set
--
Gitblit v1.8.0