Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071

wells

2020-07-11 ef6bff7f82b6cb9c37213fc6bc8c48acfb7ab2d6

 src/Bro.UI.Device.Winform/CtrlCameraRunBase.cs

@@ -1,8 +1,11 @@
using Bro.Common.Interface;
using Bro.Common.Factory;
using Bro.Common.Helper;
using Bro.Common.Interface;
using Bro.UI.Model.Winform;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Reflection;
using System.Windows.Forms;

namespace Bro.Common.Base.UI
@@ -46,6 +49,17 @@
            Camera.OnCameraOpModeChanged += Camera_OnCameraOpModeChanged;

            InitialToolBarVisible();

            string typeCode = Camera.GetType().GetCustomAttribute<DeviceAttribute>()?.TypeCode;

            if (string.IsNullOrWhiteSpace(typeCode))
            {
                propGridOpConfig.SelectedObject = OpConfig = new CameraOprerationConfigBase();
            }
            else
            {
                propGridOpConfig.SelectedObject = OpConfig = ConfigFactory.GetOperationConfig(typeCode);
            }
        }

        private readonly Dictionary<string, List<IShapeElement>> _eleBufferDict = new Dictionary<string, List<IShapeElement>>();
@@ -248,8 +262,13 @@
        {
            IsShowStatusBar = tsmiShowStatusBar.Checked;
        }

        private void tsmiShowOpConfig_CheckedChanged(object sender, EventArgs e)
        {
            tscOpConfig.Visible = tsmiShowOpConfig.Checked;
        }
        #endregion
        

        public IOperationConfig OpConfig { get; set; }

        public void UploadOperationConfig(IOperationConfig opConfig)
@@ -261,5 +280,10 @@
        {
            throw new NotImplementedException();
        }

        private void tsmiBtnExecuteOpConfig_Click(object sender, EventArgs e)
        {
            Camera.Snapshot(OpConfig);
        }
    }
}