Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 3d9f25a7 由 刘韬
选项

去除库位点位配置时 伺服微调界面

1 个父辈 c2617b00
内嵌 并排
正在显示 3 个修改的文件 包含 10 行增加 和 46 行删除
TheMachine/SettingControl.Designer.cs
...@@ -31,8 +31,6 @@ namespace TheMachine ...@@ -31,8 +31,6 @@ namespace TheMachine
{ {
this.components = new System.ComponentModel.Container(); this.components = new System.ComponentModel.Container();
this.chbAutoRun = new System.Windows.Forms.CheckBox(); this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.cb_tempsensorport = new System.Windows.Forms.ComboBox();
this.label_tempsensor = new System.Windows.Forms.Label();
this.button_positiontool = new System.Windows.Forms.Button(); this.button_positiontool = new System.Windows.Forms.Button();
this.lbl_hmdstate = new System.Windows.Forms.Label(); this.lbl_hmdstate = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
...@@ -48,7 +46,7 @@ namespace TheMachine ...@@ -48,7 +46,7 @@ namespace TheMachine
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.tp.SetColumnSpan(this.chbAutoRun, 2); this.tp.SetColumnSpan(this.chbAutoRun, 2);
this.chbAutoRun.Location = new System.Drawing.Point(10, 166); this.chbAutoRun.Location = new System.Drawing.Point(10, 134);
this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10); this.chbAutoRun.Margin = new System.Windows.Forms.Padding(10);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(84, 16); this.chbAutoRun.Size = new System.Drawing.Size(84, 16);
...@@ -56,33 +54,10 @@ namespace TheMachine ...@@ -56,33 +54,10 @@ namespace TheMachine
this.chbAutoRun.Text = "开机自启动"; this.chbAutoRun.Text = "开机自启动";
this.chbAutoRun.UseVisualStyleBackColor = true; this.chbAutoRun.UseVisualStyleBackColor = true;
// //
// cb_tempsensorport
//
this.cb_tempsensorport.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cb_tempsensorport.FormattingEnabled = true;
this.cb_tempsensorport.Location = new System.Drawing.Point(139, 6);
this.cb_tempsensorport.Margin = new System.Windows.Forms.Padding(6);
this.cb_tempsensorport.Name = "cb_tempsensorport";
this.cb_tempsensorport.Size = new System.Drawing.Size(121, 20);
this.cb_tempsensorport.TabIndex = 2;
this.cb_tempsensorport.Tag = "not";
//
// label_tempsensor
//
this.label_tempsensor.AutoSize = true;
this.label_tempsensor.Cursor = System.Windows.Forms.Cursors.Default;
this.label_tempsensor.Location = new System.Drawing.Point(10, 10);
this.label_tempsensor.Margin = new System.Windows.Forms.Padding(10);
this.label_tempsensor.Name = "label_tempsensor";
this.label_tempsensor.Size = new System.Drawing.Size(107, 12);
this.label_tempsensor.TabIndex = 3;
this.label_tempsensor.Text = "温湿度控制器端口:";
this.label_tempsensor.TextAlign = System.Drawing.ContentAlignment.TopRight;
//
// button_positiontool // button_positiontool
// //
this.tp.SetColumnSpan(this.button_positiontool, 2); this.tp.SetColumnSpan(this.button_positiontool, 2);
this.button_positiontool.Location = new System.Drawing.Point(10, 74); this.button_positiontool.Location = new System.Drawing.Point(10, 42);
this.button_positiontool.Margin = new System.Windows.Forms.Padding(10); this.button_positiontool.Margin = new System.Windows.Forms.Padding(10);
this.button_positiontool.Name = "button_positiontool"; this.button_positiontool.Name = "button_positiontool";
this.button_positiontool.Size = new System.Drawing.Size(181, 36); this.button_positiontool.Size = new System.Drawing.Size(181, 36);
...@@ -95,7 +70,7 @@ namespace TheMachine ...@@ -95,7 +70,7 @@ namespace TheMachine
// //
this.lbl_hmdstate.AutoSize = true; this.lbl_hmdstate.AutoSize = true;
this.tp.SetColumnSpan(this.lbl_hmdstate, 2); this.tp.SetColumnSpan(this.lbl_hmdstate, 2);
this.lbl_hmdstate.Location = new System.Drawing.Point(10, 42); this.lbl_hmdstate.Location = new System.Drawing.Point(10, 10);
this.lbl_hmdstate.Margin = new System.Windows.Forms.Padding(10); this.lbl_hmdstate.Margin = new System.Windows.Forms.Padding(10);
this.lbl_hmdstate.Name = "lbl_hmdstate"; this.lbl_hmdstate.Name = "lbl_hmdstate";
this.lbl_hmdstate.Size = new System.Drawing.Size(53, 12); this.lbl_hmdstate.Size = new System.Drawing.Size(53, 12);
...@@ -115,8 +90,6 @@ namespace TheMachine ...@@ -115,8 +90,6 @@ namespace TheMachine
this.tp.ColumnCount = 2; this.tp.ColumnCount = 2;
this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F)); this.tp.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tp.Controls.Add(this.label_tempsensor, 0, 0);
this.tp.Controls.Add(this.cb_tempsensorport, 1, 0);
this.tp.Controls.Add(this.button_positiontool, 0, 5); this.tp.Controls.Add(this.button_positiontool, 0, 5);
this.tp.Controls.Add(this.lbl_hmdstate, 0, 4); this.tp.Controls.Add(this.lbl_hmdstate, 0, 4);
this.tp.Controls.Add(this.cb_usefixpos, 0, 6); this.tp.Controls.Add(this.cb_usefixpos, 0, 6);
...@@ -133,14 +106,14 @@ namespace TheMachine ...@@ -133,14 +106,14 @@ namespace TheMachine
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle()); this.tp.RowStyles.Add(new System.Windows.Forms.RowStyle());
this.tp.Size = new System.Drawing.Size(266, 192); this.tp.Size = new System.Drawing.Size(286, 160);
this.tp.TabIndex = 6; this.tp.TabIndex = 6;
// //
// cb_usefixpos // cb_usefixpos
// //
this.cb_usefixpos.AutoSize = true; this.cb_usefixpos.AutoSize = true;
this.tp.SetColumnSpan(this.cb_usefixpos, 2); this.tp.SetColumnSpan(this.cb_usefixpos, 2);
this.cb_usefixpos.Location = new System.Drawing.Point(10, 130); this.cb_usefixpos.Location = new System.Drawing.Point(10, 98);
this.cb_usefixpos.Margin = new System.Windows.Forms.Padding(10); this.cb_usefixpos.Margin = new System.Windows.Forms.Padding(10);
this.cb_usefixpos.Name = "cb_usefixpos"; this.cb_usefixpos.Name = "cb_usefixpos";
this.cb_usefixpos.Size = new System.Drawing.Size(96, 16); this.cb_usefixpos.Size = new System.Drawing.Size(96, 16);
...@@ -163,7 +136,7 @@ namespace TheMachine ...@@ -163,7 +136,7 @@ namespace TheMachine
// //
this.uC_LedConfig1.AutoScroll = true; this.uC_LedConfig1.AutoScroll = true;
this.uC_LedConfig1.Config = null; this.uC_LedConfig1.Config = null;
this.uC_LedConfig1.Location = new System.Drawing.Point(16, 248); this.uC_LedConfig1.Location = new System.Drawing.Point(4, 263);
this.uC_LedConfig1.Name = "uC_LedConfig1"; this.uC_LedConfig1.Name = "uC_LedConfig1";
this.uC_LedConfig1.Size = new System.Drawing.Size(859, 440); this.uC_LedConfig1.Size = new System.Drawing.Size(859, 440);
this.uC_LedConfig1.TabIndex = 9; this.uC_LedConfig1.TabIndex = 9;
...@@ -172,7 +145,7 @@ namespace TheMachine ...@@ -172,7 +145,7 @@ namespace TheMachine
// uC_SetUserPassword1 // uC_SetUserPassword1
// //
this.uC_SetUserPassword1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.uC_SetUserPassword1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.uC_SetUserPassword1.Location = new System.Drawing.Point(327, 3); this.uC_SetUserPassword1.Location = new System.Drawing.Point(481, 1);
this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5); this.uC_SetUserPassword1.Margin = new System.Windows.Forms.Padding(5);
this.uC_SetUserPassword1.Name = "uC_SetUserPassword1"; this.uC_SetUserPassword1.Name = "uC_SetUserPassword1";
this.uC_SetUserPassword1.Size = new System.Drawing.Size(393, 237); this.uC_SetUserPassword1.Size = new System.Drawing.Size(393, 237);
...@@ -199,8 +172,6 @@ namespace TheMachine ...@@ -199,8 +172,6 @@ namespace TheMachine
#endregion #endregion
private System.Windows.Forms.CheckBox chbAutoRun; private System.Windows.Forms.CheckBox chbAutoRun;
private System.Windows.Forms.ComboBox cb_tempsensorport;
private System.Windows.Forms.Label label_tempsensor;
private System.Windows.Forms.Button button_positiontool; private System.Windows.Forms.Button button_positiontool;
private System.Windows.Forms.Label lbl_hmdstate; private System.Windows.Forms.Label lbl_hmdstate;
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
......
TheMachine/SettingControl.cs
...@@ -28,14 +28,7 @@ namespace TheMachine ...@@ -28,14 +28,7 @@ namespace TheMachine
//chbAutoRun.Enabled = false; //chbAutoRun.Enabled = false;
chbAutoRun.Checked = Convert.ToBoolean(Setting_Init.App_AutoRun == 1); chbAutoRun.Checked = Convert.ToBoolean(Setting_Init.App_AutoRun == 1);
this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged); this.chbAutoRun.CheckedChanged += new System.EventHandler(this.chbAutoRun_CheckedChanged);
//chbAutoRun.Enabled = true; }
for (int i = 0; i < 20; i++)
{
cb_tempsensorport.Items.Add("COM" + i);
}
this.cb_tempsensorport.SelectedIndexChanged += new System.EventHandler(this.cb_tempsensorport_SelectedIndexChanged);
}
private void RobotManage_LoadFinishEvent(bool state, string msg) private void RobotManage_LoadFinishEvent(bool state, string msg)
{ {
...@@ -51,7 +44,7 @@ namespace TheMachine ...@@ -51,7 +44,7 @@ namespace TheMachine
{ {
Config.PropertyBind("Device_Humiture_Port", cb_tempsensorport, "SelectedItem", "SelectedIndexChanged"); //Config.PropertyBind("Device_Humiture_Port", cb_tempsensorport, "SelectedItem", "SelectedIndexChanged");
Config.PropertyBind("Device_Use_Fixpos", cb_usefixpos, "Checked", "CheckedChanged"); Config.PropertyBind("Device_Use_Fixpos", cb_usefixpos, "Checked", "CheckedChanged");
} }
......
TheMachine/UC/StorePosControl.cs
...@@ -136,7 +136,7 @@ namespace TheMachine ...@@ -136,7 +136,7 @@ namespace TheMachine
textBox.Text = ProValue; textBox.Text = ProValue;
textBox.KeyPress += TextBox_KeyPress; textBox.KeyPress += TextBox_KeyPress;
textBox.TextChanged += TextBox_TextChanged; textBox.TextChanged += TextBox_TextChanged;
setAxisPopup(textBox, prop.Name, getConfigMoveAxis(asixno).Config); //setAxisPopup(textBox, prop.Name, getConfigMoveAxis(asixno).Config);
tableLayoutPanel1.Controls.Add(textBox, c + 1, r); tableLayoutPanel1.Controls.Add(textBox, c + 1, r);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!