Skip to content

刘韬 / SO775-DUOStore

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

bug修改

1 个父辈 a82c8460
内嵌 并排
正在显示 2 个修改的文件 包含 80 行增加 和 74 行删除
source/DUOStore/FrmAxisMove.Designer.cs
...@@ -28,10 +28,13 @@ namespace OnlineStore.DUOStore ...@@ -28,10 +28,13 @@ namespace OnlineStore.DUOStore
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAxisMove)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAxisMove));
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupInout = new System.Windows.Forms.GroupBox(); this.groupInout = new System.Windows.Forms.GroupBox();
this.textBox1 = new System.Windows.Forms.TextBox(); this.btnSaveP = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.txtT2P4 = new System.Windows.Forms.TextBox();
this.btnT2P4 = new System.Windows.Forms.Button();
this.txtUpdownP6 = new System.Windows.Forms.TextBox(); this.txtUpdownP6 = new System.Windows.Forms.TextBox();
this.btnAxisOff = new System.Windows.Forms.Button();
this.btnUpdownP6 = new System.Windows.Forms.Button(); this.btnUpdownP6 = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button();
this.txtUpdownP5 = new System.Windows.Forms.TextBox(); this.txtUpdownP5 = new System.Windows.Forms.TextBox();
this.btnUpdownP5 = new System.Windows.Forms.Button(); this.btnUpdownP5 = new System.Windows.Forms.Button();
this.txtUpdownP4 = new System.Windows.Forms.TextBox(); this.txtUpdownP4 = new System.Windows.Forms.TextBox();
...@@ -52,9 +55,6 @@ namespace OnlineStore.DUOStore ...@@ -52,9 +55,6 @@ namespace OnlineStore.DUOStore
this.btnUpdownP3 = new System.Windows.Forms.Button(); this.btnUpdownP3 = new System.Windows.Forms.Button();
this.txtMiddleP3 = new System.Windows.Forms.TextBox(); this.txtMiddleP3 = new System.Windows.Forms.TextBox();
this.btnMiddleP3 = new System.Windows.Forms.Button(); this.btnMiddleP3 = new System.Windows.Forms.Button();
this.btnSaveP = new System.Windows.Forms.Button();
this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl(); this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -67,8 +67,8 @@ namespace OnlineStore.DUOStore ...@@ -67,8 +67,8 @@ namespace OnlineStore.DUOStore
// groupInout // groupInout
// //
this.groupInout.Controls.Add(this.btnSaveP); this.groupInout.Controls.Add(this.btnSaveP);
this.groupInout.Controls.Add(this.textBox1); this.groupInout.Controls.Add(this.txtT2P4);
this.groupInout.Controls.Add(this.button1); this.groupInout.Controls.Add(this.btnT2P4);
this.groupInout.Controls.Add(this.txtUpdownP6); this.groupInout.Controls.Add(this.txtUpdownP6);
this.groupInout.Controls.Add(this.btnAxisOff); this.groupInout.Controls.Add(this.btnAxisOff);
this.groupInout.Controls.Add(this.btnUpdownP6); this.groupInout.Controls.Add(this.btnUpdownP6);
...@@ -101,38 +101,50 @@ namespace OnlineStore.DUOStore ...@@ -101,38 +101,50 @@ namespace OnlineStore.DUOStore
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "提升机构位置信息"; this.groupInout.Text = "提升机构位置信息";
// //
// textBox1 // btnSaveP
// //
this.textBox1.AcceptsReturn = true; this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.textBox1.BackColor = System.Drawing.SystemColors.Window; this.btnSaveP.Location = new System.Drawing.Point(682, 187);
this.textBox1.Cursor = System.Windows.Forms.Cursors.IBeam; this.btnSaveP.Name = "btnSaveP";
this.textBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveP.Size = new System.Drawing.Size(128, 39);
this.textBox1.ForeColor = System.Drawing.SystemColors.WindowText; this.btnSaveP.TabIndex = 313;
this.textBox1.Location = new System.Drawing.Point(220, 222); this.btnSaveP.Text = "保存位置";
this.textBox1.MaxLength = 20; this.btnSaveP.UseVisualStyleBackColor = true;
this.textBox1.Name = "textBox1"; this.btnSaveP.Click += new System.EventHandler(this.btnSaveP_Click);
this.textBox1.RightToLeft = System.Windows.Forms.RightToLeft.No; //
this.textBox1.Size = new System.Drawing.Size(89, 23); // txtT2P4
this.textBox1.TabIndex = 314; //
this.textBox1.Text = "999999"; this.txtT2P4.AcceptsReturn = true;
// this.txtT2P4.BackColor = System.Drawing.SystemColors.Window;
// button1 this.txtT2P4.Cursor = System.Windows.Forms.Cursors.IBeam;
// this.txtT2P4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.AutoSize = true; this.txtT2P4.ForeColor = System.Drawing.SystemColors.WindowText;
this.button1.BackColor = System.Drawing.SystemColors.Control; this.txtT2P4.Location = new System.Drawing.Point(220, 222);
this.button1.Cursor = System.Windows.Forms.Cursors.Default; this.txtT2P4.MaxLength = 20;
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.txtT2P4.Name = "txtT2P4";
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtT2P4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.txtT2P4.Size = new System.Drawing.Size(89, 23);
this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.txtT2P4.TabIndex = 314;
this.button1.Location = new System.Drawing.Point(21, 217); this.txtT2P4.Text = "999999";
this.button1.Name = "button1"; //
this.button1.RightToLeft = System.Windows.Forms.RightToLeft.No; // btnT2P4
this.button1.Size = new System.Drawing.Size(193, 33); //
this.button1.TabIndex = 313; this.btnT2P4.AutoSize = true;
this.button1.Text = "T2_旋转轴_料串取放料点P4:"; this.btnT2P4.BackColor = System.Drawing.SystemColors.Control;
this.button1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnT2P4.Cursor = System.Windows.Forms.Cursors.Default;
this.button1.UseVisualStyleBackColor = false; this.btnT2P4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnT2P4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnT2P4.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnT2P4.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnT2P4.Location = new System.Drawing.Point(21, 217);
this.btnT2P4.Name = "btnT2P4";
this.btnT2P4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnT2P4.Size = new System.Drawing.Size(193, 33);
this.btnT2P4.TabIndex = 313;
this.btnT2P4.Text = "T2_旋转轴_料串取放料点P4:";
this.btnT2P4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnT2P4.UseVisualStyleBackColor = false;
this.btnT2P4.Click += new System.EventHandler(this.btnT2P4_Click);
// //
// txtUpdownP6 // txtUpdownP6
// //
...@@ -149,6 +161,17 @@ namespace OnlineStore.DUOStore ...@@ -149,6 +161,17 @@ namespace OnlineStore.DUOStore
this.txtUpdownP6.TabIndex = 312; this.txtUpdownP6.TabIndex = 312;
this.txtUpdownP6.Text = "999999"; this.txtUpdownP6.Text = "999999";
// //
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(682, 107);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 276;
this.btnAxisOff.Text = "关闭所有伺服";
this.btnAxisOff.UseVisualStyleBackColor = true;
this.btnAxisOff.Click += new System.EventHandler(this.btnAxisOff_Click);
//
// btnUpdownP6 // btnUpdownP6
// //
this.btnUpdownP6.AutoSize = true; this.btnUpdownP6.AutoSize = true;
...@@ -168,6 +191,17 @@ namespace OnlineStore.DUOStore ...@@ -168,6 +191,17 @@ namespace OnlineStore.DUOStore
this.btnUpdownP6.UseVisualStyleBackColor = false; this.btnUpdownP6.UseVisualStyleBackColor = false;
this.btnUpdownP6.Click += new System.EventHandler(this.btnUpdownP6_Click); this.btnUpdownP6.Click += new System.EventHandler(this.btnUpdownP6_Click);
// //
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(682, 62);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 275;
this.btnAxisOn.Text = "打开所有伺服";
this.btnAxisOn.UseVisualStyleBackColor = true;
this.btnAxisOn.Click += new System.EventHandler(this.btnAxisOn_Click);
//
// txtUpdownP5 // txtUpdownP5
// //
this.txtUpdownP5.AcceptsReturn = true; this.txtUpdownP5.AcceptsReturn = true;
...@@ -507,39 +541,6 @@ namespace OnlineStore.DUOStore ...@@ -507,39 +541,6 @@ namespace OnlineStore.DUOStore
this.btnMiddleP3.UseVisualStyleBackColor = false; this.btnMiddleP3.UseVisualStyleBackColor = false;
this.btnMiddleP3.Click += new System.EventHandler(this.btnMiddleP3_Click); this.btnMiddleP3.Click += new System.EventHandler(this.btnMiddleP3_Click);
// //
// btnSaveP
//
this.btnSaveP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveP.Location = new System.Drawing.Point(682, 187);
this.btnSaveP.Name = "btnSaveP";
this.btnSaveP.Size = new System.Drawing.Size(128, 39);
this.btnSaveP.TabIndex = 313;
this.btnSaveP.Text = "保存位置";
this.btnSaveP.UseVisualStyleBackColor = true;
this.btnSaveP.Click += new System.EventHandler(this.btnSaveP_Click);
//
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(682, 107);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 276;
this.btnAxisOff.Text = "关闭所有伺服";
this.btnAxisOff.UseVisualStyleBackColor = true;
this.btnAxisOff.Click += new System.EventHandler(this.btnAxisOff_Click);
//
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(682, 62);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 275;
this.btnAxisOn.Text = "打开所有伺服";
this.btnAxisOn.UseVisualStyleBackColor = true;
this.btnAxisOn.Click += new System.EventHandler(this.btnAxisOn_Click);
//
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Enabled = false; this.axisMoveControl1.Enabled = false;
...@@ -598,8 +599,8 @@ namespace OnlineStore.DUOStore ...@@ -598,8 +599,8 @@ namespace OnlineStore.DUOStore
public System.Windows.Forms.Button btnUpdownP4; public System.Windows.Forms.Button btnUpdownP4;
public System.Windows.Forms.Button btnUpdownP2; public System.Windows.Forms.Button btnUpdownP2;
private System.Windows.Forms.Button btnSaveP; private System.Windows.Forms.Button btnSaveP;
public System.Windows.Forms.TextBox textBox1; public System.Windows.Forms.TextBox txtT2P4;
public System.Windows.Forms.Button button1; public System.Windows.Forms.Button btnT2P4;
} }
} }
source/DUOStore/FrmAxisMove.cs
...@@ -178,5 +178,10 @@ namespace OnlineStore.DUOStore ...@@ -178,5 +178,10 @@ namespace OnlineStore.DUOStore
StoreManager.Store.CloseAllAxis(); StoreManager.Store.CloseAllAxis();
btnAxisOff.Enabled = true; btnAxisOff.Enabled = true;
} }
private void btnT2P4_Click(object sender, EventArgs e)
{
AxisABSMove(StoreManager.Store.T2_MiddleAxis, txtT2P4, StoreManager.Store.Config.MiddleAxis_P4Speed);
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!