优化修改

xcd

2020-07-02 3c4a6cc29a06fb940d21c2bc0ff5bf7125ade771

优化修改

 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; }

 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)
        //{

 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" />

 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
            {

 src/Bro.M071.Process/M071Process.cs

@@ -164,6 +164,12 @@
                throw new ProcessException("未输入产品条码，请勿开始测量");
            }

            //检查产品放置OK

            //气缸推动压板移动到产品上方

            //压板压紧产品

            OnMeasureStart?.BeginInvoke(null, null);

            var measurements = Config.MeasurementUnitCollection.Where(u => u.IsEnabled).ToList().DeepSerializeClone();
@@ -223,6 +229,9 @@
                  });

            BarCode = "";



            return new ProcessResponse(true);
        }


 src/Bro.M071.Process/M071Process_IO.cs

New file
@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace Bro.M071.Process
{
    public partial class M071Process
    {

    }
}

 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("标签修改完成");
        }
    }
}