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

wells.liu

2020-09-07 1491846b4736bc2e79604086acfd8544aa3ba384

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

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

                   timer1.Enabled = true;
               };
        }

@@ -284,6 +286,10 @@
            {
                _barcode += keyStr.ToUpper();
            }
            else if (keyStr.Length == 2 && keyStr.StartsWith("D"))
            {
                _barcode += keyStr.Substring(1).ToUpper();
            }

            if (e.KeyValue == 13)
            {
@@ -337,7 +343,7 @@
                            btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
                            btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.Black;
                            lblMachineState.Text = "就绪";
                            

                            btnStartMeasure.Text = "开始测量";
                            btnStartMeasure.Enabled = true;
                            break;
@@ -475,5 +481,9 @@
        }
        #endregion

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