Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c63e8bb9 由 几米阳光
选项

点动功能修改

1 个父辈 7f5ca0d0
内嵌 并排
正在显示 5 个修改的文件 包含 185 行增加 和 131 行删除
source/ACSingleStore/FrmAxisDebug.Designer.cs
...@@ -28,24 +28,27 @@ ...@@ -28,24 +28,27 @@
/// </summary> /// </summary>
private void InitializeComponent() private void InitializeComponent()
{ {
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAxisDebug)); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAxisDebug));
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.btnMiddleMove = new System.Windows.Forms.Button(); this.btnMiddleMove = new System.Windows.Forms.Button();
this.txtMiddleSpeed = new System.Windows.Forms.TextBox(); this.txtMiddleSpeed = new System.Windows.Forms.TextBox();
this.txtUpDownSpeed = new System.Windows.Forms.TextBox(); this.txtUpDownSpeed = new System.Windows.Forms.TextBox();
this.txtInOutSpeed = new System.Windows.Forms.TextBox(); this.txtInOutSpeed = new System.Windows.Forms.TextBox();
this.txtComSpeed = new System.Windows.Forms.TextBox();
this.btnUpDownMove = new System.Windows.Forms.Button(); this.btnUpDownMove = new System.Windows.Forms.Button();
this.btnInOutMove = new System.Windows.Forms.Button(); this.btnInOutMove = new System.Windows.Forms.Button();
this.btnComMove = new System.Windows.Forms.Button();
this.btnComMovej = new System.Windows.Forms.Button();
this.btnInOutMovej = new System.Windows.Forms.Button(); this.btnInOutMovej = new System.Windows.Forms.Button();
this.btnUpDownMovej = new System.Windows.Forms.Button(); this.btnUpDownMovej = new System.Windows.Forms.Button();
this.btnMiddleMovej = new System.Windows.Forms.Button(); this.btnMiddleMovej = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.txtInOutPosition = new System.Windows.Forms.TextBox();
this.txtUpdownPosition = new System.Windows.Forms.TextBox();
this.txtMiddlePosition = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.SuspendLayout(); this.SuspendLayout();
// //
// label1 // label1
...@@ -53,7 +56,7 @@ ...@@ -53,7 +56,7 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(39, 77); this.label1.Location = new System.Drawing.Point(39, 77);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(107, 20); this.label1.Size = new System.Drawing.Size(92, 17);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
this.label1.Text = "（轴一）旋转轴"; this.label1.Text = "（轴一）旋转轴";
// //
...@@ -62,7 +65,7 @@ ...@@ -62,7 +65,7 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(39, 131); this.label2.Location = new System.Drawing.Point(39, 131);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(107, 20); this.label2.Size = new System.Drawing.Size(92, 17);
this.label2.TabIndex = 1; this.label2.TabIndex = 1;
this.label2.Text = "（轴二）升降轴"; this.label2.Text = "（轴二）升降轴";
// //
...@@ -71,20 +74,10 @@ ...@@ -71,20 +74,10 @@
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(39, 184); this.label3.Location = new System.Drawing.Point(39, 184);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(107, 20); this.label3.Size = new System.Drawing.Size(92, 17);
this.label3.TabIndex = 2; this.label3.TabIndex = 2;
this.label3.Text = "（轴三）进出轴"; this.label3.Text = "（轴三）进出轴";
// //
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(39, 233);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(107, 20);
this.label4.TabIndex = 3;
this.label4.Text = "（轴四）压紧轴";
this.label4.Visible = false;
//
// btnMiddleMove // btnMiddleMove
// //
this.btnMiddleMove.Location = new System.Drawing.Point(266, 70); this.btnMiddleMove.Location = new System.Drawing.Point(266, 70);
...@@ -92,7 +85,7 @@ ...@@ -92,7 +85,7 @@
this.btnMiddleMove.Size = new System.Drawing.Size(131, 36); this.btnMiddleMove.Size = new System.Drawing.Size(131, 36);
this.btnMiddleMove.TabIndex = 4; this.btnMiddleMove.TabIndex = 4;
this.btnMiddleMove.Text = "旋转轴+(顺时针)"; this.btnMiddleMove.Text = "旋转轴+(顺时针)";
this.btnMiddleMove.UseVisualStyleBackColor = true; this.btnMiddleMove.UseVisualStyleBackColor = true;
this.btnMiddleMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseDown); this.btnMiddleMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseDown);
this.btnMiddleMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseUp); this.btnMiddleMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseUp);
// //
...@@ -100,38 +93,30 @@ ...@@ -100,38 +93,30 @@
// //
this.txtMiddleSpeed.Location = new System.Drawing.Point(150, 75); this.txtMiddleSpeed.Location = new System.Drawing.Point(150, 75);
this.txtMiddleSpeed.Name = "txtMiddleSpeed"; this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(108, 26); this.txtMiddleSpeed.Size = new System.Drawing.Size(108, 23);
this.txtMiddleSpeed.TabIndex = 5; this.txtMiddleSpeed.TabIndex = 5;
// //
// txtUpDownSpeed // txtUpDownSpeed
// //
this.txtUpDownSpeed.Location = new System.Drawing.Point(150, 129); this.txtUpDownSpeed.Location = new System.Drawing.Point(150, 129);
this.txtUpDownSpeed.Name = "txtUpDownSpeed"; this.txtUpDownSpeed.Name = "txtUpDownSpeed";
this.txtUpDownSpeed.Size = new System.Drawing.Size(108, 26); this.txtUpDownSpeed.Size = new System.Drawing.Size(108, 23);
this.txtUpDownSpeed.TabIndex = 6; this.txtUpDownSpeed.TabIndex = 6;
// //
// txtInOutSpeed // txtInOutSpeed
// //
this.txtInOutSpeed.Location = new System.Drawing.Point(150, 182); this.txtInOutSpeed.Location = new System.Drawing.Point(150, 182);
this.txtInOutSpeed.Name = "txtInOutSpeed"; this.txtInOutSpeed.Name = "txtInOutSpeed";
this.txtInOutSpeed.Size = new System.Drawing.Size(108, 26); this.txtInOutSpeed.Size = new System.Drawing.Size(108, 23);
this.txtInOutSpeed.TabIndex = 7; this.txtInOutSpeed.TabIndex = 7;
// //
// txtComSpeed
//
this.txtComSpeed.Location = new System.Drawing.Point(150, 228);
this.txtComSpeed.Name = "txtComSpeed";
this.txtComSpeed.Size = new System.Drawing.Size(108, 26);
this.txtComSpeed.TabIndex = 8;
this.txtComSpeed.Visible = false;
//
// btnUpDownMove // btnUpDownMove
// //
this.btnUpDownMove.Location = new System.Drawing.Point(266, 124); this.btnUpDownMove.Location = new System.Drawing.Point(266, 124);
this.btnUpDownMove.Name = "btnUpDownMove"; this.btnUpDownMove.Name = "btnUpDownMove";
this.btnUpDownMove.Size = new System.Drawing.Size(131, 36); this.btnUpDownMove.Size = new System.Drawing.Size(131, 36);
this.btnUpDownMove.TabIndex = 9; this.btnUpDownMove.TabIndex = 9;
this.btnUpDownMove.Text = "升降轴+(下降)"; this.btnUpDownMove.Text = "升降轴+(上升)";
this.btnUpDownMove.UseVisualStyleBackColor = true; this.btnUpDownMove.UseVisualStyleBackColor = true;
this.btnUpDownMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMove_MouseDown); this.btnUpDownMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMove_MouseDown);
this.btnUpDownMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMove_MouseUp); this.btnUpDownMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMove_MouseUp);
...@@ -147,30 +132,6 @@ ...@@ -147,30 +132,6 @@
this.btnInOutMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseDown); this.btnInOutMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseDown);
this.btnInOutMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseUp); this.btnInOutMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseUp);
// //
// btnComMove
//
this.btnComMove.Location = new System.Drawing.Point(293, 221);
this.btnComMove.Name = "btnComMove";
this.btnComMove.Size = new System.Drawing.Size(107, 31);
this.btnComMove.TabIndex = 11;
this.btnComMove.Text = "压紧轴+(上升)";
this.btnComMove.UseVisualStyleBackColor = true;
this.btnComMove.Visible = false;
this.btnComMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnComMove_MouseDown);
this.btnComMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnComMove_MouseUp);
//
// btnComMovej
//
this.btnComMovej.Location = new System.Drawing.Point(421, 221);
this.btnComMovej.Name = "btnComMovej";
this.btnComMovej.Size = new System.Drawing.Size(107, 31);
this.btnComMovej.TabIndex = 15;
this.btnComMovej.Text = "压紧轴-(下降)";
this.btnComMovej.UseVisualStyleBackColor = true;
this.btnComMovej.Visible = false;
this.btnComMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnComMovej_MouseDown);
this.btnComMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnComMovej_MouseUp);
//
// btnInOutMovej // btnInOutMovej
// //
this.btnInOutMovej.Location = new System.Drawing.Point(401, 177); this.btnInOutMovej.Location = new System.Drawing.Point(401, 177);
...@@ -188,7 +149,7 @@ ...@@ -188,7 +149,7 @@
this.btnUpDownMovej.Name = "btnUpDownMovej"; this.btnUpDownMovej.Name = "btnUpDownMovej";
this.btnUpDownMovej.Size = new System.Drawing.Size(131, 36); this.btnUpDownMovej.Size = new System.Drawing.Size(131, 36);
this.btnUpDownMovej.TabIndex = 13; this.btnUpDownMovej.TabIndex = 13;
this.btnUpDownMovej.Text = "升降轴-(上升)"; this.btnUpDownMovej.Text = "升降轴-(下降)";
this.btnUpDownMovej.UseVisualStyleBackColor = true; this.btnUpDownMovej.UseVisualStyleBackColor = true;
this.btnUpDownMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMovej_MouseDown); this.btnUpDownMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMovej_MouseDown);
this.btnUpDownMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMovej_MouseUp); this.btnUpDownMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnUpDownMovej_MouseUp);
...@@ -214,25 +175,70 @@ ...@@ -214,25 +175,70 @@
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click); this.button1.Click += new System.EventHandler(this.button1_Click);
// //
// txtInOutPosition
//
this.txtInOutPosition.Location = new System.Drawing.Point(551, 182);
this.txtInOutPosition.Name = "txtInOutPosition";
this.txtInOutPosition.Size = new System.Drawing.Size(108, 23);
this.txtInOutPosition.TabIndex = 19;
//
// txtUpdownPosition
//
this.txtUpdownPosition.Location = new System.Drawing.Point(551, 129);
this.txtUpdownPosition.Name = "txtUpdownPosition";
this.txtUpdownPosition.Size = new System.Drawing.Size(108, 23);
this.txtUpdownPosition.TabIndex = 18;
//
// txtMiddlePosition
//
this.txtMiddlePosition.Location = new System.Drawing.Point(551, 75);
this.txtMiddlePosition.Name = "txtMiddlePosition";
this.txtMiddlePosition.Size = new System.Drawing.Size(108, 23);
this.txtMiddlePosition.TabIndex = 17;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(172, 31);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 20;
this.label5.Text = "点动速度";
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(566, 31);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(56, 17);
this.label6.TabIndex = 21;
this.label6.Text = "实时坐标";
//
// timer1
//
this.timer1.Interval = 2000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// FrmAxisDebug // FrmAxisDebug
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); 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(558, 318); this.ClientSize = new System.Drawing.Size(737, 318);
this.Controls.Add(this.label6);
this.Controls.Add(this.label5);
this.Controls.Add(this.txtInOutPosition);
this.Controls.Add(this.txtUpdownPosition);
this.Controls.Add(this.txtMiddlePosition);
this.Controls.Add(this.button1); this.Controls.Add(this.button1);
this.Controls.Add(this.btnComMovej);
this.Controls.Add(this.btnInOutMovej); this.Controls.Add(this.btnInOutMovej);
this.Controls.Add(this.btnUpDownMovej); this.Controls.Add(this.btnUpDownMovej);
this.Controls.Add(this.btnMiddleMovej); this.Controls.Add(this.btnMiddleMovej);
this.Controls.Add(this.btnComMove);
this.Controls.Add(this.btnInOutMove); this.Controls.Add(this.btnInOutMove);
this.Controls.Add(this.btnUpDownMove); this.Controls.Add(this.btnUpDownMove);
this.Controls.Add(this.txtComSpeed);
this.Controls.Add(this.txtInOutSpeed); this.Controls.Add(this.txtInOutSpeed);
this.Controls.Add(this.txtUpDownSpeed); this.Controls.Add(this.txtUpDownSpeed);
this.Controls.Add(this.txtMiddleSpeed); this.Controls.Add(this.txtMiddleSpeed);
this.Controls.Add(this.btnMiddleMove); this.Controls.Add(this.btnMiddleMove);
this.Controls.Add(this.label4);
this.Controls.Add(this.label3); this.Controls.Add(this.label3);
this.Controls.Add(this.label2); this.Controls.Add(this.label2);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
...@@ -253,19 +259,21 @@ ...@@ -253,19 +259,21 @@
private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label1;
private System.Windows.Forms.Label label2; private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button btnMiddleMove; private System.Windows.Forms.Button btnMiddleMove;
private System.Windows.Forms.TextBox txtMiddleSpeed; private System.Windows.Forms.TextBox txtMiddleSpeed;
private System.Windows.Forms.TextBox txtUpDownSpeed; private System.Windows.Forms.TextBox txtUpDownSpeed;
private System.Windows.Forms.TextBox txtInOutSpeed; private System.Windows.Forms.TextBox txtInOutSpeed;
private System.Windows.Forms.TextBox txtComSpeed;
private System.Windows.Forms.Button btnUpDownMove; private System.Windows.Forms.Button btnUpDownMove;
private System.Windows.Forms.Button btnInOutMove; private System.Windows.Forms.Button btnInOutMove;
private System.Windows.Forms.Button btnComMove;
private System.Windows.Forms.Button btnComMovej;
private System.Windows.Forms.Button btnInOutMovej; private System.Windows.Forms.Button btnInOutMovej;
private System.Windows.Forms.Button btnUpDownMovej; private System.Windows.Forms.Button btnUpDownMovej;
private System.Windows.Forms.Button btnMiddleMovej; private System.Windows.Forms.Button btnMiddleMovej;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
private System.Windows.Forms.TextBox txtInOutPosition;
private System.Windows.Forms.TextBox txtUpdownPosition;
private System.Windows.Forms.TextBox txtMiddlePosition;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Timer timer1;
} }
} }
\ No newline at end of file \ No newline at end of file
source/ACSingleStore/FrmAxisDebug.cs
...@@ -48,7 +48,8 @@ namespace OnlineStore.ACSingleStore ...@@ -48,7 +48,8 @@ namespace OnlineStore.ACSingleStore
{ {
txtMiddleSpeed.Text = middle.TargetSpeed.ToString(); txtMiddleSpeed.Text = middle.TargetSpeed.ToString();
txtInOutSpeed.Text = inout.TargetSpeed.ToString(); txtInOutSpeed.Text = inout.TargetSpeed.ToString();
txtUpDownSpeed.Text = updown.TargetSpeed.ToString(); txtUpDownSpeed.Text = updown.TargetSpeed.ToString();
timer1.Start();
} }
private void btnMiddleMove_MouseDown(object sender, MouseEventArgs e) private void btnMiddleMove_MouseDown(object sender, MouseEventArgs e)
...@@ -69,6 +70,7 @@ namespace OnlineStore.ACSingleStore ...@@ -69,6 +70,7 @@ namespace OnlineStore.ACSingleStore
{ {
btnMiddleMove.BackColor = System.Drawing.SystemColors.Control; btnMiddleMove.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(middle.DeviceName, middle.GetAxisValue()); ACServerManager.SuddenStop(middle.DeviceName, middle.GetAxisValue());
UpdateMiddlePosition();
} }
} }
...@@ -90,6 +92,7 @@ namespace OnlineStore.ACSingleStore ...@@ -90,6 +92,7 @@ namespace OnlineStore.ACSingleStore
{ {
btnUpDownMove.BackColor = System.Drawing.SystemColors.Control; btnUpDownMove.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(updown.DeviceName, updown.GetAxisValue()); ACServerManager.SuddenStop(updown.DeviceName, updown.GetAxisValue());
UpdateUpdownPosition();
} }
} }
...@@ -111,33 +114,34 @@ namespace OnlineStore.ACSingleStore ...@@ -111,33 +114,34 @@ namespace OnlineStore.ACSingleStore
{ {
btnInOutMove.BackColor = System.Drawing.SystemColors.Control; btnInOutMove.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(inout.DeviceName, inout.GetAxisValue()); ACServerManager.SuddenStop(inout.DeviceName, inout.GetAxisValue());
UpdateInOutPosition();
} }
} }
private void btnComMove_MouseDown(object sender, MouseEventArgs e) //private void btnComMove_MouseDown(object sender, MouseEventArgs e)
{ //{
int speed = FormUtil.GetIntValue(txtComSpeed); // int speed = FormUtil.GetIntValue(txtComSpeed);
if (speed <= 0) // if (speed <= 0)
{ // {
MessageBox.Show("提示", "请先输入正确的速度"); // MessageBox.Show("提示", "请先输入正确的速度");
return; // return;
} // }
this.btnComMove.BackColor = Color.Green; // this.btnComMove.BackColor = Color.Green;
ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetEndSpeed, speed); // ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetEndSpeed, speed);
ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetMaxSpeed, speed); // ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetMaxSpeed, speed);
ShuoKeControls.VolMove(compress_Slv, speed); // ShuoKeControls.VolMove(compress_Slv, speed);
} //}
private void btnComMove_MouseUp(object sender, MouseEventArgs e) //private void btnComMove_MouseUp(object sender, MouseEventArgs e)
{ //{
if (this.btnComMove.BackColor == Color.Green) // if (this.btnComMove.BackColor == Color.Green)
{ // {
btnComMove.BackColor = System.Drawing.SystemColors.Control; // btnComMove.BackColor = System.Drawing.SystemColors.Control;
//ACServerManager.SuddenStop(compress.DeviceName, compress.GetAxisValue()); // //ACServerManager.SuddenStop(compress.DeviceName, compress.GetAxisValue());
ShuoKeControls.SuddownStop(compress_Slv); // ShuoKeControls.SuddownStop(compress_Slv);
} // }
} //}
private void btnMiddleMovej_MouseDown(object sender, MouseEventArgs e) private void btnMiddleMovej_MouseDown(object sender, MouseEventArgs e)
{ {
...@@ -157,6 +161,7 @@ namespace OnlineStore.ACSingleStore ...@@ -157,6 +161,7 @@ namespace OnlineStore.ACSingleStore
{ {
btnMiddleMovej.BackColor = System.Drawing.SystemColors.Control; btnMiddleMovej.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(middle.DeviceName, middle.GetAxisValue()); ACServerManager.SuddenStop(middle.DeviceName, middle.GetAxisValue());
UpdateMiddlePosition();
} }
} }
...@@ -178,6 +183,7 @@ namespace OnlineStore.ACSingleStore ...@@ -178,6 +183,7 @@ namespace OnlineStore.ACSingleStore
{ {
btnUpDownMovej.BackColor = System.Drawing.SystemColors.Control; btnUpDownMovej.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(updown.DeviceName, updown.GetAxisValue()); ACServerManager.SuddenStop(updown.DeviceName, updown.GetAxisValue());
UpdateUpdownPosition();
} }
} }
...@@ -199,43 +205,80 @@ namespace OnlineStore.ACSingleStore ...@@ -199,43 +205,80 @@ namespace OnlineStore.ACSingleStore
{ {
btnInOutMovej.BackColor = System.Drawing.SystemColors.Control; btnInOutMovej.BackColor = System.Drawing.SystemColors.Control;
ACServerManager.SuddenStop(inout.DeviceName, inout.GetAxisValue()); ACServerManager.SuddenStop(inout.DeviceName, inout.GetAxisValue());
UpdateInOutPosition();
} }
} }
private void btnComMovej_MouseDown(object sender, MouseEventArgs e) //private void btnComMovej_MouseDown(object sender, MouseEventArgs e)
//{
// int speed = FormUtil.GetIntValue(txtComSpeed);
// if (speed <= 0)
// {
// MessageBox.Show("提示", "请先输入正确的速度");
// return;
// }
// this.btnComMovej.BackColor = Color.Green;
// //AxisMove(compress, -speed);
// ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetEndSpeed, speed);
// ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetMaxSpeed, speed);
// ShuoKeControls.VolMove(compress_Slv, speed);
//}
//private void btnComMovej_MouseUp(object sender, MouseEventArgs e)
//{
// if (btnComMovej.BackColor.Equals(Color.Green))
// {
// btnComMovej.BackColor = System.Drawing.SystemColors.Control;
// ShuoKeControls.SuddownStop(compress_Slv);
// }
//}
private void button1_Click(object sender, EventArgs e)
{ {
int speed = FormUtil.GetIntValue(txtComSpeed); this.Close();
if (speed <= 0) }
private void FrmAxisDebug_Shown(object sender, EventArgs e)
{
SetSkin(this);
}
private void timer1_Tick(object sender, EventArgs e)
{
if (this.Visible)
{ {
MessageBox.Show("提示", "请先输入正确的速度"); UpdateMiddlePosition();
return; UpdateInOutPosition();
UpdateUpdownPosition();
} }
this.btnComMovej.BackColor = Color.Green;
//AxisMove(compress, -speed);
ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetEndSpeed, speed);
ShuoKeControls.SetSpeed(compress_Slv, ShuoKeCMD.SetMaxSpeed, speed);
ShuoKeControls.VolMove(compress_Slv, speed);
} }
private void btnComMovej_MouseUp(object sender, MouseEventArgs e) private void UpdateUpdownPosition()
{ {
if (btnComMovej.BackColor.Equals(Color.Green)) int updownPosition = ACServerManager.GetTargetPosition(updown.DeviceName, updown.GetAxisValue());
if (!txtUpdownPosition.Text.Equals(updownPosition.ToString()))
{ {
btnComMovej.BackColor = System.Drawing.SystemColors.Control; txtUpdownPosition.Text = updownPosition.ToString();
ShuoKeControls.SuddownStop(compress_Slv);
} }
} }
private void button1_Click(object sender, EventArgs e) private void UpdateMiddlePosition()
{ {
this.Close(); int middlePosition = ACServerManager.GetTargetPosition(middle.DeviceName, middle.GetAxisValue());
if (!txtMiddlePosition.Text.Equals(middlePosition.ToString()))
{
txtMiddlePosition.Text = middlePosition.ToString();
}
} }
private void FrmAxisDebug_Shown(object sender, EventArgs e) private void UpdateInOutPosition()
{ {
SetSkin(this); int inoutPosition = ACServerManager.GetTargetPosition(inout.DeviceName, inout.GetAxisValue());
if (!txtInOutPosition.Text.Equals(inoutPosition.ToString()))
{
txtInOutPosition.Text = inoutPosition.ToString();
}
} }
} }
} }
source/ACSingleStore/FrmAxisDebug.resx
...@@ -117,6 +117,9 @@ ...@@ -117,6 +117,9 @@
<resheader name="writer"> <resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader> </resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value> <value>
......
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -140,11 +140,11 @@ ...@@ -140,11 +140,11 @@
this.料仓运转OFFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.料仓运转OFFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.打开舱门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.打开舱门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.关闭仓门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.关闭仓门ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.配置信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.轴运动配置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.设备调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.设备调试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.轴卡点动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.轴卡点动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.扫码测试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.扫码测试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.配置信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.轴运动配置ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.开启DEBUGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.开启DEBUGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
...@@ -1656,22 +1656,6 @@ ...@@ -1656,22 +1656,6 @@
this.关闭仓门ToolStripMenuItem.Text = "关闭仓门"; this.关闭仓门ToolStripMenuItem.Text = "关闭仓门";
this.关闭仓门ToolStripMenuItem.Click += new System.EventHandler(this.关闭仓门ToolStripMenuItem_Click); this.关闭仓门ToolStripMenuItem.Click += new System.EventHandler(this.关闭仓门ToolStripMenuItem_Click);
// //
// 配置信息ToolStripMenuItem
//
this.配置信息ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.轴运动配置ToolStripMenuItem});
this.配置信息ToolStripMenuItem.Name = "配置信息ToolStripMenuItem";
this.配置信息ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
this.配置信息ToolStripMenuItem.Text = "配置信息";
this.配置信息ToolStripMenuItem.Visible = false;
//
// 轴运动配置ToolStripMenuItem
//
this.轴运动配置ToolStripMenuItem.Name = "轴运动配置ToolStripMenuItem";
this.轴运动配置ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.轴运动配置ToolStripMenuItem.Text = "轴运动配置";
this.轴运动配置ToolStripMenuItem.Click += new System.EventHandler(this.轴运动配置ToolStripMenuItem_Click);
//
// 设备调试ToolStripMenuItem // 设备调试ToolStripMenuItem
// //
this.设备调试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.设备调试ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
...@@ -1684,17 +1668,33 @@ ...@@ -1684,17 +1668,33 @@
// 轴卡点动ToolStripMenuItem // 轴卡点动ToolStripMenuItem
// //
this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem"; this.轴卡点动ToolStripMenuItem.Name = "轴卡点动ToolStripMenuItem";
this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.轴卡点动ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.轴卡点动ToolStripMenuItem.Text = "轴卡点动"; this.轴卡点动ToolStripMenuItem.Text = "轴卡点动";
this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click); this.轴卡点动ToolStripMenuItem.Click += new System.EventHandler(this.轴卡点动ToolStripMenuItem_Click);
// //
// 扫码测试ToolStripMenuItem // 扫码测试ToolStripMenuItem
// //
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem"; this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(124, 22);
this.扫码测试ToolStripMenuItem.Text = "扫码测试"; this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click); this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
// //
// 配置信息ToolStripMenuItem
//
this.配置信息ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.轴运动配置ToolStripMenuItem});
this.配置信息ToolStripMenuItem.Name = "配置信息ToolStripMenuItem";
this.配置信息ToolStripMenuItem.Size = new System.Drawing.Size(68, 21);
this.配置信息ToolStripMenuItem.Text = "配置信息";
this.配置信息ToolStripMenuItem.Visible = false;
//
// 轴运动配置ToolStripMenuItem
//
this.轴运动配置ToolStripMenuItem.Name = "轴运动配置ToolStripMenuItem";
this.轴运动配置ToolStripMenuItem.Size = new System.Drawing.Size(136, 22);
this.轴运动配置ToolStripMenuItem.Text = "轴运动配置";
this.轴运动配置ToolStripMenuItem.Click += new System.EventHandler(this.轴运动配置ToolStripMenuItem_Click);
//
// 日志ToolStripMenuItem // 日志ToolStripMenuItem
// //
this.日志ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.日志ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
......
source/ACSingleStore/FrmStoreBox.resx
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
<value>107, 16</value> <value>107, 16</value>
</metadata> </metadata>
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>25</value> <value>118</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!