merge

xcd

2020-07-03 f52302d69d60ce15b0d5b100e30082c5a6e9caa1

 src/Bro.Common.Device/DeviceBase/MotionCardBase.cs

@@ -12,6 +12,7 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using static Bro.Common.Helper.EnumHelper;

namespace Bro.Common.Base
{
@@ -26,12 +27,14 @@
        public abstract void ResetAlarm();
        public abstract ResponseMessage Run(IOperationConfig config);

        public void ExcuteMonitorInvok(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet)
        public virtual void ExcuteMonitorInvoke(DateTime dateTime, string invokeDevice, IDevice device, IMonitorSet monitorSet)
        {
            OnMonitorInvoke?.BeginInvoke(dateTime, invokeDevice, device, monitorSet, null, null);
            OnMonitorInvoke?.BeginInvoke(dateTime, invokeDevice, device, monitorSet, OnMethodInvoked, null);
        }

        public void ExcuteMonitorAlarm(DateTime dateTime, IDevice device, IWarningSet warningSet)
        public abstract void OnMethodInvoked(IAsyncResult ar);

        public virtual void ExcuteMonitorAlarm(DateTime dateTime, IDevice device, IWarningSet warningSet)
        {
            OnMonitorAlarm?.BeginInvoke(dateTime, device, warningSet, null, null);
        }
@@ -43,6 +46,10 @@
                return InitialConfig as MotionCardInitialConfigBase;
            }
        }

        public List<IOItem> MonitorValues { get; set; } = new List<IOItem>();

        public abstract void WriteOutput(short cardNum, short index, IOValue value);
    }

    public class MotionCardInitialConfigBase : InitialConfigBase, IMonitorConfig
@@ -126,6 +133,7 @@
        #endregion
    }

    [Device("MotionCardBase", "板卡操作配置基类", EnumHelper.DeviceAttributeType.OperationConfig)]
    public class MotionCardOperationConfigBase : OperationConfigBase, IComplexDisplay
    {
        [Category("IO操作配置")]
@@ -134,6 +142,10 @@
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(IORefrenceItemCollectionEditor), typeof(UITypeEditor))]
        public List<IORefrenceItem> PreCheckIOCollection { get; set; } = new List<IORefrenceItem>();
        [Category("IO操作配置")]
        [Description("超时设置，单位：ms")]
        [DisplayName("IO预检查超时")]
        public int PreCheckIOTimeout { get; set; } = 0;

        [Category("IO操作配置")]
        [DisplayName("IO输出定义集合")]
@@ -146,6 +158,10 @@
        [Description("IO确认定义集合")]
        [TypeConverter(typeof(CollectionCountConvert))]
        public List<IORefrenceItem> IOConfirmCollection { get; set; } = new List<IORefrenceItem>();
        [Category("IO操作配置")]
        [Description("超时设置，单位：ms")]
        [DisplayName("IO确认超时")]
        public int IOConfirmTimeout { get; set; } = 0;

        [Category("板卡运动配置")]
        [DisplayName("运动配置集合")]
@@ -153,11 +169,64 @@
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MovingOption>), typeof(UITypeEditor))]
        public List<MovingOption> MovingOps { get; set; } = new List<MovingOption>();
        [Category("板卡运动配置")]
        [Description("超时设置，单位：ms")]
        [DisplayName("运动超时")]
        public int MovingTimeout { get; set; } = 0;

        public string GetDisplayText()
        {
            throw new NotImplementedException();
            string preCheck = "";
            PreCheckIOCollection.ForEach(i =>
            {
                preCheck += i.GetDisplayText() + " ";
            });
            if (preCheck != "")
            {
                preCheck = " 预检：" + preCheck;
            }

            string output = "";
            IOOutputCollection.ForEach(i =>
            {
                output += i.GetDisplayText() + " ";
            });
            if (output != "")
            {
                output = " 输出：" + output;
            }
            string confirm = "";
            IOConfirmCollection.ForEach(i =>
            {
                confirm += i.GetDisplayText() + " ";
            });
            if (confirm != "")
            {
                confirm = " 确认：" + confirm;
            }

            string moving = "";
            MovingOps.ForEach(i =>
            {
                moving += i.GetDisplayText() + " ";
            });
            if (moving != "")
            {
                moving = " 运动：" + moving;
            }

            return (preCheck + output + confirm + moving).Trim();
        }
    }

    [Device("MotionCardOperationConfigCollection", "板卡操作配置基类集合", EnumHelper.DeviceAttributeType.OperationConfig)]
    public class MotionCardOperationConfigCollection : OperationConfigBase
    {
        [Category("复位操作")]
        [Description("板卡操作配置基类集合，依次执行")]
        [TypeConverter(typeof(CollectionCountConvert))]
        [Editor(typeof(ComplexCollectionEditor<MotionCardOperationConfigBase>), typeof(UITypeEditor))]
        public List<MotionCardOperationConfigBase> MotionCardOpsCollection { get; set; } = new List<MotionCardOperationConfigBase>();
    }

    public class IORefrenceItemCollectionEditor : CollectionEditor
@@ -180,10 +249,31 @@
            return form;
        }

        //protected override object CreateInstance(Type itemType)
        //{
        //    return base.CreateInstance(itemType);
        //}
        protected override object CreateInstance(Type itemType)
        {
            if (itemType == typeof(IORefrenceItem))
            {
                IORefrenceItem item = new IORefrenceItem();
                if ((this.Context.Instance is IOperationConfig opConfig) && !string.IsNullOrWhiteSpace(opConfig.DeviceId))
                {
                    using (var scope = GlobalVar.Container.BeginLifetimeScope())
                    {
                        List<IDevice> deviceList = scope.Resolve<List<IDevice>>();

                        var device = deviceList.FirstOrDefault(u => u.Id == opConfig.DeviceId);

                        if (device != null && (device is MotionCardBase motionCard))
                        {
                            item.IOItemSource = (motionCard.InitialConfig as MotionCardInitialConfigBase).IODefinitionCollection;
                        }
                    }
                }

                return item;
            }

            return base.CreateInstance(itemType);
        }

        //protected override object[] GetItems(object editValue)
        //{
@@ -217,9 +307,12 @@

                    if (device is MotionCardBase motionCard)
                    {
                        if (value is IORefrenceItem item)
                        if (value is List<IORefrenceItem> items)
                        {
                            item.IOItemSource = (motionCard.InitialConfig as MotionCardInitialConfigBase).IODefinitionCollection;
                            items.ForEach(item =>
                            {
                                item.IOItemSource = (motionCard.InitialConfig as MotionCardInitialConfigBase).IODefinitionCollection;
                            });
                        }
                    }
                }