Commit 5e2aec5d 几米阳光

点动界面修改

1 个父辈 3a44a10e
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
this.btnAutoMove = new System.Windows.Forms.Button(); this.btnAutoMove = new System.Windows.Forms.Button();
this.txtAutoSpeed = new System.Windows.Forms.TextBox(); this.txtAutoSpeed = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label();
this.btnUpdate = new System.Windows.Forms.Button();
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
...@@ -183,7 +184,7 @@ ...@@ -183,7 +184,7 @@
// //
// button1 // button1
// //
this.button1.Location = new System.Drawing.Point(406, 401); this.button1.Location = new System.Drawing.Point(428, 374);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37); this.button1.Size = new System.Drawing.Size(126, 37);
this.button1.TabIndex = 16; this.button1.TabIndex = 16;
...@@ -329,11 +330,22 @@ ...@@ -329,11 +330,22 @@
this.label7.Text = "批量上下料轴"; this.label7.Text = "批量上下料轴";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnUpdate
//
this.btnUpdate.Location = new System.Drawing.Point(281, 374);
this.btnUpdate.Name = "btnUpdate";
this.btnUpdate.Size = new System.Drawing.Size(126, 37);
this.btnUpdate.TabIndex = 32;
this.btnUpdate.Text = "更新坐标";
this.btnUpdate.UseVisualStyleBackColor = true;
this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
//
// FrmAxisDebug // FrmAxisDebug
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(751, 450); this.ClientSize = new System.Drawing.Size(751, 450);
this.Controls.Add(this.btnUpdate);
this.Controls.Add(this.txtAutoPosition); this.Controls.Add(this.txtAutoPosition);
this.Controls.Add(this.btnAutoMovej); this.Controls.Add(this.btnAutoMovej);
this.Controls.Add(this.btnAutoMove); this.Controls.Add(this.btnAutoMove);
...@@ -405,5 +417,6 @@ ...@@ -405,5 +417,6 @@
private System.Windows.Forms.Button btnAutoMove; private System.Windows.Forms.Button btnAutoMove;
private System.Windows.Forms.TextBox txtAutoSpeed; private System.Windows.Forms.TextBox txtAutoSpeed;
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.Button btnUpdate;
} }
} }
\ No newline at end of file \ No newline at end of file
...@@ -50,8 +50,13 @@ namespace OnlineStore.AutoInOutStore ...@@ -50,8 +50,13 @@ namespace OnlineStore.AutoInOutStore
txtInOutSpeed.Text = (inout.TargetSpeed / 5).ToString(); txtInOutSpeed.Text = (inout.TargetSpeed / 5).ToString();
txtUpDownSpeed.Text = (updown.TargetSpeed / 5).ToString(); txtUpDownSpeed.Text = (updown.TargetSpeed / 5).ToString();
txtAutoSpeed.Text = (auto.TargetSpeed / 5).ToString(); txtAutoSpeed.Text = (auto.TargetSpeed / 5).ToString();
txtComSpeed.Text = (StoreManager.Config.CompressAxis_EndSpeed / 5).ToString(); txtComSpeed.Text = (StoreManager.Config.CompressAxis_EndSpeed/2).ToString();
timer1.Start(); //timer1.Start();
UpdateMiddlePosition();
UpdateInOutPosition();
UpdateUpdownPosition();
UpdateAutoPosition();
txtComPosition.Text = ShuoKeControls.GetABSPosition(compress_Slv).ToString();
} }
/// <summary> /// <summary>
/// 判断进出轴是否在P1点 /// 判断进出轴是否在P1点
...@@ -268,7 +273,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -268,7 +273,7 @@ namespace OnlineStore.AutoInOutStore
{ {
btnComMove.BackColor = System.Drawing.SystemColors.Control; btnComMove.BackColor = System.Drawing.SystemColors.Control;
ShuoKeControls.SuddownStop(compress_Slv); ShuoKeControls.SuddownStop(compress_Slv);
ShuoKeControls.GetABSPosition(compress_Slv); txtComPosition.Text = ShuoKeControls.GetABSPosition(compress_Slv).ToString();
} }
} }
private void btnComMovej_MouseDown(object sender, MouseEventArgs e) private void btnComMovej_MouseDown(object sender, MouseEventArgs e)
...@@ -291,7 +296,7 @@ namespace OnlineStore.AutoInOutStore ...@@ -291,7 +296,7 @@ namespace OnlineStore.AutoInOutStore
{ {
btnComMovej.BackColor = System.Drawing.SystemColors.Control; btnComMovej.BackColor = System.Drawing.SystemColors.Control;
ShuoKeControls.SuddownStop(compress_Slv); ShuoKeControls.SuddownStop(compress_Slv);
ShuoKeControls.GetABSPosition(compress_Slv); txtComPosition.Text = ShuoKeControls.GetABSPosition(compress_Slv).ToString();
} }
} }
...@@ -314,7 +319,8 @@ namespace OnlineStore.AutoInOutStore ...@@ -314,7 +319,8 @@ namespace OnlineStore.AutoInOutStore
UpdateInOutPosition(); UpdateInOutPosition();
UpdateUpdownPosition(); UpdateUpdownPosition();
UpdateAutoPosition(); UpdateAutoPosition();
txtComPosition.Text = ShuoKeControls.GetLastPosition(compress_Slv).ToString(); //txtComPosition.Text = ShuoKeControls.GetLastPosition(compress_Slv).ToString();
} }
} }
...@@ -401,5 +407,14 @@ namespace OnlineStore.AutoInOutStore ...@@ -401,5 +407,14 @@ namespace OnlineStore.AutoInOutStore
UpdateAutoPosition(); UpdateAutoPosition();
} }
} }
private void btnUpdate_Click(object sender, EventArgs e)
{
UpdateMiddlePosition();
UpdateInOutPosition();
UpdateUpdownPosition();
UpdateAutoPosition();
txtComPosition.Text = ShuoKeControls.GetABSPosition(compress_Slv).ToString();
}
} }
} }
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!