Skip to content

刘韬 / 1069_MIMO_PlUS

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

中英文问题

1 个父辈 69cbddcc
内嵌 并排
正在显示 7 个修改的文件 包含 56 行增加 和 33 行删除
Common/Setting_Init.cs
......@@ -173,6 +173,8 @@ namespace OnlineStore.Common
public static MyConfig<bool> Enable_SingleDoor_ManualClose = false;
[MyConfigComment("启用隐藏smf单盘入库按钮")]
public static MyConfig<bool> Enable_HideSingleReelIn = false;
[MyConfigComment("启用隐藏旋转轴测试按钮，=true隐藏")]
public static MyConfig<bool> Enable_HideAxisTestBtn = true;
[MyConfigComment("启用上传监控图像给SMF")]
public static MyConfig<bool> Enable_UploadVideo = false;
......
TheMachine/AxisControl.Designer.cs
......@@ -34,11 +34,11 @@ namespace TheMachine
this.lblLed = new System.Windows.Forms.Label();
this.lblOkValue = new System.Windows.Forms.Label();
this.lblSensor = new System.Windows.Forms.Label();
this.button3 = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.btnAxisRStop = new System.Windows.Forms.Button();
this.btnAxisRTest = new System.Windows.Forms.Button();
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.configControl1 = new TheMachine.ConfigControl();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.configControl1 = new TheMachine.ConfigControl();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
......@@ -48,9 +48,10 @@ namespace TheMachine
this.panel1.Controls.Add(this.lblLed);
this.panel1.Controls.Add(this.lblOkValue);
this.panel1.Controls.Add(this.lblSensor);
this.panel1.Controls.Add(this.button3);
this.panel1.Controls.Add(this.button2);
this.panel1.Controls.Add(this.btnAxisRStop);
this.panel1.Controls.Add(this.btnAxisRTest);
this.panel1.Controls.Add(this.axisMoveControl1);
this.panel1.Controls.Add(this.configControl1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
......@@ -85,30 +86,25 @@ namespace TheMachine
this.lblSensor.TabIndex = 14;
this.lblSensor.Text = "声波传感器";
//
// button3
// btnAxisRStop
//
this.button3.Location = new System.Drawing.Point(38, 481);
this.button3.Name = "button3";
this.button3.Size = new System.Drawing.Size(155, 31);
this.button3.TabIndex = 13;
this.button3.Text = "旋转轴停止";
this.button3.UseVisualStyleBackColor = true;
this.button3.Click += new System.EventHandler(this.button3_Click);
this.btnAxisRStop.Location = new System.Drawing.Point(38, 481);
this.btnAxisRStop.Name = "btnAxisRStop";
this.btnAxisRStop.Size = new System.Drawing.Size(155, 31);
this.btnAxisRStop.TabIndex = 13;
this.btnAxisRStop.Text = "旋转轴停止";
this.btnAxisRStop.UseVisualStyleBackColor = true;
this.btnAxisRStop.Click += new System.EventHandler(this.button3_Click);
//
// button2
// btnAxisRTest
//
this.button2.Location = new System.Drawing.Point(38, 432);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(155, 31);
this.button2.TabIndex = 12;
this.button2.Text = "旋转轴循环";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
this.btnAxisRTest.Location = new System.Drawing.Point(38, 432);
this.btnAxisRTest.Name = "btnAxisRTest";
this.btnAxisRTest.Size = new System.Drawing.Size(155, 31);
this.btnAxisRTest.TabIndex = 12;
this.btnAxisRTest.Text = "旋转轴循环";
this.btnAxisRTest.UseVisualStyleBackColor = true;
this.btnAxisRTest.Click += new System.EventHandler(this.button2_Click);
//
// axisMoveControl1
//
......@@ -118,6 +114,11 @@ namespace TheMachine
this.axisMoveControl1.TabIndex = 0;
this.axisMoveControl1.Tag = "not";
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// configControl1
//
this.configControl1.Config = null;
......@@ -147,8 +148,8 @@ namespace TheMachine
private DeviceLibrary.AxisMoveControl axisMoveControl1;
private ConfigControl configControl1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button button3;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnAxisRStop;
private System.Windows.Forms.Button btnAxisRTest;
private System.Windows.Forms.Label lblSensor;
private System.Windows.Forms.Label lblLed;
private System.Windows.Forms.Label lblOkValue;
......
TheMachine/AxisControl.cs
......@@ -27,6 +27,17 @@ namespace TheMachine
lblLed.Text = "";
lblOkValue.Text = "";
lblSensor.Text = "";
if (Setting_Init.Enable_HideAxisTestBtn)
{
btnAxisRTest.Visible = false;
btnAxisRStop.Visible = false;
}
else
{
btnAxisRTest.Visible = true ;
btnAxisRStop.Visible = true ;
}
}
private void Crc_LanguageChangeEvent(object sender, EventArgs e)
......@@ -48,7 +59,7 @@ namespace TheMachine
if (!state)
return;
axisMoveControl1.LoadData(AxisBean.List);
configControl1.Config = RobotManage.Config;
configControl1.Config = RobotManage.Config;
LogUtil.info("伺服面板加载完成.");
timer1.Start();
......@@ -152,7 +163,7 @@ namespace TheMachine
if (Setting_Init.Device_DauxiKS107_PortName != "")
{
RobotManage.dauxiKS107Controller.Quary(out int currValue, out string msg);
lblSensor.Text = $"红外传感器{Setting_Init.Device_DauxiKS107_PortName}：" + currValue + ", /" + Setting_Init.Device_DauxiKS107_BaseValue + "/" + Setting_Init.Device_DauxiKS107_ErrorValue;
lblSensor.Text = $"{crc.GetString("shengbosensor", "声波传感器")}{Setting_Init.Device_DauxiKS107_PortName}：" + currValue + ", /" + Setting_Init.Device_DauxiKS107_BaseValue + "/" + Setting_Init.Device_DauxiKS107_ErrorValue;
}
else
{
......@@ -160,7 +171,7 @@ namespace TheMachine
}
if (Setting_Init.Device_WeightSensor_PortName != "")
{
lblOkValue.Text = $"压力传感器{Setting_Init.Device_WeightSensor_PortName}: {Setting_Init.Device_WeightSensor_MaxValue}";
lblOkValue.Text = $"{crc.GetString("yalisensor", "压力传感器")}{Setting_Init.Device_WeightSensor_PortName}: {Setting_Init.Device_WeightSensor_MaxValue}";
}
else
{
......
TheMachine/Form1.cs
......@@ -231,7 +231,8 @@ namespace TheMachine
foreach (var item in tabPages)
{
if (show)
{
{
item.Text = crc.GetString(item.Name, item.Text);
item.Parent = tabc;
}
else
......@@ -275,6 +276,7 @@ namespace TheMachine
RobotManage.IsConfigMode = RobotManage.IsConfigMode ? false : true;
(sender as ToolStripMenuItem).Text = !RobotManage.IsConfigMode ? crc.GetString(L.enable_config_mode, "启用配置模式") : crc.GetString(L.disable_config_mode, "停用配置模式");
crc.LanguageChange();
showDebugTabPages(RobotManage.IsConfigMode);
this.WindowState = FormWindowState.Maximized;
//if (RobotManage.IsConfigMode)
......
TheMachine/resources/en-US.lngres
......@@ -429,3 +429,5 @@ sensor_alarm 红外传感器偏差过大，需要检查后复位 Infrared senso
comInitError {0}初始化失败 {0}Initialization failure
comDataError 串口{0}数据错误{1} Serial port {0} data error {1}
comOpenFail 串口{0}打开失败 Serial port {0} open failed
shengbosensor 声波传感器 Acoustic Sensors
yalisensor 压力传感器 Pressure sensors
TheMachine/resources/ja-JP.lngres
......@@ -431,3 +431,6 @@ sensor_alarm 红外传感器偏差过大，需要检查后复位 赤外線セ
comInitError {0}初始化失败 {0}初期化に失敗しました
comDataError 串口{0}数据错误{1} シリアルポート {0} データエラー {1}
comOpenFail 串口{0}打开失败 シリアルポート {0} のオープンに失敗
shengbosensor 声波传感器 音響センサー
yalisensor 压力传感器 圧力センサー
TheMachine/resources/zh-CN.lngres
......@@ -416,3 +416,5 @@ sensor_alarm 红外传感器å差过大，需è¦æŠ¥è­¦ 红外传感器åå·®è¿
comInitError {0}初始化失败 {0}初始化失败
comDataError 串口{0}数据错误{1} 串口{0}数据错误{1}
comOpenFail 串口{0}打开失败 串口{0}打开失败
shengbosensor 声波传感器 声波传感器
yalisensor 压力传感器 压力传感器
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!