From db7f62beafa09e14ecbab1146b157d5978088a4d Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 15 七月 2020 11:14:04 +0800
Subject: [PATCH] M071主界面添加批量添加测量项界面 修复CanvasImage复数显示时无法编辑标签问题
---
src/Bro.M071.Process/UI/M071_MainForm.cs | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/src/Bro.M071.Process/UI/M071_MainForm.cs b/src/Bro.M071.Process/UI/M071_MainForm.cs
index e875fd6..3f2ce31 100644
--- a/src/Bro.M071.Process/UI/M071_MainForm.cs
+++ b/src/Bro.M071.Process/UI/M071_MainForm.cs
@@ -136,6 +136,27 @@
tscEditLocation.Visible = tsmiShowEditor.Checked;
tscEditLocation.BringToFront();
}
+
+ private void tsmiRefreshLabels_Click(object sender, EventArgs e)
+ {
+ cvImage.Elements.Clear();
+ lvMeasures.Items.Clear();
+
+ Config.MeasurementUnitCollection.ForEach(u =>
+ {
+ if (!u.IsEnabled)
+ return;
+
+ 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);
+ });
+
+ this.Invalidate();
+ }
#endregion
#region 鏍囩缂栬緫鍖�
@@ -303,7 +324,6 @@
btnStartMeasure.Text = "寮�濮嬫祴閲�";
btnStartMeasure.Enabled = false;
- btnStartMeasure.BackColor = Color.Red;
break;
case MachineState.Pause:
btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Yellow;
@@ -312,25 +332,22 @@
btnStartMeasure.Text = "缁х画娴嬮噺";
btnStartMeasure.Enabled = true;
- btnStartMeasure.BackColor = Color.Lime;
break;
case MachineState.Ready:
btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
- btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.White;
+ btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.Black;
lblMachineState.Text = "灏辩华";
btnStartMeasure.Text = "寮�濮嬫祴閲�";
btnStartMeasure.Enabled = true;
- btnStartMeasure.BackColor = Color.Lime;
break;
case MachineState.Running:
- btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Lime;
+ btnStartMeasure.BackColor = lblMachineState.BackColor = Color.Transparent;
btnStartMeasure.ForeColor = lblMachineState.ForeColor = Color.DarkGreen;
lblMachineState.Text = "杩愯";
btnStartMeasure.Text = "鏆傚仠娴嬮噺";
btnStartMeasure.Enabled = true;
- btnStartMeasure.BackColor = Color.Lime;
break;
case MachineState.Unknown:
btnStartMeasure.BackColor = lblMachineState.BackColor = SystemColors.Control;
@@ -338,7 +355,6 @@
lblMachineState.Text = "鏈煡";
btnStartMeasure.Enabled = false;
- btnStartMeasure.BackColor = Color.Red;
break;
}
}));
@@ -424,11 +440,11 @@
}
else if (btnStartMeasure.Text == "缁х画娴嬮噺")
{
- Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 0 } }, null, null);
+ Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 10 } }, null, null);
}
else
{
- Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 1 } }, null, null);
+ Process_M071.SwitchJobStatus(new OperationConfigBase() { InputPara = new List<int>() { 11 } }, null, null);
}
}
@@ -458,5 +474,6 @@
Process_M071.ResetTimer.Change(-1, -1);
}
#endregion
+
}
}
--
Gitblit v1.8.0