From 3c4a6cc29a06fb940d21c2bc0ff5bf7125ade771 Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期四, 02 七月 2020 11:21:38 +0800
Subject: [PATCH] 优化修改
---
src/Bro.Common.Device/Interface/IMotion.cs | 13 ++++++
src/Bro.M071.Process/UI/M071_MainForm.cs | 4 +-
src/Bro.Common.Model/Helper/PropertyConvertHelper.cs | 8 ++--
src/Bro.M071.Process/M071Process.cs | 9 ++++
src/Bro.M071.Process/M071Process_IO.cs | 13 ++++++
src/Bro.M071.Process/Bro.M071.Process.csproj | 1
src/Bro.M071.Process/M071Models.cs | 24 +++++++----
7 files changed, 57 insertions(+), 15 deletions(-)
diff --git a/src/Bro.Common.Device/Interface/IMotion.cs b/src/Bro.Common.Device/Interface/IMotion.cs
index 233ed8e..cf4415f 100644
--- a/src/Bro.Common.Device/Interface/IMotion.cs
+++ b/src/Bro.Common.Device/Interface/IMotion.cs
@@ -23,6 +23,19 @@
bool MoveToPoint(IOperationConfig opConfig);
}
+ /// <summary>
+ /// 鏉垮崱鎺ュ彛
+ /// </summary>
+ public interface IMotionCard : IMotion
+ {
+ /// <summary>
+ /// 鏉垮崱鎵ц鍔ㄤ綔 闄や簡杩愬姩鍔ㄤ綔澶栬繕鍖呭惈IO鎿嶄綔
+ /// </summary>
+ /// <param name="config"></param>
+ /// <returns></returns>
+ bool Run(IOperationConfig config);
+ }
+
public class AxisInfo : IComplexDisplay
{
public string AxisName { get; set; }
diff --git a/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs b/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
index e9c9e0e..71787f8 100644
--- a/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
+++ b/src/Bro.Common.Model/Helper/PropertyConvertHelper.cs
@@ -643,10 +643,10 @@
return form;
}
- //protected override object CreateInstance(Type itemType)
- //{
- // return base.CreateInstance(itemType);
- //}
+ protected override object CreateInstance(Type itemType)
+ {
+ return base.CreateInstance(itemType);
+ }
//protected override object[] GetItems(object editValue)
//{
diff --git a/src/Bro.M071.Process/Bro.M071.Process.csproj b/src/Bro.M071.Process/Bro.M071.Process.csproj
index 028f4f4..ebc097e 100644
--- a/src/Bro.M071.Process/Bro.M071.Process.csproj
+++ b/src/Bro.M071.Process/Bro.M071.Process.csproj
@@ -110,6 +110,7 @@
<Compile Include="M071Config.cs" />
<Compile Include="M071Models.cs" />
<Compile Include="M071Process.cs" />
+ <Compile Include="M071Process_IO.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UI\KeyIndicator.cs" />
<Compile Include="UI\M071Node.cs" />
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index d9a40ac..4789b6e 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -101,16 +101,22 @@
[Description("true锛氬惎鐢� false锛氱鐢�")]
public bool IsEnabled { get; set; } = true;
- [Category("璁惧閰嶇疆")]
- [Description("杩愬姩璁惧")]
- [TypeConverter(typeof(DeviceSelectorConverter<IMotion>))]
- public string MotionDevice { get; set; }
+ //[Category("璁惧閰嶇疆")]
+ //[Description("杩愬姩璁惧")]
+ //[TypeConverter(typeof(DeviceSelectorConverter<IMotion>))]
+ //public string MotionDevice { get; set; }
- [Category("杩愬姩鐐逛綅")]
- [Description("杩愬姩鐐逛綅")]
+ //[Category("杩愬姩鐐逛綅")]
+ //[Description("杩愬姩鐐逛綅")]
+ //[TypeConverter(typeof(ComplexObjectConvert))]
+ //[Editor(typeof(ComplexCollectionEditor<AxisInfo>), typeof(UITypeEditor))]
+ //public List<AxisInfo> Destination { get; set; } = new List<AxisInfo>();
+
+ [Category("杩愬姩鏈烘瀯閰嶇疆")]
+ [Description("杩愬姩鏈烘瀯閰嶇疆")]
[TypeConverter(typeof(ComplexObjectConvert))]
- [Editor(typeof(ComplexCollectionEditor<AxisInfo>), typeof(UITypeEditor))]
- public List<AxisInfo> Destination { get; set; } = new List<AxisInfo>();
+ [Editor(typeof(IOperationConfigByDeviceEditor), typeof(UITypeEditor))]
+ public DeviceOpBind MotionOp { get; set; } = new DeviceOpBind();
[Category("鐩告満鍜屾搷浣滈厤缃�")]
[Description("鐩告満鍜屾搷浣滈厤缃�")]
@@ -277,7 +283,7 @@
{
if (string.IsNullOrWhiteSpace(Name))
{
- return (IsEnabled ? "" : "绂佺敤 ") + string.Join("-", KeyUnitCollection.Select(u => u.GetDisplayText())) + "-" + MeasureType.ToString();
+ return (IsEnabled ? "" : "绂佺敤 ") + string.Join("-", KeyUnitCollection.Select(u => u.GetDisplayText())) + "-" + MeasureType?.ToString();
}
else
{
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 0c615a6..61f3aee 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -164,6 +164,12 @@
throw new ProcessException("鏈緭鍏ヤ骇鍝佹潯鐮侊紝璇峰嬁寮�濮嬫祴閲�");
}
+ //妫�鏌ヤ骇鍝佹斁缃甇K
+
+ //姘旂几鎺ㄥ姩鍘嬫澘绉诲姩鍒颁骇鍝佷笂鏂�
+
+ //鍘嬫澘鍘嬬揣浜у搧
+
OnMeasureStart?.BeginInvoke(null, null);
var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
@@ -223,6 +229,9 @@
});
BarCode = "";
+
+
+
return new ProcessResponse(true);
}
diff --git a/src/Bro.M071.Process/M071Process_IO.cs b/src/Bro.M071.Process/M071Process_IO.cs
new file mode 100644
index 0000000..3a0dd4f
--- /dev/null
+++ b/src/Bro.M071.Process/M071Process_IO.cs
@@ -0,0 +1,13 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Bro.M071.Process
+{
+ public partial class M071Process
+ {
+
+ }
+}
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.cs b/src/Bro.M071.Process/UI/M071_MainForm.cs
index fbc7bd2..2ec9284 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.cs
@@ -109,7 +109,7 @@
lvMeasures.Items.Add(item);
});
- //tscEditLocation.Visible = false;
+ MessageBox.Show("鍙栨秷鏍囩淇敼");
}
private void btnConfirmEdit_Click(object sender, EventArgs e)
@@ -123,7 +123,7 @@
}
});
- //tscEditLocation.Visible = false;
+ MessageBox.Show("鏍囩淇敼瀹屾垚");
}
}
}
--
Gitblit v1.8.0