Skip to content

孙克 / ACSingleStore

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

点动功能修改

1 个父辈 7f5ca0d0
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 112 行增加 和 66 行删除
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!