lhiven
/
RealSys.MotionPlat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化自定义控件的多语言

Browse Source
master
lhiven 1 year ago
parent c8b6927fa9
commit 6e43711c51
11 changed files with 879 additions and 475 deletions
Show Stats Download Patch File Download Diff File

14
Rs.Controls/AxisMove.Designer.cs generated
Unescape Escape View File

@ -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;
}
}

16
Rs.Controls/AxisMove.cs
Unescape Escape View File

@ -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

53
Rs.Controls/AxisMove.en-US.resx
Unescape Escape View File

@ -117,9 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="groupBox1.Text" xml:space="preserve">
<value>Limit</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label50.Location" type="System.Drawing.Point, System.Drawing">
<value>668, 30</value>
@ -139,8 +136,8 @@
<data name="label49.Text" xml:space="preserve">
<value>Software N-limit</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>Axis sta</value>
<data name="groupBox1.Text" xml:space="preserve">
<value>Limit</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Move sta:</value>
@ -184,6 +181,37 @@
<data name="label1.Text" xml:space="preserve">
<value>Org state:</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>Axis sta</value>
</data>
<data name="chkMoveStep.Location" type="System.Drawing.Point, System.Drawing">
<value>286, 214</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnClearAlarm.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
<value>Flat</value>
</data>
<data name="btnClearAlarm.Font" type="System.Drawing.Font, System.Drawing">
<value>宋体, 16pt</value>
</data>
<data name="btnServoOff.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 158</value>
</data>
<data name="btnServoOn.Location" type="System.Drawing.Point, System.Drawing">
<value>22, 69</value>
</data>
<data name="label51.Location" type="System.Drawing.Point, System.Drawing">
<value>359, 256</value>
</data>
<data name="btnStop.Location" type="System.Drawing.Point, System.Drawing">
<value>658, 211</value>
</data>
<data name="btnGoHome.Location" type="System.Drawing.Point, System.Drawing">
<value>527, 211</value>
</data>
<data name="txtMoveDist.Location" type="System.Drawing.Point, System.Drawing">
<value>267, 249</value>
</data>
<data name="label58.Size" type="System.Drawing.Size, System.Drawing">
<value>35, 12</value>
</data>
@ -205,6 +233,15 @@
<data name="label8.Text" xml:space="preserve">
<value>Tolerance</value>
</data>
<data name="label5.Location" type="System.Drawing.Point, System.Drawing">
<value>488, 16</value>
</data>
<data name="label5.Size" type="System.Drawing.Size, System.Drawing">
<value>107, 12</value>
</data>
<data name="label5.Text" xml:space="preserve">
<value>Assist driver pos</value>
</data>
<data name="lblDriver.Text" xml:space="preserve">
<value>Driver pos</value>
</data>
@ -214,12 +251,18 @@
<data name="label7.Text" xml:space="preserve">
<value>Encoder pos</value>
</data>
<data name="btnMovePositive.Location" type="System.Drawing.Point, System.Drawing">
<value>388, 211</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>47, 12</value>
</data>
<data name="label6.Text" xml:space="preserve">
<value>Prf pos</value>
</data>
<data name="btnMoveNegative.Location" type="System.Drawing.Point, System.Drawing">
<value>158, 211</value>
</data>
<data name="groupBox3.Text" xml:space="preserve">
<value>Move</value>
</data>

1144
Rs.Controls/AxisMove.resx
View File

File diff suppressed because it is too large Load Diff

51
Rs.Controls/AxisProperty.en-US.resx
Unescape Escape View File

@ -178,6 +178,12 @@
<data name="label10.Text" xml:space="preserve">
<value>Home dir:</value>
</data>
<data name="gboxHomePro.Text" xml:space="preserve">
<value>Home property</value>
</data>
<data name="gboxMotorPro.Text" xml:space="preserve">
<value>Motor property</value>
</data>
<data name="label13.Location" type="System.Drawing.Point, System.Drawing">
<value>320, 23</value>
</data>
@ -205,12 +211,54 @@
<data name="label26.Text" xml:space="preserve">
<value>S-curve smoothing time:</value>
</data>
<data name="label33.Location" type="System.Drawing.Point, System.Drawing">
<value>306, 241</value>
</data>
<data name="label33.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 12</value>
</data>
<data name="label33.Text" xml:space="preserve">
<value>Software N position:</value>
</data>
<data name="label34.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 282</value>
</data>
<data name="label34.Size" type="System.Drawing.Size, System.Drawing">
<value>137, 12</value>
</data>
<data name="label34.Text" xml:space="preserve">
<value>Enable software limit:</value>
</data>
<data name="label29.Location" type="System.Drawing.Point, System.Drawing">
<value>294, 205</value>
</data>
<data name="label29.Size" type="System.Drawing.Size, System.Drawing">
<value>143, 12</value>
</data>
<data name="label29.Text" xml:space="preserve">
<value>distance of one circle:</value>
</data>
<data name="label32.Location" type="System.Drawing.Point, System.Drawing">
<value>32, 242</value>
</data>
<data name="label32.Size" type="System.Drawing.Size, System.Drawing">
<value>125, 12</value>
</data>
<data name="label32.Text" xml:space="preserve">
<value>Software P position:</value>
</data>
<data name="label40.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 12</value>
</data>
<data name="label40.Text" xml:space="preserve">
<value>Dec-time:</value>
</data>
<data name="label28.Size" type="System.Drawing.Size, System.Drawing">
<value>107, 12</value>
</data>
<data name="label28.Text" xml:space="preserve">
<value>Pulse per circle:</value>
</data>
<data name="label39.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 12</value>
</data>
@ -247,7 +295,4 @@
<data name="label19.Text" xml:space="preserve">
<value>Enable encoder:</value>
</data>
<data name="gboxMotorPro.Text" xml:space="preserve">
<value>Motor property</value>
</data>
</root>

48
Rs.Controls/AxisProperty.resx
Unescape Escape View File

@ -218,9 +218,6 @@
<data name="txtDistOneRound.Location" type="System.Drawing.Point, System.Drawing">
<value>436, 198</value>
</data>
<data name="&gt;&gt;txtPulseOutMode.Name" xml:space="preserve">
<value>txtPulseOutMode</value>
</data>
<data name="&gt;&gt;txtNelSoftwarePosition.Parent" xml:space="preserve">
<value>gboxMotorPro</value>
</data>
@ -479,9 +476,6 @@
<data name="label48.Location" type="System.Drawing.Point, System.Drawing">
<value>302, 501</value>
</data>
<data name="&gt;&gt;txtAxisName.Name" xml:space="preserve">
<value>txtAxisName</value>
</data>
<data name="cboxCanJog.Size" type="System.Drawing.Size, System.Drawing">
<value>15, 14</value>
</data>
@ -581,8 +575,8 @@
<data name="label38.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label40.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 12</value>
<data name="label51.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="label42.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -950,6 +944,9 @@
<data name="&gt;&gt;txtHomeMode.Parent" xml:space="preserve">
<value>gboxHomePro</value>
</data>
<data name="&gt;&gt;txtCurrent.Name" xml:space="preserve">
<value>txtCurrent</value>
</data>
<data name="txtInpLogic.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
@ -1070,9 +1067,6 @@
<data name="label49.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="txtPulseOutMode.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 21</value>
</data>
<data name="txtAbsoluteEncoder.Location" type="System.Drawing.Point, System.Drawing">
<value>436, 535</value>
</data>
@ -1392,9 +1386,6 @@
<data name="&gt;&gt;txtCardId.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="txtHomeMode.Location" type="System.Drawing.Point, System.Drawing">
<value>436, 17</value>
</data>
<data name="btnSave.Text" xml:space="preserve">
<value>保存</value>
</data>
@ -1452,6 +1443,9 @@
<data name="label26.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 12</value>
</data>
<data name="&gt;&gt;gboxMotorPro.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;txtEnableEncoder.ZOrder" xml:space="preserve">
<value>1</value>
</data>
@ -1596,8 +1590,8 @@
<data name="txtEnableInp.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 21</value>
</data>
<data name="&gt;&gt;gboxMotorPro.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="&gt;&gt;txtPulseOutMode.Name" xml:space="preserve">
<value>txtPulseOutMode</value>
</data>
<data name="label44.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -1779,6 +1773,9 @@
<data name="label44.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;label35.Parent" xml:space="preserve">
<value>gboxMotorPro</value>
</data>
<data name="&gt;&gt;label20.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -2025,6 +2022,9 @@
<data name="label25.Location" type="System.Drawing.Point, System.Drawing">
<value>265, 139</value>
</data>
<data name="label40.Size" type="System.Drawing.Size, System.Drawing">
<value>65, 12</value>
</data>
<data name="&gt;&gt;label16.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -2106,8 +2106,8 @@
<data name="&gt;&gt;txtHomeVelMode.ZOrder" xml:space="preserve">
<value>12</value>
</data>
<data name="&gt;&gt;label35.Parent" xml:space="preserve">
<value>gboxMotorPro</value>
<data name="txtPulseOutMode.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 21</value>
</data>
<data name="label16.Text" xml:space="preserve">
<value>最大速度:</value>
@ -2175,8 +2175,8 @@
<data name="&gt;&gt;txtEnableInp.ZOrder" xml:space="preserve">
<value>28</value>
</data>
<data name="&gt;&gt;txtCurrent.Name" xml:space="preserve">
<value>txtCurrent</value>
<data name="label37.Text" xml:space="preserve">
<value>软极限制动模式:</value>
</data>
<data name="label42.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@ -2388,8 +2388,8 @@
<data name="label38.Size" type="System.Drawing.Size, System.Drawing">
<value>89, 12</value>
</data>
<data name="label37.Text" xml:space="preserve">
<value>软极限制动模式:</value>
<data name="&gt;&gt;txtAxisName.Name" xml:space="preserve">
<value>txtAxisName</value>
</data>
<data name="label48.Text" xml:space="preserve">
<value>高速位置比较有效电平:</value>
@ -2505,8 +2505,8 @@
<data name="&gt;&gt;txtAlarmLogic.ZOrder" xml:space="preserve">
<value>20</value>
</data>
<data name="label51.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
<data name="txtHomeMode.Location" type="System.Drawing.Point, System.Drawing">
<value>436, 17</value>
</data>
<data name="&gt;&gt;txtSTime.Name" xml:space="preserve">
<value>txtSTime</value>

10
Rs.Controls/Properties/Resources.Designer.cs generated
Unescape Escape View File

@ -60,6 +60,16 @@ namespace Rs.Controls.Properties {
}
}
/// <summary>
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
/// </summary>
internal static System.Drawing.Bitmap clear {
get {
object obj = ResourceManager.GetObject("clear", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// 查找 System.Byte[] 类型的本地化资源。
/// </summary>

3
Rs.Controls/Properties/Resources.resx
Unescape Escape View File

@ -118,6 +118,9 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="clear" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="iconfont" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\iconfont.ttf;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>

BIN
Rs.Controls/Resources/clear.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

3
Rs.Controls/Rs.Controls.csproj
Unescape Escape View File

@ -220,5 +220,8 @@
<Name>Rs.Framework</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Resources\clear.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

12
Rs.Controls/RsTray.cs
Unescape Escape View File

@ -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();
}
}

Write Preview
Loading…
Cancel
Save