部分模型修改

xcd

2020-07-09 c0b8009ef36746c7a14606267662570e8c59c2c6

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

@@ -32,6 +32,13 @@
            plImage.Controls.Add(cvImage);

            tscEditLocation.Visible = tsmiShowEditor.Checked = false;

            this.Load += async (s, e) =>
               {
                   await Task.Delay(300);

                   cvImage.SetScreenSize();
               };
        }

        public override void OnProcessUpdated()
@@ -44,33 +51,37 @@
            if (string.IsNullOrWhiteSpace(Config.BackgroundImagePath))
                return;

            try
            this.Invoke(new Action(() =>
            {
                Bitmap image = (Bitmap)Image.FromFile(Config.BackgroundImagePath);
                cvImage.LoadImage(image);
            }
            catch (Exception ex)
            {
                LogAsync(new LogMsg(DateTime.Now, "载入背景图异常", ex.Message));
                return;
            }

            cvImage.Elements.Clear();
            lvMeasures.Items.Clear();
            Config.MeasurementUnitCollection.ForEach(u =>
            {
                if (!u.IsEnabled)
                try
                {
                    Bitmap image = (Bitmap)Image.FromFile(Config.BackgroundImagePath);
                    cvImage.LoadImage(image);
                    cvImage.SetScreenSize();
                }
                catch (Exception ex)
                {
                    LogAsync(new LogMsg(DateTime.Now, "载入背景图异常", ex.Message));
                    return;
                }

                var ele = new KeyIndicator(u.Id, u.DisplayLocation);
                cvImage.Elements.Add(ele);
                cvImage.Elements.Clear();
                lvMeasures.Items.Clear();
                txtBarcode.ReadOnly = Config.IsBarcodeManulInputBlocked;

                ListViewItem item = new ListViewItem(u.GetDisplayText());
                item.Tag = u.Id;
                lvMeasures.Items.Add(item);
            });
                Config.MeasurementUnitCollection.ForEach(u =>
                {
                    if (!u.IsEnabled)
                        return;

            txtBarcode.ReadOnly = Config.IsBarcodeManulInputBlocked;
                    var ele = new KeyIndicator(u.Id, u.DisplayLocation);
                    cvImage.Elements.Add(ele);

                    ListViewItem item = new ListViewItem(u.GetDisplayText());
                    item.Tag = u.Id;
                    lvMeasures.Items.Add(item);
                });
            }));

            Process_M071.OnClearBarcode -= M071_MainForm_OnClearBarcode;
            Process_M071.OnClearBarcode += M071_MainForm_OnClearBarcode;
@@ -150,6 +161,19 @@

            MessageBox.Show("标签修改完成");
        }

        private void lvMeasures_DoubleClick(object sender, EventArgs e)
        {
            if (lvMeasures.SelectedItems.Count <= 0)
                return;

            var ele = cvImage.Elements.FirstOrDefault(u => u.ID == lvMeasures.SelectedItems[0].Tag.ToString());
            if (ele != null)
            {
                ele.State = ElementState.Selected;
                cvImage.Invalidate();
            }
        }
        #endregion

        #region 上方状态区
@@ -169,6 +193,11 @@
                txtBarcode.Text = _barcode;
                _barcode = "";
            }

            if (e.KeyValue == 27)
            {
                cvImage.Elements.ToList().ForEach(ele => ele.State = ElementState.Normal);
            }
        }

        private void txtBarcode_TextChanged(object sender, EventArgs e)