Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 63febf3c 由 LN
选项

中英文调整

1 个父辈 aa3dd917
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 41 行增加 和 36 行删除
source/ACSingleStore/FrmIOStatus.cs
...@@ -50,16 +50,8 @@ namespace OnlineStore.ACSingleStore ...@@ -50,16 +50,8 @@ namespace OnlineStore.ACSingleStore
foreach (ConfigIO ioValue in boxBean.Config.StoreDIList.Values) foreach (ConfigIO ioValue in boxBean.Config.StoreDIList.Values)
{ {
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.DisplayName, ioValue.ProName);
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
control.Click += Control_Click; control.Click += Control_Click;
//IOTextControl control = new IOTextControl();
//control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain);
//control.IOValue = 0;
//control.isCanClick = false;
//control.Name = "IO_" + ioValue.ProName;
//control.Size = new System.Drawing.Size(200, 25);
//control.TabIndex = 0;
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex); this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
DIControlList.Add(ioValue.ProName, control); DIControlList.Add(ioValue.ProName, control);
...@@ -71,16 +63,8 @@ namespace OnlineStore.ACSingleStore ...@@ -71,16 +63,8 @@ namespace OnlineStore.ACSingleStore
foreach (ConfigIO ioValue in boxBean.Config.StoreDOList.Values) foreach (ConfigIO ioValue in boxBean.Config.StoreDOList.Values)
{ {
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName); IOTextControl control = new IOTextControl(ioValue.DisplayName, ioValue.ProName);
control.Click += Control_Click; control.Click += Control_Click;
//IOTextControl control = new IOTextControl();
//control.IOName = ioValue.ElectricalDefinition + "_" + ResourceCulture.GetString(ioValue.ElectricalDefinition, ioValue.Explain);
//control.IOValue = 0;
//control.isCanClick = true;
////control.Location = new System.Drawing.Point(0, 25*roleindex);
//control.Name = "IO_" + ioValue.ProName;
//control.Size = new System.Drawing.Size(200, 25);
//control.TabIndex = 0;
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex); this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++; roleindex++;
DOControlList.Add(ioValue.ProName, control); DOControlList.Add(ioValue.ProName, control);
...@@ -339,5 +323,10 @@ namespace OnlineStore.ACSingleStore ...@@ -339,5 +323,10 @@ namespace OnlineStore.ACSingleStore
IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Device_Led, IO_VALUE.LOW);
} }
private void groupBox1_Enter(object sender, EventArgs e)
{
}
} }
} }
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -563,9 +563,9 @@ ...@@ -563,9 +563,9 @@
this.btnHul.BackColor = System.Drawing.Color.White; this.btnHul.BackColor = System.Drawing.Color.White;
this.btnHul.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHul.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHul.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnHul.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHul.Location = new System.Drawing.Point(383, 8); this.btnHul.Location = new System.Drawing.Point(383, 4);
this.btnHul.Name = "btnHul"; this.btnHul.Name = "btnHul";
this.btnHul.Size = new System.Drawing.Size(149, 38); this.btnHul.Size = new System.Drawing.Size(149, 45);
this.btnHul.TabIndex = 263; this.btnHul.TabIndex = 263;
this.btnHul.Text = "忽略夹爪检测信号"; this.btnHul.Text = "忽略夹爪检测信号";
this.btnHul.UseVisualStyleBackColor = false; this.btnHul.UseVisualStyleBackColor = false;
...@@ -577,9 +577,9 @@ ...@@ -577,9 +577,9 @@
this.btnCloseDLed.BackColor = System.Drawing.Color.White; this.btnCloseDLed.BackColor = System.Drawing.Color.White;
this.btnCloseDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDLed.Location = new System.Drawing.Point(260, 49); this.btnCloseDLed.Location = new System.Drawing.Point(260, 54);
this.btnCloseDLed.Name = "btnCloseDLed"; this.btnCloseDLed.Name = "btnCloseDLed";
this.btnCloseDLed.Size = new System.Drawing.Size(117, 38); this.btnCloseDLed.Size = new System.Drawing.Size(117, 45);
this.btnCloseDLed.TabIndex = 262; this.btnCloseDLed.TabIndex = 262;
this.btnCloseDLed.Text = "关闭设备照明"; this.btnCloseDLed.Text = "关闭设备照明";
this.btnCloseDLed.UseVisualStyleBackColor = false; this.btnCloseDLed.UseVisualStyleBackColor = false;
...@@ -590,9 +590,9 @@ ...@@ -590,9 +590,9 @@
this.btnOpenDLed.BackColor = System.Drawing.Color.White; this.btnOpenDLed.BackColor = System.Drawing.Color.White;
this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDLed.Location = new System.Drawing.Point(260, 8); this.btnOpenDLed.Location = new System.Drawing.Point(260, 4);
this.btnOpenDLed.Name = "btnOpenDLed"; this.btnOpenDLed.Name = "btnOpenDLed";
this.btnOpenDLed.Size = new System.Drawing.Size(117, 38); this.btnOpenDLed.Size = new System.Drawing.Size(117, 45);
this.btnOpenDLed.TabIndex = 261; this.btnOpenDLed.TabIndex = 261;
this.btnOpenDLed.Text = "打开设备照明"; this.btnOpenDLed.Text = "打开设备照明";
this.btnOpenDLed.UseVisualStyleBackColor = false; this.btnOpenDLed.UseVisualStyleBackColor = false;
...@@ -603,9 +603,9 @@ ...@@ -603,9 +603,9 @@
this.btnCloseLed.BackColor = System.Drawing.Color.White; this.btnCloseLed.BackColor = System.Drawing.Color.White;
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(137, 49); this.btnCloseLed.Location = new System.Drawing.Point(137, 54);
this.btnCloseLed.Name = "btnCloseLed"; this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(117, 38); this.btnCloseLed.Size = new System.Drawing.Size(117, 45);
this.btnCloseLed.TabIndex = 260; this.btnCloseLed.TabIndex = 260;
this.btnCloseLed.Text = "关闭相机照明"; this.btnCloseLed.Text = "关闭相机照明";
this.btnCloseLed.UseVisualStyleBackColor = false; this.btnCloseLed.UseVisualStyleBackColor = false;
...@@ -616,9 +616,9 @@ ...@@ -616,9 +616,9 @@
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(383, 49); this.btnClearLog.Location = new System.Drawing.Point(383, 54);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(149, 38); this.btnClearLog.Size = new System.Drawing.Size(149, 45);
this.btnClearLog.TabIndex = 224; this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志"; this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = false; this.btnClearLog.UseVisualStyleBackColor = false;
...@@ -629,9 +629,9 @@ ...@@ -629,9 +629,9 @@
this.btnOpenLed.BackColor = System.Drawing.Color.White; this.btnOpenLed.BackColor = System.Drawing.Color.White;
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(137, 8); this.btnOpenLed.Location = new System.Drawing.Point(137, 4);
this.btnOpenLed.Name = "btnOpenLed"; this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(117, 38); this.btnOpenLed.Size = new System.Drawing.Size(117, 45);
this.btnOpenLed.TabIndex = 259; this.btnOpenLed.TabIndex = 259;
this.btnOpenLed.Text = "打开相机照明"; this.btnOpenLed.Text = "打开相机照明";
this.btnOpenLed.UseVisualStyleBackColor = false; this.btnOpenLed.UseVisualStyleBackColor = false;
...@@ -642,9 +642,9 @@ ...@@ -642,9 +642,9 @@
this.btnCloseDoor.BackColor = System.Drawing.Color.White; this.btnCloseDoor.BackColor = System.Drawing.Color.White;
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(14, 49); this.btnCloseDoor.Location = new System.Drawing.Point(14, 54);
this.btnCloseDoor.Name = "btnCloseDoor"; this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(117, 38); this.btnCloseDoor.Size = new System.Drawing.Size(117, 45);
this.btnCloseDoor.TabIndex = 258; this.btnCloseDoor.TabIndex = 258;
this.btnCloseDoor.Text = "关闭仓门"; this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = false; this.btnCloseDoor.UseVisualStyleBackColor = false;
...@@ -655,9 +655,9 @@ ...@@ -655,9 +655,9 @@
this.btnOpenDoor.BackColor = System.Drawing.Color.White; this.btnOpenDoor.BackColor = System.Drawing.Color.White;
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(14, 8); this.btnOpenDoor.Location = new System.Drawing.Point(14, 4);
this.btnOpenDoor.Name = "btnOpenDoor"; this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(117, 38); this.btnOpenDoor.Size = new System.Drawing.Size(117, 45);
this.btnOpenDoor.TabIndex = 257; this.btnOpenDoor.TabIndex = 257;
this.btnOpenDoor.Text = "打开仓门"; this.btnOpenDoor.Text = "打开仓门";
this.btnOpenDoor.UseVisualStyleBackColor = false; this.btnOpenDoor.UseVisualStyleBackColor = false;
...@@ -669,9 +669,9 @@ ...@@ -669,9 +669,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(5, 91); this.richTextBox1.Location = new System.Drawing.Point(5, 104);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(534, 526); this.richTextBox1.Size = new System.Drawing.Size(534, 513);
this.richTextBox1.TabIndex = 256; this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = ""; this.richTextBox1.Text = "";
this.richTextBox1.Visible = false; this.richTextBox1.Visible = false;
......
source/ACSingleStore/resource/language.resource
...@@ -315,3 +315,9 @@ Runing,运行中,Runing ...@@ -315,3 +315,9 @@ Runing,运行中,Runing
OutStorEnd,出库完成,OutStorEnd OutStorEnd,出库完成,OutStorEnd
FrmStoreBox_btnCloseDLed_Text,关闭设备照明,Turn off lighting FrmStoreBox_btnCloseDLed_Text,关闭设备照明,Turn off lighting
FrmStoreBox_btnOpenDLed_Text,打开设备照明,Turn on lighting FrmStoreBox_btnOpenDLed_Text,打开设备照明,Turn on lighting
FrmStoreBox_btnOpenAutoInOut_Text,开启自动出入库, start auto storage and retrieval
FrmStoreBox_btnHul_Text,忽略夹爪检测信号,Ignore the gripper detection signal
FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text
Y11,设备照明开,Equipment lighting on
FrmIOStatus_btnCDLed_Text,关闭设备照明,Turn off equipment lighting
FrmIOStatus_btnDevideLed_Text,打开设备照明,Turn on equipment lighting
\ No newline at end of file \ No newline at end of file
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
...@@ -253,6 +253,16 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -253,6 +253,16 @@ namespace OnlineStore.LoadCSVLibrary
{ {
} }
} }
public string DisplayName
{
get
{
return ElectricalDefinition + "_" + CSVResourceControl.GetString(ElectricalDefinition, Explain);
}
set
{
}
}
public override int GetValue() public override int GetValue()
{ {
return GetIOValue(); return GetIOValue();
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!