修改英文界面

ButtonEx增加标定图标
master
lhiven 1 year ago
parent 1c85df4003
commit 5f82890823

@ -121,6 +121,14 @@ namespace Rs.MotionPlat
{ {
if(m_axis!=null) if(m_axis!=null)
{ {
if(m_axis.Config.NeedGoHome==0)
{
btnGoHome.Visible = false;
}
else
{
btnGoHome.Visible = true;
}
ErrorCode errCode; ErrorCode errCode;
m_axis.GetPrfPosition(out double prfPos); m_axis.GetPrfPosition(out double prfPos);
txtPrfPos.Text = prfPos.ToString("0.000"); txtPrfPos.Text = prfPos.ToString("0.000");

@ -18,7 +18,8 @@ namespace Rs.Controls
About, About,
Permission, Permission,
Language, Language,
Quit Quit,
Calib
} }
public class ButtonEx : Button public class ButtonEx : Button
{ {
@ -91,6 +92,10 @@ namespace Rs.Controls
case EButtonType.Quit: case EButtonType.Quit:
str = " \ue67d"; str = " \ue67d";
break; break;
case EButtonType.Calib:
str = "\uec31";
break;
default: default:
break; break;
} }

@ -29,11 +29,11 @@
private void InitializeComponent() private void InitializeComponent()
{ {
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CameraTemplate)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CameraTemplate));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.panelEx3 = new Rs.Controls.PanelEx(); this.panelEx3 = new Rs.Controls.PanelEx();
this.panelEx7 = new Rs.Controls.PanelEx(); this.panelEx7 = new Rs.Controls.PanelEx();
this.groupBox7 = new System.Windows.Forms.GroupBox(); this.groupBox7 = new System.Windows.Forms.GroupBox();
@ -295,9 +295,9 @@
this.dataGridView1.AllowUserToDeleteRows = false; this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.AllowUserToResizeColumns = false; this.dataGridView1.AllowUserToResizeColumns = false;
this.dataGridView1.AllowUserToResizeRows = false; this.dataGridView1.AllowUserToResizeRows = false;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56))))); dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
this.dataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; this.dataGridView1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dataGridView1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); this.dataGridView1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36)))));
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
@ -310,14 +310,14 @@
this.dataGridView1.MultiSelect = false; this.dataGridView1.MultiSelect = false;
this.dataGridView1.Name = "dataGridView1"; this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.ReadOnly = true; this.dataGridView1.ReadOnly = true;
dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36)))));
dataGridViewCellStyle10.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.White; dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.White;
dataGridViewCellStyle10.SelectionForeColor = System.Drawing.Color.White; dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.White;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle10; this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle5;
this.dataGridView1.RowHeadersVisible = false; this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dataGridView1.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing;
this.dataGridView1.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36))))); this.dataGridView1.RowTemplate.DefaultCellStyle.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(16)))), ((int)(((byte)(36)))));
@ -336,8 +336,8 @@
// X // X
// //
this.X.DataPropertyName = "X"; this.X.DataPropertyName = "X";
dataGridViewCellStyle7.Format = "0.000"; dataGridViewCellStyle2.Format = "0.000";
this.X.DefaultCellStyle = dataGridViewCellStyle7; this.X.DefaultCellStyle = dataGridViewCellStyle2;
this.X.FillWeight = 25.76511F; this.X.FillWeight = 25.76511F;
resources.ApplyResources(this.X, "X"); resources.ApplyResources(this.X, "X");
this.X.Name = "X"; this.X.Name = "X";
@ -346,8 +346,8 @@
// Y // Y
// //
this.Y.DataPropertyName = "Y"; this.Y.DataPropertyName = "Y";
dataGridViewCellStyle8.Format = "0.000"; dataGridViewCellStyle3.Format = "0.000";
this.Y.DefaultCellStyle = dataGridViewCellStyle8; this.Y.DefaultCellStyle = dataGridViewCellStyle3;
this.Y.FillWeight = 24.21075F; this.Y.FillWeight = 24.21075F;
resources.ApplyResources(this.Y, "Y"); resources.ApplyResources(this.Y, "Y");
this.Y.Name = "Y"; this.Y.Name = "Y";
@ -355,10 +355,10 @@
// //
// Move // Move
// //
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle9.BackColor = System.Drawing.Color.Silver; dataGridViewCellStyle4.BackColor = System.Drawing.Color.Silver;
dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White;
this.Move.DefaultCellStyle = dataGridViewCellStyle9; this.Move.DefaultCellStyle = dataGridViewCellStyle4;
this.Move.FillWeight = 26.00443F; this.Move.FillWeight = 26.00443F;
resources.ApplyResources(this.Move, "Move"); resources.ApplyResources(this.Move, "Move");
this.Move.Name = "Move"; this.Move.Name = "Move";

@ -117,21 +117,30 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="hWindow_Final1.Size" type="System.Drawing.Size, System.Drawing">
<value>667, 673</value>
</data>
<data name="groupBox7.Size" type="System.Drawing.Size, System.Drawing">
<value>673, 693</value>
</data>
<data name="groupBox7.Text" xml:space="preserve"> <data name="groupBox7.Text" xml:space="preserve">
<value>picture show</value> <value>picture show</value>
</data> </data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Camera paramters</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="label15.Size" type="System.Drawing.Size, System.Drawing"> <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
<value>47, 12</value> <value>47, 12</value>
</data> </data>
<data name="label15.Text" xml:space="preserve"> <data name="label15.Text" xml:space="preserve">
<value>Camera:</value> <value>Camera:</value>
</data> </data>
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
<value>275, 58</value>
</data>
<data name="btnSaveParamer.Size" type="System.Drawing.Size, System.Drawing">
<value>117, 27</value>
</data>
<data name="btnSaveParamer.Text" xml:space="preserve"> <data name="btnSaveParamer.Text" xml:space="preserve">
<value>Save</value> <value>Parameter Saving</value>
</data> </data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing"> <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 25</value> <value>0, 25</value>
@ -148,15 +157,48 @@
<data name="label11.Text" xml:space="preserve"> <data name="label11.Text" xml:space="preserve">
<value>Gain</value> <value>Gain</value>
</data> </data>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>278, 17</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>392, 58</value>
</data>
<data name="groupBox6.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 693</value>
</data>
<data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
<value>673, 78</value>
</data>
<data name="groupBox6.Text" xml:space="preserve">
<value>Camera Parameter</value>
</data>
<data name="panelEx7.Size" type="System.Drawing.Size, System.Drawing">
<value>673, 771</value>
</data>
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>673, 771</value>
</data>
<data name="panelEx3.Size" type="System.Drawing.Size, System.Drawing">
<value>673, 771</value>
</data>
<data name="lblHeadText.Size" type="System.Drawing.Size, System.Drawing">
<value>673, 40</value>
</data>
<data name="lblHeadText.Text" xml:space="preserve"> <data name="lblHeadText.Text" xml:space="preserve">
<value>Vision template</value> <value>Vision template</value>
</data> </data>
<data name="panelEx2.Size" type="System.Drawing.Size, System.Drawing">
<value>673, 40</value>
</data>
<data name="dataGridView1.Size" type="System.Drawing.Size, System.Drawing">
<value>322, 137</value>
</data>
<data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
<value>328, 157</value>
</data>
<data name="groupBox5.Text" xml:space="preserve"> <data name="groupBox5.Text" xml:space="preserve">
<value>Result</value> <value>Result</value>
</data> </data>
<data name="groupBox1.Text" xml:space="preserve">
<value>Location parameter</value>
</data>
<data name="label14.Location" type="System.Drawing.Point, System.Drawing"> <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
<value>151, 144</value> <value>151, 144</value>
</data> </data>
@ -227,8 +269,8 @@
<data name="label3.Text" xml:space="preserve"> <data name="label3.Text" xml:space="preserve">
<value>VPT:</value> <value>VPT:</value>
</data> </data>
<data name="groupBox4.Text" xml:space="preserve"> <data name="groupBox1.Text" xml:space="preserve">
<value>Paint-Erasure</value> <value>Parameter</value>
</data> </data>
<data name="rbtnBrushCircle.Location" type="System.Drawing.Point, System.Drawing"> <data name="rbtnBrushCircle.Location" type="System.Drawing.Point, System.Drawing">
<value>151, 57</value> <value>151, 57</value>
@ -278,14 +320,14 @@
<data name="btnClear.Text" xml:space="preserve"> <data name="btnClear.Text" xml:space="preserve">
<value>Erasure</value> <value>Erasure</value>
</data> </data>
<data name="groupBox3.Text" xml:space="preserve"> <data name="groupBox4.Text" xml:space="preserve">
<value>Draw</value> <value>Paint-Erasure</value>
</data> </data>
<data name="btnDrawRectangle2.Text" xml:space="preserve"> <data name="btnDrawRectangle2.Text" xml:space="preserve">
<value>Rect</value> <value>Rect</value>
</data> </data>
<data name="btnDrawBarCode.Text" xml:space="preserve"> <data name="btnDrawBarCode.Text" xml:space="preserve">
<value>Barcode</value> <value>2DID</value>
</data> </data>
<data name="btnDrawAny.Text" xml:space="preserve"> <data name="btnDrawAny.Text" xml:space="preserve">
<value>Any</value> <value>Any</value>
@ -293,8 +335,8 @@
<data name="btnDrawCircle.Text" xml:space="preserve"> <data name="btnDrawCircle.Text" xml:space="preserve">
<value>Circle</value> <value>Circle</value>
</data> </data>
<data name="groupBox2.Text" xml:space="preserve"> <data name="groupBox3.Text" xml:space="preserve">
<value>Search</value> <value>Draw</value>
</data> </data>
<data name="rbtnSearchSelectedRegion.Size" type="System.Drawing.Size, System.Drawing"> <data name="rbtnSearchSelectedRegion.Size" type="System.Drawing.Size, System.Drawing">
<value>88, 16</value> <value>88, 16</value>
@ -314,6 +356,9 @@
<data name="rbtnSearchWholeRegion.Text" xml:space="preserve"> <data name="rbtnSearchWholeRegion.Text" xml:space="preserve">
<value>Whole image</value> <value>Whole image</value>
</data> </data>
<data name="groupBox2.Text" xml:space="preserve">
<value>Search</value>
</data>
<data name="btnTestModel.Text" xml:space="preserve"> <data name="btnTestModel.Text" xml:space="preserve">
<value>Test</value> <value>Test</value>
</data> </data>
@ -332,4 +377,13 @@
<data name="btnGrabContinue.Text" xml:space="preserve"> <data name="btnGrabContinue.Text" xml:space="preserve">
<value>Continue grab</value> <value>Continue grab</value>
</data> </data>
<data name="panelEx1.Location" type="System.Drawing.Point, System.Drawing">
<value>673, 0</value>
</data>
<data name="panelEx1.Size" type="System.Drawing.Size, System.Drawing">
<value>328, 811</value>
</data>
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
<value>1001, 811</value>
</data>
</root> </root>

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save