From 6e43711c5130b5ca0517fc7f2e4562bf87fbfc03 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Thu, 11 Apr 2024 09:57:07 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E7=9A=84=E5=A4=9A=E8=AF=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.Controls/AxisMove.Designer.cs | 14 + Rs.Controls/AxisMove.cs | 16 + Rs.Controls/AxisMove.en-US.resx | 53 +- Rs.Controls/AxisMove.resx | 1144 +++++++++++------- Rs.Controls/AxisProperty.en-US.resx | 51 +- Rs.Controls/AxisProperty.resx | 48 +- Rs.Controls/Properties/Resources.Designer.cs | 10 + Rs.Controls/Properties/Resources.resx | 3 + Rs.Controls/Resources/clear.png | Bin 0 -> 1101 bytes Rs.Controls/Rs.Controls.csproj | 3 + Rs.Controls/RsTray.cs | 12 + 11 files changed, 879 insertions(+), 475 deletions(-) create mode 100644 Rs.Controls/Resources/clear.png diff --git a/Rs.Controls/AxisMove.Designer.cs b/Rs.Controls/AxisMove.Designer.cs index fc688bc..e9e4a76 100644 --- a/Rs.Controls/AxisMove.Designer.cs +++ b/Rs.Controls/AxisMove.Designer.cs @@ -57,6 +57,7 @@ this.groupBox3 = new System.Windows.Forms.GroupBox(); this.chkMoveStep = new System.Windows.Forms.CheckBox(); this.tbarSpeed = new System.Windows.Forms.TrackBar(); + this.btnClearAlarm = new System.Windows.Forms.Button(); this.btnServoOff = new System.Windows.Forms.Button(); this.btnServoOn = new System.Windows.Forms.Button(); this.label51 = new System.Windows.Forms.Label(); @@ -318,6 +319,7 @@ resources.ApplyResources(this.groupBox3, "groupBox3"); this.groupBox3.Controls.Add(this.chkMoveStep); this.groupBox3.Controls.Add(this.tbarSpeed); + this.groupBox3.Controls.Add(this.btnClearAlarm); this.groupBox3.Controls.Add(this.btnServoOff); this.groupBox3.Controls.Add(this.btnServoOn); this.groupBox3.Controls.Add(this.label51); @@ -401,6 +403,17 @@ this.tbarSpeed.Value = 5; this.tbarSpeed.ValueChanged += new System.EventHandler(this.tbarSpeed_ValueChanged); // + // btnClearAlarm + // + resources.ApplyResources(this.btnClearAlarm, "btnClearAlarm"); + this.btnClearAlarm.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(128))))); + this.btnClearAlarm.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnClearAlarm.ForeColor = System.Drawing.Color.Black; + this.btnClearAlarm.Image = global::Rs.Controls.Properties.Resources.clear; + this.btnClearAlarm.Name = "btnClearAlarm"; + this.btnClearAlarm.UseVisualStyleBackColor = false; + this.btnClearAlarm.Click += new System.EventHandler(this.btnClearAlarm_Click); + // // btnServoOff // resources.ApplyResources(this.btnServoOff, "btnServoOff"); @@ -1131,5 +1144,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Result; private System.Windows.Forms.TextBox txtAuEncPos; private System.Windows.Forms.Label label5; + private System.Windows.Forms.Button btnClearAlarm; } } diff --git a/Rs.Controls/AxisMove.cs b/Rs.Controls/AxisMove.cs index 5661804..25963e1 100644 --- a/Rs.Controls/AxisMove.cs +++ b/Rs.Controls/AxisMove.cs @@ -142,11 +142,18 @@ namespace Rs.MotionPlat } m_axis.GetAlarmStatus(out bool bAlarm); if (bAlarm && lblAxisAlarm.BackColor != Color.Lime) + { lblAxisAlarm.BackColor = Color.Lime; + btnClearAlarm.Visible = true; + } + else if(bAlarm==false) { if (lblAxisAlarm.BackColor != Color.Silver) + { lblAxisAlarm.BackColor = Color.Silver; + btnClearAlarm.Visible = false; + } } m_axis.IsEnable(out bool bServo); if (bServo && lblAxisServo.BackColor != Color.Lime) @@ -292,6 +299,15 @@ namespace Rs.MotionPlat } ControlLanguageHelper.LoadLanguage(this, this.GetType()); } + + private void btnClearAlarm_Click(object sender, EventArgs e) + { + if (m_axis != null) + { + ErrorCode errCode = m_axis.ClearAlarm(); + AddMessage(errCode.ToString()); + } + } } public class RunResult diff --git a/Rs.Controls/AxisMove.en-US.resx b/Rs.Controls/AxisMove.en-US.resx index 5434514..a1302eb 100644 --- a/Rs.Controls/AxisMove.en-US.resx +++ b/Rs.Controls/AxisMove.en-US.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Limit - 668, 30 @@ -139,8 +136,8 @@ Software N-limit - - Axis sta + + Limit Move sta: @@ -184,6 +181,37 @@ Org state: + + Axis sta + + + 286, 214 + + + + Flat + + + 宋体, 16pt + + + 22, 158 + + + 22, 69 + + + 359, 256 + + + 658, 211 + + + 527, 211 + + + 267, 249 + 35, 12 @@ -205,6 +233,15 @@ Tolerance + + 488, 16 + + + 107, 12 + + + Assist driver pos + Driver pos @@ -214,12 +251,18 @@ Encoder pos + + 388, 211 + 47, 12 Prf pos + + 158, 211 + Move diff --git a/Rs.Controls/AxisMove.resx b/Rs.Controls/AxisMove.resx index dd4cb0c..1e688a1 100644 --- a/Rs.Controls/AxisMove.resx +++ b/Rs.Controls/AxisMove.resx @@ -117,8 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl + - 33 + 34 label15 @@ -126,16 +130,12 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 300, 138 + + groupBox3 groupBox3 - - 20, 20 - groupBox3 @@ -149,8 +149,9 @@ System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 738, 70 0 @@ -164,6 +165,9 @@ 0 + + NoControl + MiddleCenter @@ -171,13 +175,13 @@ groupBox2 - 35 + 36 trackBar1 - 527, 169 + 527, 194 0 @@ -185,17 +189,23 @@ System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0.4 + + NoControl - - MiddleCenter + + 40, 20 + + + NoControl + + + NoControl MiddleCenter - 286, 172 + 286, 197 btnServoOff @@ -207,10 +217,13 @@ groupBox2 - 52 + 53 + + + NoControl - 658, 169 + 658, 194 groupBox3 @@ -218,18 +231,30 @@ 运动状态: + + 58 + 1 groupBox3 + + NoControl + MiddleCenter + + NoControl + MiddleCenter + + groupBox3 + False @@ -239,9 +264,6 @@ chkMoveStep - - 40, 20 - 1 @@ -252,7 +274,10 @@ True - 28 + 29 + + + 40, 20 btnMovePositive @@ -260,12 +285,21 @@ 0 + + NoControl + 3 groupBox2 + + 宋体, 60pt, style=Bold + + + MiddleCenter + groupBox3 @@ -273,7 +307,7 @@ 0 - 49 + 50 40, 20 @@ -284,6 +318,9 @@ 8 + + 驱动器位置 + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -308,33 +345,39 @@ lblSpeed + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 3, 17 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleCenter - - - panel2 + + NoControl groupBox2 + + NoControl + label52 - - label36 - - - 10 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + MiddleCenter @@ -347,8 +390,8 @@ lblNlimit - - 误差 + + 76, 21 label45 @@ -392,8 +435,11 @@ textBox6 - - MiddleCenter + + True + + + 65, 12 0 @@ -401,10 +447,13 @@ 0.08 - - groupBox3 + + 1 - + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox3 @@ -414,7 +463,7 @@ 宋体, 60pt, style=Bold - 2 + 3 label11 @@ -446,17 +495,17 @@ 0.04 - - 0 + + NoControl 3 - - groupBox3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 0.01 + + txtAuEncPos 使能状态: @@ -470,53 +519,59 @@ 100, 82 + + label32 + 779, 314 + + 0 + 0 - - groupBox3 + + True MiddleCenter + + NoControl + 1 658, 70 - - 7 + + 宋体, 12pt + + + Result - 13 + 14 groupBox1 - + groupBox3 - - label18 - - - label33 - - - 0 + + panel2 - 22, 73 + 17, 73 groupBox3 - - $this + + True MiddleCenter @@ -530,8 +585,8 @@ True - - 13 + + OFF lblOrg @@ -540,40 +595,49 @@ 441, 138 - 56 + 57 40, 20 + + 158, 194 + 12 - - 20, 20 + + NoControl AxisMove + + NoControl + 0 MiddleCenter + + NoControl + 0, 497 - - 17 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 51 + 52 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 20, 20 + + + 误差 59, 12 @@ -584,8 +648,8 @@ 712, 70 - - 0 + + 5 201, 33 @@ -593,11 +657,8 @@ True - - 0 - - - MiddleCenter + + 宋体, 14pt groupBox3 @@ -606,10 +667,13 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 23 + 24 - - 0 + + NoControl + + + 40, 20 MiddleCenter @@ -623,11 +687,17 @@ 1 + + NoControl + 697, 33 - - label32 + + NoControl + + + label54 MiddleCenter @@ -635,6 +705,9 @@ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -651,7 +724,7 @@ 53, 12 - 48 + 49 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -659,15 +732,21 @@ 159, 72 - - groupBox3 + + 11 0 + + NoControl + 20, 20 + + NoControl + label5 @@ -686,7 +765,6 @@ 0.5 - Fill @@ -696,6 +774,12 @@ 4 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 62 + False @@ -726,6 +810,9 @@ 回原状态: + + Time + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -738,15 +825,24 @@ 637, 37 + + NoControl + False 6 + + label36 + groupBox3 + + NoControl + 1 @@ -756,11 +852,11 @@ 20, 20 - - 53 + + 0 - - 76, 21 + + TopCenter 779, 107 @@ -774,8 +870,11 @@ 556, 37 - - 3, 17 + + 1 + + + NoControl 319, 17 @@ -783,17 +882,29 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + groupBox3 groupBox3 + + groupBox3 + groupBox3 + + 44 + + + Clear + - 31 + 32 159, 104 @@ -838,20 +949,20 @@ 0 - 19 - - - 0 + 20 False - - dataGridView1 + + 0, 0 0.05 + + 61 + 11 @@ -861,16 +972,22 @@ 90, 32 + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 6 + 7 779, 243 - + + 76, 21 + + True @@ -879,8 +996,8 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 40, 20 + + 0 软正限位 @@ -891,9 +1008,6 @@ 1 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 0 @@ -912,8 +1026,8 @@ 2 - - label39 + + 53, 12 label50 @@ -924,14 +1038,17 @@ 0 - - Flat + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 MiddleCenter - 58 + 59 + + + NoControl groupBox1 @@ -951,23 +1068,20 @@ MiddleCenter - - True - - - True + + NoControl - - 488, 72 + + groupBox3 Fill - - groupBox3 + + NoControl - - groupBox3 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 40, 20 @@ -976,7 +1090,10 @@ 10 - 29 + 30 + + + groupBox3 False @@ -984,14 +1101,17 @@ label20 - - 0 + + NoControl + + + 59, 12 211, 32 - - label19 + + 7 0 @@ -1002,11 +1122,8 @@ 0 - - txtAuEncPos - - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label19 Top @@ -1033,49 +1150,61 @@ 25, 37 - 41 + 42 System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - . + + NoControl + + + NoControl - 359, 214 + 359, 239 53, 12 - + groupBox3 - + groupBox3 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 38 + 39 System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + 712, 102 + + btnClearAlarm + 0 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + groupBox3 - - MiddleCenter + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 label3 @@ -1086,23 +1215,35 @@ System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 20, 20 - True - 7 + 8 + + + NoControl + + + groupBox3 MiddleCenter + + 347, 138 + MiddleCenter - - 0, 0 + + 544, 21 + + + 99, 64 + + + NoControl True @@ -1120,13 +1261,13 @@ C - 36 + 37 - 9 + 10 - - groupBox3 + + 20, 20 9 @@ -1152,8 +1293,8 @@ 358, 37 - - 411, 33 + + 20, 20 779, 107 @@ -1161,20 +1302,17 @@ panel4 - - 0 - 0 - - 驱动器位置 + + NoControl - - 54 + + groupBox3 - - 506, 31 + + 55 执行结果 @@ -1188,11 +1326,17 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + groupBox3 + + + label39 + 20, 20 - - 40, 20 + + NoControl 3 @@ -1203,8 +1347,8 @@ System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - MiddleCenter + + Top MiddleCenter @@ -1224,8 +1368,8 @@ 0 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 21 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1233,6 +1377,9 @@ 0.03 + + NoControl + label30 @@ -1242,6 +1389,9 @@ btnStop + + groupBox3 + MiddleCenter @@ -1251,6 +1401,9 @@ label49 + + NoControl + 6 @@ -1258,25 +1411,31 @@ MiddleCenter - 22 + 23 + + + 0 Top - - 53, 12 + + NoControl 300, 72 + + 116, 32 + groupBox3 False - - Time + + NoControl 535, 104 @@ -1287,17 +1446,14 @@ 90, 33 - - 0 - txtAxisNelLimit 158, 21 - - 59 + + MiddleCenter 76, 21 @@ -1305,9 +1461,15 @@ 58, 20 + + 7 + groupBox2 + + NoControl + groupBox3 @@ -1320,17 +1482,26 @@ 76, 21 - - 117, 56 + + MiddleCenter - - 轴状态 + + label40 + + + NoControl 1 + + 轴状态 + + + NoControl + - 100, 82 + 99, 64 txtAxisPelLimit @@ -1338,8 +1509,14 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - label51 + + 17, 243 + + + 0 + + + dataGridView1 312, 33 @@ -1347,11 +1524,8 @@ 300, 104 - - 0 - - - label44 + + 535, 138 40, 20 @@ -1359,6 +1533,9 @@ 206, 104 + + timer1 + groupBox1 @@ -1374,14 +1551,14 @@ 712, 136 - - groupBox3 + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 - - 0 + + btnMoveNegative groupBox2 @@ -1392,8 +1569,8 @@ MiddleCenter - - 4 + + NoControl 441, 104 @@ -1401,11 +1578,11 @@ 0 - - groupBox2 + + NoControl - - 16 + + 117, 56 label6 @@ -1417,13 +1594,13 @@ textBox5 - 3 + 4 779, 243 - - 6 + + 43 6, 12 @@ -1434,15 +1611,24 @@ groupBox3 + + 宋体, 12pt + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 60 + 65, 12 9 + + NoControl + True @@ -1458,8 +1644,8 @@ 最大速度 - - MiddleCenter + + NoControl 0 @@ -1467,8 +1653,8 @@ groupBox3 - - 7 + + groupBox3 40, 20 @@ -1476,9 +1662,6 @@ 0 - - 1 - False @@ -1488,8 +1671,8 @@ 20, 20 - - groupBox3 + + MiddleCenter 501, 16 @@ -1504,7 +1687,7 @@ 40, 20 - 25 + 26 0 @@ -1512,20 +1695,23 @@ label58 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + + + MiddleCenter 47, 12 - - Result + + 40, 20 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 267, 207 + 267, 232 0 @@ -1533,17 +1719,23 @@ 1 - - label40 + + 0 + + + 47, 12 53, 12 - - 1 + + 20, 20 - 37 + 38 + + + label21 0 @@ -1554,20 +1746,35 @@ 0, 0 + + 20, 20 + + + 6 + 40, 20 + + 40, 20 + label28 Fill - - OFF + + 0.01 - - Fill + + $this + + + 宋体, 16pt + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 panel1 @@ -1578,6 +1785,9 @@ MiddleCenter + + NoControl + Flat @@ -1593,17 +1803,20 @@ 0.07 - - 658, 16 + + 2 7 + + 488, 72 + - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.2, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.3, Culture=neutral, PublicKeyToken=null - - Result + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1612,25 +1825,25 @@ 宋体, 36pt - 21 + 22 0 - - 40, 20 + + NoControl System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - True + + 0 0 - - 0 + + NoControl System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1638,8 +1851,8 @@ 100, 82 - - btnMoveNegative + + NoControl Step @@ -1650,27 +1863,18 @@ 3 - - groupBox3 - 0.02 groupBox4 - - 47, 12 - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 - - groupBox3 - $this @@ -1680,26 +1884,32 @@ 394, 104 - - 20, 20 - - - 0 + + groupBox3 groupBox3 - - MiddleCenter + + 17, 56 + + + 0 - 39 + 40 + + + 54 + + + 13 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 5 + 6 Fill @@ -1710,6 +1920,9 @@ 40, 20 + + 0 + 30 @@ -1719,14 +1932,14 @@ 441, 72 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 779, 76 - - 宋体, 12pt + + groupBox3 label38 @@ -1743,18 +1956,33 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label26 + groupBox1 686, 102 - - 宋体, 60pt, style=Bold + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + NoControl System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 99, 64 + + + 300, 138 + 20, 20 @@ -1770,17 +1998,20 @@ txtPrfPos - - 116, 32 + + 658, 16 - - 限位 + + Result groupBox3 - - 20, 20 + + groupBox2 + + + Fill label9 @@ -1788,8 +2019,8 @@ groupBox3 - - 40, 20 + + NoControl panel3 @@ -1803,12 +2034,18 @@ 0, 0 + + groupBox3 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0, 0 + + 34, 17 + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1824,35 +2061,29 @@ 2 - - groupBox3 - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 56 - True 20, 20 - - 738, 70 - groupBox3 MiddleCenter + + 40, 20 + TopRight - 32 + 33 0.1 @@ -1860,14 +2091,14 @@ groupBox3 - - 0 + + 0.4 宋体, 26pt - 24 + 25 label23 @@ -1875,26 +2106,26 @@ label16 - - groupBox2 - 4 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + label18 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + 253, 104 - - 26 + + ON - - 5% + + 27 0 @@ -1902,11 +2133,8 @@ 0 - - 宋体, 12pt - - 45 + 46 label17 @@ -1917,20 +2145,14 @@ 原点: - - groupBox3 - 0.3 - - 535, 138 - groupBox2 - - 59, 12 + + groupBox3 5 @@ -1938,14 +2160,23 @@ label1 + + $this + 100, 82 + + BottomCenter + + + 0 + txtDriverPos - - 76, 21 + + 4 1 @@ -1962,17 +2193,17 @@ 0 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17 - - 0 + + MiddleCenter 122, 17 - - ON + + MiddleCenter System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -1983,8 +2214,11 @@ groupBox2 - - 347, 138 + + 0 + + + 0 1 @@ -1992,6 +2226,9 @@ label10 + + 0 + 29, 12 @@ -2004,17 +2241,26 @@ True + + groupBox3 + + + NoControl + + + NoControl + + + NoControl + 253, 138 - - 宋体, 16pt - 0 - - 0.6 + + NoControl 233, 17 @@ -2022,9 +2268,6 @@ 0.06 - - 18 - System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2034,12 +2277,15 @@ True - - 60 + + 411, 33 groupBox3 + + Fill + 535, 72 @@ -2059,13 +2305,16 @@ 0 - 44 + 45 20, 20 - - 宋体, 14pt + + NoControl + + + label44 速度 @@ -2073,14 +2322,14 @@ mm - - 34, 17 + + MiddleCenter - - 40, 20 + + 13 - - 0 + + groupBox3 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2094,8 +2343,14 @@ 0 - - 43 + + groupBox3 + + + NoControl + + + 0 1 @@ -2104,13 +2359,13 @@ 29, 12 - 30 + 31 306, 32 - - 61 + + 506, 31 groupBox3 @@ -2128,25 +2383,28 @@ 35, 12 - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.2, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.3, Culture=neutral, PublicKeyToken=null - - groupBox3 + + label33 - - 544, 21 + + NoControl - - label54 + + groupBox3 + + + 0.6 - 47 + 48 488, 138 - - 158, 169 + + NoControl 0 @@ -2157,12 +2415,15 @@ 40, 20 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 18 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 41 + 686, 136 @@ -2170,10 +2431,10 @@ 0 - 15 + 16 - - System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 0 panel3 @@ -2187,8 +2448,8 @@ 8 - - groupBox3 + + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.3, Culture=neutral, PublicKeyToken=null 0 @@ -2202,21 +2463,18 @@ 0.2 + + NoControl + lblDriver - - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.2, Culture=neutral, PublicKeyToken=null - - - groupBox3 + + 136, 37 运动 - - 9 - 0 @@ -2232,6 +2490,9 @@ 辅助驱动器位置 + + NoControl + True @@ -2244,8 +2505,8 @@ groupBox1 - - 57 + + 9 4 @@ -2269,13 +2530,13 @@ groupBox3 - 4 + 5 True - - 20 + + 456, 37 20, 20 @@ -2287,16 +2548,13 @@ Flat - 27 + 28 1 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - groupBox3 + + 宋体, 12pt txtEncPos @@ -2311,7 +2569,10 @@ MiddleCenter - 34 + 35 + + + NoControl 0 @@ -2320,10 +2581,10 @@ 8 - 55 + 56 - 8 + 9 0 @@ -2332,10 +2593,10 @@ 658, 102 - 62 + 63 - - 12 + + 20, 20 label25 @@ -2347,10 +2608,10 @@ 0 - 46 + 47 - 11 + 12 0.09 @@ -2358,11 +2619,11 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Top + + 19 - - MiddleCenter + + groupBox2 206, 72 @@ -2373,29 +2634,32 @@ 0.8 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 限位 groupBox3 - 22, 209 + 17, 158 0 + + . + - Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.2, Culture=neutral, PublicKeyToken=null + Rs.Controls.ButtonEx, Rs.Controls, Version=2.20.24.3, Culture=neutral, PublicKeyToken=null - - 136, 37 + + NoControl - - 100, 82 + + NoControl - - $this + + 0 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2406,9 +2670,6 @@ 488, 104 - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 2 @@ -2422,16 +2683,16 @@ 0 - 14 + 15 - - 20, 20 + + 40, 20 System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - timer1 + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 0 @@ -2439,17 +2700,23 @@ 0 + + False + 4 - 388, 169 + 388, 194 40, 20 - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + NoControl + + + label51 label35 @@ -2460,8 +2727,8 @@ 1 - - 65, 12 + + 5% 76, 21 @@ -2469,32 +2736,29 @@ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 456, 37 - 20, 20 0 - - 5 - 0 0 - + + NoControl + + groupBox3 panel1 - - 40, 20 + + MiddleCenter 20, 20 @@ -2505,37 +2769,31 @@ 588, 32 - - 40 + + 0 - 50 + 51 - - label21 + + 0 - - label26 + + Flat 411, 16 + + NoControl + 779, 740 - - 42 - lblHomed - - Fill - - - 0 - - + 0 diff --git a/Rs.Controls/AxisProperty.en-US.resx b/Rs.Controls/AxisProperty.en-US.resx index 2d2c2e5..16ae260 100644 --- a/Rs.Controls/AxisProperty.en-US.resx +++ b/Rs.Controls/AxisProperty.en-US.resx @@ -178,6 +178,12 @@ Home dir: + + Home property + + + Motor property + 320, 23 @@ -205,12 +211,54 @@ S-curve smoothing time: + + 306, 241 + + + 125, 12 + + + Software N position: + + + 20, 282 + + + 137, 12 + + + Enable software limit: + + + 294, 205 + + + 143, 12 + + + distance of one circle: + + + 32, 242 + + + 125, 12 + + + Software P position: + 59, 12 Dec-time: + + 107, 12 + + + Pulse per circle: + 59, 12 @@ -247,7 +295,4 @@ Enable encoder: - - Motor property - \ No newline at end of file diff --git a/Rs.Controls/AxisProperty.resx b/Rs.Controls/AxisProperty.resx index e1a0844..e10e106 100644 --- a/Rs.Controls/AxisProperty.resx +++ b/Rs.Controls/AxisProperty.resx @@ -218,9 +218,6 @@ 436, 198 - - txtPulseOutMode - gboxMotorPro @@ -479,9 +476,6 @@ 302, 501 - - txtAxisName - 15, 14 @@ -581,8 +575,8 @@ True - - 65, 12 + + True True @@ -950,6 +944,9 @@ gboxHomePro + + txtCurrent + 1 @@ -1070,9 +1067,6 @@ True - - 100, 21 - 436, 535 @@ -1392,9 +1386,6 @@ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 436, 17 - 保存 @@ -1452,6 +1443,9 @@ 89, 12 + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 1 @@ -1596,8 +1590,8 @@ 100, 21 - - System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + txtPulseOutMode 0 @@ -1779,6 +1773,9 @@ True + + gboxMotorPro + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2025,6 +2022,9 @@ 265, 139 + + 65, 12 + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -2106,8 +2106,8 @@ 12 - - gboxMotorPro + + 100, 21 最大速度: @@ -2175,8 +2175,8 @@ 28 - - txtCurrent + + 软极限制动模式: 0 @@ -2388,8 +2388,8 @@ 89, 12 - - 软极限制动模式: + + txtAxisName 高速位置比较有效电平: @@ -2505,8 +2505,8 @@ 20 - - True + + 436, 17 txtSTime diff --git a/Rs.Controls/Properties/Resources.Designer.cs b/Rs.Controls/Properties/Resources.Designer.cs index 0ae0f4f..262710a 100644 --- a/Rs.Controls/Properties/Resources.Designer.cs +++ b/Rs.Controls/Properties/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace Rs.Controls.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap clear { + get { + object obj = ResourceManager.GetObject("clear", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Byte[] 类型的本地化资源。 /// diff --git a/Rs.Controls/Properties/Resources.resx b/Rs.Controls/Properties/Resources.resx index 7119fe9..8163ac9 100644 --- a/Rs.Controls/Properties/Resources.resx +++ b/Rs.Controls/Properties/Resources.resx @@ -118,6 +118,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\Resources\clear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\iconfont.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Rs.Controls/Resources/clear.png b/Rs.Controls/Resources/clear.png new file mode 100644 index 0000000000000000000000000000000000000000..98b59ffbcd1de3d923d4ba92907033d7d6d8e72d GIT binary patch literal 1101 zcmV-T1hV^yP)Px(2T4RhR9Hvtm0M_AbsWdPzkiaptEF{qb8+a4FpzF|duTgxl53E>!uV$77y%nd&^G5#G@fhRHw?fC zsLz71g_u8TtGku5!^|*&(U*9wUBcOJJu!bauC5b)m z6VbMOYP+rxOlaO_l62J_j-SmWnA!B`>ILaIo3``A_Oyr#Q?}Pf66Z?}U<8#8Fbx1G z2XICbzv&6ZPfrGv0U^X6Qpywr?stdc&t2=*tf&M3R#|pl5^wp7E5@ohwTp;e0dNk$ z+H&c5WI-%`%Osm!p~OVV0Srw&3Sh>i$986dTe3@@9(jt1$B8IFj5?nwC>m)(J6 zP~FXpeQEn0O>2%Hzmh9KGN9~bqIZ}n!Gd}{q2cdKvIEJWuS+uT6LPWHVdqp$x6N-PC zuR?2I=4IJfg>*br6AoX@wkrs5!LO{d2|5PgsMDD3rP0yFOpr;x@_-QZJ_Bixe9;w3 zjO79`G&SYaW2*?@q5-BfRh6JlfY(FP9#=RzlCR2Sz_*==2N+1$O?$W1p^WW#tGC{s z7H3>~?4F`7;RS7@(+0<|rEdcD*H_hko^Q@e1CF=0R@&2ZJpjGLz@TGM^w$m#&rSrD zCIQjw3Pm>;1@O;oK~FjxH$FiJ4#=fW$)K`B0*_tmxJ+#F-Ag783gRlK9&1TzN-s!U zc7~z{ivpO|ymye}+RlXi1PlV$OJKdes{W1aaa?R^sj*s}TZ+DhH1S97P^@W1cfgvf z!@RPencJA@Y4?ffcS{3JYQ8ptd>2=_!IenNWhXH-^+N(hoqF`s6#-v3-Focj|0NH49|Vg-E9Lm!Eo;F`m@mMT zUu~2EAAsm9N155P`isPjWjo>bwUFS~T~&3D7jr*W3}7YW_I6uxZu)r;caaotOW+g< z{-lf+6ib4Is<-}M7r=j#4SGG0qMryGK(sZV=1Z~z#Z3ISI3EZv*@da*(1h TE`M@200000NkvXXu0mjfp|uK+ literal 0 HcmV?d00001 diff --git a/Rs.Controls/Rs.Controls.csproj b/Rs.Controls/Rs.Controls.csproj index e596ca7..a19ff62 100644 --- a/Rs.Controls/Rs.Controls.csproj +++ b/Rs.Controls/Rs.Controls.csproj @@ -220,5 +220,8 @@ Rs.Framework + + + \ No newline at end of file diff --git a/Rs.Controls/RsTray.cs b/Rs.Controls/RsTray.cs index 19fc00f..f79957c 100644 --- a/Rs.Controls/RsTray.cs +++ b/Rs.Controls/RsTray.cs @@ -77,6 +77,18 @@ namespace Rs.Controls set { mStatus = value; lblStatus.Text = mStatus; + if(mStatus=="Empty" || mStatus == "Unloaded") + { + lblStatus.BackColor = Color.Gray; + } + else if(mStatus=="Loaded") + { + lblStatus.BackColor = Color.Green; + } + else + { + lblStatus.BackColor = Color.Red; + } Invalidate(); } }