1. M071B机台配置 2. GTS板卡添加回原点捕获模式和输入信号模式 3. CameraBase使用Dictionary类型做图片缓存 4. M...

xcd

2020-09-29 eafdcc5ad6a55d3dfdec6c4787c3f3a9f32efc7f

 src/Bro.M071.Process/UI/M071_MainForm.cs

@@ -40,6 +40,10 @@
                   cvImage.SetScreenSize();
                   cvImage.OnElementChangedHandle -= CvImage_OnElementChangedHandle;
                   cvImage.OnElementChangedHandle += CvImage_OnElementChangedHandle;

                   timer1.Enabled = true;

                   btnReset.Text = $"复位（长按{Config.FullResetRequiredDuration}秒大复位）";
               };
        }

@@ -256,6 +260,23 @@
        #region 标签结果显示
        private async void Process_M071_OnElementUpdated(Common.Interface.IShapeElement obj)
        {
            //this.Invoke(new Action(() =>
            //{
            //    if (obj is KeyIndicator keyIndicator)
            //    {
            //        var ele = cvImage.Elements.FirstOrDefault(u => u.ID == keyIndicator.ID);

            //        //(ele as KeyIndicator).Text = keyIndicator.Text;
            //        //(ele as KeyIndicator).ResultState = keyIndicator.ResultState;
            //        if (ele != null)
            //        {
            //            ele = keyIndicator;
            //        }

            //        this.Invalidate();
            //    }                
            //}));

            if (obj is KeyIndicator keyIndicator)
            {
                this.Invoke(new Action(() =>
@@ -283,6 +304,10 @@
            if (keyStr.Length == 1)
            {
                _barcode += keyStr.ToUpper();
            }
            else if (keyStr.Length == 2 && keyStr.StartsWith("D"))
            {
                _barcode += keyStr.Substring(1).ToUpper();
            }

            if (e.KeyValue == 13)
@@ -313,7 +338,7 @@
        {
            if (lblMachineState.IsHandleCreated)
            {
                lblMachineState.BeginInvoke(new Action(() =>
                lblMachineState.Invoke(new Action(() =>
                {
                    switch (state)
                    {
@@ -337,7 +362,7 @@
                            btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
                            btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.Black;
                            lblMachineState.Text = "就绪";
                            

                            btnStartMeasure.Text = "开始测量";
                            btnStartMeasure.Enabled = true;
                            break;
@@ -466,7 +491,7 @@
                Process_M071.Reset(null, null, null);
            }

            Process_M071.ResetTimer.Change(1000 * 5, -1);
            Process_M071.ResetTimer.Change(1000 * Config.FullResetRequiredDuration, -1);
        }

        private void btnReset_MouseUp(object sender, MouseEventArgs e)
@@ -475,5 +500,9 @@
        }
        #endregion

        private void timer1_Tick(object sender, EventArgs e)
        {
            cvImage.Refresh();
        }
    }
}