Skip to content

孙克 / ACSingleStore

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

优化超声波高度检测

1 个父辈 0399105c
内嵌 并排
正在显示 14 个修改的文件 包含 249 行增加 和 218 行删除
source/ACSingleStore/ACSingleStore.csproj
......@@ -85,6 +85,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="ResourceCulture.cs" />
<Compile Include="useControl\AxisTipControl.cs">
<SubType>Form</SubType>
</Compile>
......@@ -149,7 +150,6 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ResourceCulture.cs" />
<Compile Include="useControl\AxisMoveControl.cs">
<SubType>UserControl</SubType>
</Compile>
......
source/ACSingleStore/FrmIOStatus.cs
......@@ -241,7 +241,7 @@ namespace OnlineStore.ACSingleStore
public static double ConvertAI(double aiValue, double defaultValue)
{
double xishu = (double)StoreManager.Config.AI_ConvertPosition;
double result = Math.Round((aiValue - defaultValue) / xishu, 2);
double result = Math.Round(Math.Abs(aiValue - defaultValue) / xishu, 2);
return result;
}
private void btnOpenDoor_Click(object sender, EventArgs e)
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -221,7 +221,7 @@ namespace OnlineStore.ACSingleStore
this.tabControl2.Location = new System.Drawing.Point(6, 4);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(954, 80);
this.tabControl2.Size = new System.Drawing.Size(998, 80);
this.tabControl2.TabIndex = 271;
//
// tabPage4
......@@ -234,7 +234,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage4.Location = new System.Drawing.Point(4, 30);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(946, 46);
this.tabPage4.Size = new System.Drawing.Size(990, 46);
this.tabPage4.TabIndex = 0;
this.tabPage4.Text = " 料仓操作 ";
this.tabPage4.UseVisualStyleBackColor = true;
......@@ -309,7 +309,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage5.Location = new System.Drawing.Point(4, 30);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(946, 46);
this.tabPage5.Size = new System.Drawing.Size(990, 46);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = " 设备调试 ";
this.tabPage5.UseVisualStyleBackColor = true;
......@@ -357,7 +357,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage6.Controls.Add(this.button4);
this.tabPage6.Location = new System.Drawing.Point(4, 30);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(946, 46);
this.tabPage6.Size = new System.Drawing.Size(990, 46);
this.tabPage6.TabIndex = 2;
this.tabPage6.Text = " 其他 ";
this.tabPage6.UseVisualStyleBackColor = true;
......@@ -404,9 +404,9 @@ namespace OnlineStore.ACSingleStore
//
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdown.Location = new System.Drawing.Point(602, 400);
this.btnUpdown.Location = new System.Drawing.Point(708, 427);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(135, 33);
this.btnUpdown.Size = new System.Drawing.Size(254, 33);
this.btnUpdown.TabIndex = 272;
this.btnUpdown.Text = "升降轴位置调试";
this.btnUpdown.UseVisualStyleBackColor = true;
......@@ -416,7 +416,7 @@ namespace OnlineStore.ACSingleStore
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOff.Location = new System.Drawing.Point(462, 400);
this.btnAxisOff.Location = new System.Drawing.Point(567, 427);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(135, 33);
this.btnAxisOff.TabIndex = 11;
......@@ -428,7 +428,7 @@ namespace OnlineStore.ACSingleStore
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisOn.Location = new System.Drawing.Point(322, 400);
this.btnAxisOn.Location = new System.Drawing.Point(427, 427);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(135, 33);
this.btnAxisOn.TabIndex = 10;
......@@ -497,7 +497,7 @@ namespace OnlineStore.ACSingleStore
this.tabControl1.Location = new System.Drawing.Point(6, 85);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(954, 639);
this.tabControl1.Size = new System.Drawing.Size(998, 639);
this.tabControl1.TabIndex = 272;
//
// tabPage7
......@@ -514,7 +514,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage7.Controls.Add(this.btnCloseDLed);
this.tabPage7.Location = new System.Drawing.Point(4, 29);
this.tabPage7.Name = "tabPage7";
this.tabPage7.Size = new System.Drawing.Size(946, 606);
this.tabPage7.Size = new System.Drawing.Size(990, 606);
this.tabPage7.TabIndex = 3;
this.tabPage7.Text = " 设备状态 ";
this.tabPage7.UseVisualStyleBackColor = true;
......@@ -717,7 +717,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage3.Controls.Add(this.btnLogDebug);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(946, 606);
this.tabPage3.Size = new System.Drawing.Size(990, 606);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 操作日志 ";
this.tabPage3.UseVisualStyleBackColor = true;
......@@ -766,7 +766,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage8.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabPage8.Location = new System.Drawing.Point(4, 29);
this.tabPage8.Name = "tabPage8";
this.tabPage8.Size = new System.Drawing.Size(946, 606);
this.tabPage8.Size = new System.Drawing.Size(990, 606);
this.tabPage8.TabIndex = 4;
this.tabPage8.Text = " 库位调试 ";
this.tabPage8.UseVisualStyleBackColor = true;
......@@ -778,7 +778,7 @@ namespace OnlineStore.ACSingleStore
this.panel2.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(946, 606);
this.panel2.Size = new System.Drawing.Size(990, 606);
this.panel2.TabIndex = 0;
//
// uc_boxdebug1
......@@ -789,7 +789,7 @@ namespace OnlineStore.ACSingleStore
this.uc_boxdebug1.Location = new System.Drawing.Point(0, 0);
this.uc_boxdebug1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.uc_boxdebug1.Name = "uc_boxdebug1";
this.uc_boxdebug1.Size = new System.Drawing.Size(946, 606);
this.uc_boxdebug1.Size = new System.Drawing.Size(990, 606);
this.uc_boxdebug1.TabIndex = 0;
this.uc_boxdebug1.Load += new System.EventHandler(this.uc_boxdebug1_Load);
//
......@@ -799,7 +799,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(946, 606);
this.tabPage1.Size = new System.Drawing.Size(990, 606);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -816,7 +816,7 @@ namespace OnlineStore.ACSingleStore
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(3, 3);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(940, 600);
this.panel1.Size = new System.Drawing.Size(984, 600);
this.panel1.TabIndex = 273;
//
// groupBox7
......@@ -832,7 +832,7 @@ namespace OnlineStore.ACSingleStore
this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox7.Location = new System.Drawing.Point(318, 437);
this.groupBox7.Location = new System.Drawing.Point(424, 466);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(427, 117);
this.groupBox7.TabIndex = 272;
......@@ -1097,7 +1097,7 @@ namespace OnlineStore.ACSingleStore
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(3, 3);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(306, 551);
this.groupInout.Size = new System.Drawing.Size(398, 551);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -1107,7 +1107,7 @@ namespace OnlineStore.ACSingleStore
this.lblTempStr.AutoSize = true;
this.lblTempStr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTempStr.ForeColor = System.Drawing.Color.Black;
this.lblTempStr.Location = new System.Drawing.Point(6, 483);
this.lblTempStr.Location = new System.Drawing.Point(14, 436);
this.lblTempStr.Name = "lblTempStr";
this.lblTempStr.Size = new System.Drawing.Size(81, 20);
this.lblTempStr.TabIndex = 270;
......@@ -1118,9 +1118,9 @@ namespace OnlineStore.ACSingleStore
this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(157, 338);
this.btnSavePosition.Location = new System.Drawing.Point(256, 336);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(117, 38);
this.btnSavePosition.Size = new System.Drawing.Size(127, 38);
this.btnSavePosition.TabIndex = 217;
this.btnSavePosition.Text = "保存位置";
this.btnSavePosition.UseVisualStyleBackColor = false;
......@@ -1133,11 +1133,11 @@ namespace OnlineStore.ACSingleStore
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(192, 282);
this.txtComP1.Location = new System.Drawing.Point(282, 282);
this.txtComP1.MaxLength = 20;
this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP1.Size = new System.Drawing.Size(82, 23);
this.txtComP1.Size = new System.Drawing.Size(110, 23);
this.txtComP1.TabIndex = 214;
this.txtComP1.Text = "-12388";
//
......@@ -1148,11 +1148,11 @@ namespace OnlineStore.ACSingleStore
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(193, 243);
this.txtInOutP1.Location = new System.Drawing.Point(283, 243);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(82, 23);
this.txtInOutP1.Size = new System.Drawing.Size(110, 23);
this.txtInOutP1.TabIndex = 210;
this.txtInOutP1.Text = "3000";
//
......@@ -1163,11 +1163,11 @@ namespace OnlineStore.ACSingleStore
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(193, 203);
this.txtMiddleP1.Location = new System.Drawing.Point(283, 203);
this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP1.Size = new System.Drawing.Size(82, 23);
this.txtMiddleP1.Size = new System.Drawing.Size(110, 23);
this.txtMiddleP1.TabIndex = 208;
this.txtMiddleP1.Text = "-52388";
//
......@@ -1178,11 +1178,11 @@ namespace OnlineStore.ACSingleStore
this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP7.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP7.Location = new System.Drawing.Point(193, 123);
this.txtUpDownP7.Location = new System.Drawing.Point(283, 123);
this.txtUpDownP7.MaxLength = 20;
this.txtUpDownP7.Name = "txtUpDownP7";
this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP7.Size = new System.Drawing.Size(82, 23);
this.txtUpDownP7.Size = new System.Drawing.Size(110, 23);
this.txtUpDownP7.TabIndex = 204;
this.txtUpDownP7.Text = "-836025";
//
......@@ -1193,11 +1193,11 @@ namespace OnlineStore.ACSingleStore
this.txtUpDownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP8.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP8.Location = new System.Drawing.Point(193, 163);
this.txtUpDownP8.Location = new System.Drawing.Point(283, 163);
this.txtUpDownP8.MaxLength = 20;
this.txtUpDownP8.Name = "txtUpDownP8";
this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP8.Size = new System.Drawing.Size(82, 23);
this.txtUpDownP8.Size = new System.Drawing.Size(110, 23);
this.txtUpDownP8.TabIndex = 206;
this.txtUpDownP8.Text = "-816491";
//
......@@ -1208,11 +1208,11 @@ namespace OnlineStore.ACSingleStore
this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(193, 43);
this.txtUpDownP1.Location = new System.Drawing.Point(283, 43);
this.txtUpDownP1.MaxLength = 20;
this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP1.Size = new System.Drawing.Size(82, 23);
this.txtUpDownP1.Size = new System.Drawing.Size(110, 23);
this.txtUpDownP1.TabIndex = 200;
this.txtUpDownP1.Text = "-816491";
//
......@@ -1223,11 +1223,11 @@ namespace OnlineStore.ACSingleStore
this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP2.Location = new System.Drawing.Point(193, 83);
this.txtUpDownP2.Location = new System.Drawing.Point(283, 83);
this.txtUpDownP2.MaxLength = 20;
this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP2.Size = new System.Drawing.Size(82, 23);
this.txtUpDownP2.Size = new System.Drawing.Size(110, 23);
this.txtUpDownP2.TabIndex = 202;
this.txtUpDownP2.Text = "-836025";
//
......@@ -1243,7 +1243,7 @@ namespace OnlineStore.ACSingleStore
this.btnComP1.Location = new System.Drawing.Point(18, 277);
this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(171, 33);
this.btnComP1.Size = new System.Drawing.Size(246, 33);
this.btnComP1.TabIndex = 213;
this.btnComP1.Text = "压紧轴待机点P1：";
this.btnComP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1262,7 +1262,7 @@ namespace OnlineStore.ACSingleStore
this.btnInOutP1.Location = new System.Drawing.Point(19, 238);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(171, 33);
this.btnInOutP1.Size = new System.Drawing.Size(246, 33);
this.btnInOutP1.TabIndex = 209;
this.btnInOutP1.Text = "进出轴待机点P1：";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1281,7 +1281,7 @@ namespace OnlineStore.ACSingleStore
this.btnMiddleP1.Location = new System.Drawing.Point(19, 198);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(171, 33);
this.btnMiddleP1.Size = new System.Drawing.Size(246, 33);
this.btnMiddleP1.TabIndex = 207;
this.btnMiddleP1.Text = "旋转轴待机点P1：";
this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1300,7 +1300,7 @@ namespace OnlineStore.ACSingleStore
this.btnUpDownP7.Location = new System.Drawing.Point(19, 118);
this.btnUpDownP7.Name = "btnUpDownP7";
this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP7.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP7.Size = new System.Drawing.Size(246, 33);
this.btnUpDownP7.TabIndex = 203;
this.btnUpDownP7.Text = "升降轴入料缓冲点P7：";
this.btnUpDownP7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1319,7 +1319,7 @@ namespace OnlineStore.ACSingleStore
this.btnUpDownP8.Location = new System.Drawing.Point(19, 158);
this.btnUpDownP8.Name = "btnUpDownP8";
this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP8.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP8.Size = new System.Drawing.Size(246, 33);
this.btnUpDownP8.TabIndex = 205;
this.btnUpDownP8.Text = "升降轴出料缓冲点P8：";
this.btnUpDownP8.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1338,7 +1338,7 @@ namespace OnlineStore.ACSingleStore
this.btnUpDownP1.Location = new System.Drawing.Point(19, 38);
this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP1.Size = new System.Drawing.Size(246, 33);
this.btnUpDownP1.TabIndex = 199;
this.btnUpDownP1.Text = "升降轴入料点P1：";
this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1357,7 +1357,7 @@ namespace OnlineStore.ACSingleStore
this.btnUpDownP2.Location = new System.Drawing.Point(19, 78);
this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(171, 33);
this.btnUpDownP2.Size = new System.Drawing.Size(246, 33);
this.btnUpDownP2.TabIndex = 201;
this.btnUpDownP2.Text = "升降轴出料前点P2：";
this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -1366,9 +1366,9 @@ namespace OnlineStore.ACSingleStore
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(315, 1);
this.axisMoveControl1.Location = new System.Drawing.Point(424, 3);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(557, 397);
this.axisMoveControl1.Size = new System.Drawing.Size(557, 424);
this.axisMoveControl1.TabIndex = 0;
//
// tabPage9
......@@ -1376,7 +1376,7 @@ namespace OnlineStore.ACSingleStore
this.tabPage9.Location = new System.Drawing.Point(4, 29);
this.tabPage9.Name = "tabPage9";
this.tabPage9.Padding = new System.Windows.Forms.Padding(3);
this.tabPage9.Size = new System.Drawing.Size(946, 606);
this.tabPage9.Size = new System.Drawing.Size(990, 606);
this.tabPage9.TabIndex = 5;
this.tabPage9.Text = " IO调试 ";
this.tabPage9.UseVisualStyleBackColor = true;
......@@ -1625,7 +1625,7 @@ namespace OnlineStore.ACSingleStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(964, 729);
this.ClientSize = new System.Drawing.Size(1008, 729);
this.Controls.Add(this.tabControl2);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.menuStrip1);
......
source/ACSingleStore/Properties/AssemblyInfo.cs
......@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 413b0ee4261e11a49b88fd1c49b2cd7507d75209")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 0399105cb374afe8fabf1f8f43f3d8f5ff67b31e")]
[assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
source/ACSingleStore/useControl/AxisMoveControl.Designer.cs
......@@ -32,7 +32,7 @@
this.groupAxis = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblAlarmcode = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.label54 = new System.Windows.Forms.Label();
this.lblhomeSts = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.lblAxEncAcc = new System.Windows.Forms.Label();
......@@ -119,17 +119,22 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(4, 3);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(692, 395);
this.groupAxis.Size = new System.Drawing.Size(692, 419);
this.groupAxis.TabIndex = 218;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
//
// groupBox2
//
this.groupBox2.Controls.Add(this.label54);
this.groupBox2.Controls.Add(this.label50);
this.groupBox2.Controls.Add(this.label53);
this.groupBox2.Controls.Add(this.label56);
this.groupBox2.Controls.Add(this.label55);
this.groupBox2.Controls.Add(this.label52);
this.groupBox2.Controls.Add(this.lblAlarmcode);
this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.lblhomeSts);
this.groupBox2.Controls.Add(this.label2);
this.groupBox2.Controls.Add(this.lblhomeSts);
this.groupBox2.Controls.Add(this.lblAxEncAcc);
this.groupBox2.Controls.Add(this.lblINP);
this.groupBox2.Controls.Add(this.lblBUSY);
......@@ -140,21 +145,16 @@
this.groupBox2.Controls.Add(this.lblEMG);
this.groupBox2.Controls.Add(this.lblWARN);
this.groupBox2.Controls.Add(this.lblALM);
this.groupBox2.Controls.Add(this.label53);
this.groupBox2.Controls.Add(this.label56);
this.groupBox2.Controls.Add(this.label55);
this.groupBox2.Controls.Add(this.label52);
this.groupBox2.Controls.Add(this.lblAxEncVel);
this.groupBox2.Controls.Add(this.lblAxPrfVel);
this.groupBox2.Controls.Add(this.lblAxEncPos);
this.groupBox2.Controls.Add(this.lblAxPrfPos);
this.groupBox2.Controls.Add(this.lblAxisPrfMode);
this.groupBox2.Controls.Add(this.label50);
this.groupBox2.Location = new System.Drawing.Point(7, 270);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
this.groupBox2.Size = new System.Drawing.Size(540, 118);
this.groupBox2.Size = new System.Drawing.Size(540, 144);
this.groupBox2.TabIndex = 303;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "轴状态监控";
......@@ -170,20 +170,20 @@
this.lblAlarmcode.Text = "错误码:160";
this.lblAlarmcode.Visible = false;
//
// label4
// label54
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(267, 90);
this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 17);
this.label4.TabIndex = 18;
this.label4.Text = "回原状态:";
this.label54.AutoSize = true;
this.label54.Location = new System.Drawing.Point(267, 104);
this.label54.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label54.Name = "label54";
this.label54.Size = new System.Drawing.Size(59, 17);
this.label54.TabIndex = 18;
this.label54.Text = "回原状态:";
//
// lblhomeSts
//
this.lblhomeSts.AutoSize = true;
this.lblhomeSts.Location = new System.Drawing.Point(332, 90);
this.lblhomeSts.Location = new System.Drawing.Point(275, 121);
this.lblhomeSts.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblhomeSts.Name = "lblhomeSts";
this.lblhomeSts.Size = new System.Drawing.Size(17, 17);
......@@ -193,7 +193,7 @@
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(433, 90);
this.label2.Location = new System.Drawing.Point(433, 104);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 17);
......@@ -204,7 +204,7 @@
// lblAxEncAcc
//
this.lblAxEncAcc.AutoSize = true;
this.lblAxEncAcc.Location = new System.Drawing.Point(510, 90);
this.lblAxEncAcc.Location = new System.Drawing.Point(442, 121);
this.lblAxEncAcc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncAcc.Name = "lblAxEncAcc";
this.lblAxEncAcc.Size = new System.Drawing.Size(17, 17);
......@@ -305,7 +305,7 @@
// label53
//
this.label53.AutoSize = true;
this.label53.Location = new System.Drawing.Point(134, 90);
this.label53.Location = new System.Drawing.Point(134, 104);
this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(59, 17);
......@@ -315,7 +315,7 @@
// label56
//
this.label56.AutoSize = true;
this.label56.Location = new System.Drawing.Point(10, 90);
this.label56.Location = new System.Drawing.Point(10, 104);
this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label56.Name = "label56";
this.label56.Size = new System.Drawing.Size(59, 17);
......@@ -345,7 +345,7 @@
// lblAxEncVel
//
this.lblAxEncVel.AutoSize = true;
this.lblAxEncVel.Location = new System.Drawing.Point(73, 90);
this.lblAxEncVel.Location = new System.Drawing.Point(16, 121);
this.lblAxEncVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncVel.Name = "lblAxEncVel";
this.lblAxEncVel.Size = new System.Drawing.Size(17, 17);
......@@ -355,7 +355,7 @@
// lblAxPrfVel
//
this.lblAxPrfVel.AutoSize = true;
this.lblAxPrfVel.Location = new System.Drawing.Point(199, 90);
this.lblAxPrfVel.Location = new System.Drawing.Point(142, 121);
this.lblAxPrfVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfVel.Name = "lblAxPrfVel";
this.lblAxPrfVel.Size = new System.Drawing.Size(17, 17);
......@@ -365,7 +365,7 @@
// lblAxEncPos
//
this.lblAxEncPos.AutoSize = true;
this.lblAxEncPos.Location = new System.Drawing.Point(73, 65);
this.lblAxEncPos.Location = new System.Drawing.Point(16, 82);
this.lblAxEncPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncPos.Name = "lblAxEncPos";
this.lblAxEncPos.Size = new System.Drawing.Size(17, 17);
......@@ -375,7 +375,7 @@
// lblAxPrfPos
//
this.lblAxPrfPos.AutoSize = true;
this.lblAxPrfPos.Location = new System.Drawing.Point(199, 65);
this.lblAxPrfPos.Location = new System.Drawing.Point(142, 82);
this.lblAxPrfPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfPos.Name = "lblAxPrfPos";
this.lblAxPrfPos.Size = new System.Drawing.Size(17, 17);
......@@ -385,11 +385,12 @@
// lblAxisPrfMode
//
this.lblAxisPrfMode.AutoSize = true;
this.lblAxisPrfMode.Location = new System.Drawing.Point(332, 65);
this.lblAxisPrfMode.Location = new System.Drawing.Point(275, 82);
this.lblAxisPrfMode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxisPrfMode.Name = "lblAxisPrfMode";
this.lblAxisPrfMode.Size = new System.Drawing.Size(17, 17);
this.lblAxisPrfMode.TabIndex = 1;
this.lblAxisPrfMode.Tag = "not";
this.lblAxisPrfMode.Text = "...";
//
// label50
......@@ -746,7 +747,7 @@
//
// label_speed
//
this.label_speed.Location = new System.Drawing.Point(3, 217);
this.label_speed.Location = new System.Drawing.Point(-1, 218);
this.label_speed.Name = "label_speed";
this.label_speed.Size = new System.Drawing.Size(100, 17);
this.label_speed.TabIndex = 329;
......@@ -954,7 +955,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(699, 402);
this.Size = new System.Drawing.Size(699, 426);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox2.ResumeLayout(false);
......@@ -1015,7 +1016,7 @@
private System.Windows.Forms.ComboBox comjSpeed;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label label54;
private System.Windows.Forms.Label lblhomeSts;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label lblAxEncAcc;
......
source/ACSingleStore/useControl/uc_boxdebug.Designer.cs
......@@ -31,6 +31,7 @@ namespace OnlineStore.ACSingleStore.useControl
{
this.components = new System.ComponentModel.Container();
this.groupInout = new System.Windows.Forms.GroupBox();
this.label_verify = new System.Windows.Forms.Label();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.checkBox_Double_Alternate = new System.Windows.Forms.CheckBox();
this.label_size = new System.Windows.Forms.Label();
......@@ -62,7 +63,6 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.label_verify = new System.Windows.Forms.Label();
this.groupInout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
......@@ -99,15 +99,24 @@ namespace OnlineStore.ACSingleStore.useControl
this.groupInout.Controls.Add(this.btnUpDownP6);
this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Location = new System.Drawing.Point(3, 394);
this.groupInout.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupInout.Location = new System.Drawing.Point(2, 315);
this.groupInout.Name = "groupInout";
this.groupInout.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.groupInout.Size = new System.Drawing.Size(1039, 224);
this.groupInout.Size = new System.Drawing.Size(891, 179);
this.groupInout.TabIndex = 101;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
//
// label_verify
//
this.label_verify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label_verify.AutoSize = true;
this.label_verify.Location = new System.Drawing.Point(851, 0);
this.label_verify.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label_verify.Name = "label_verify";
this.label_verify.Size = new System.Drawing.Size(41, 12);
this.label_verify.TabIndex = 227;
this.label_verify.Text = "label1";
//
// btnInOutP1
//
this.btnInOutP1.AutoSize = true;
......@@ -117,11 +126,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Black;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(696, 182);
this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP1.Location = new System.Drawing.Point(589, 146);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(177, 36);
this.btnInOutP1.Size = new System.Drawing.Size(178, 29);
this.btnInOutP1.TabIndex = 226;
this.btnInOutP1.Text = "进出轴回待机点P1";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -131,10 +139,9 @@ namespace OnlineStore.ACSingleStore.useControl
// checkBox_Double_Alternate
//
this.checkBox_Double_Alternate.AutoSize = true;
this.checkBox_Double_Alternate.Location = new System.Drawing.Point(129, 192);
this.checkBox_Double_Alternate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.checkBox_Double_Alternate.Location = new System.Drawing.Point(97, 154);
this.checkBox_Double_Alternate.Name = "checkBox_Double_Alternate";
this.checkBox_Double_Alternate.Size = new System.Drawing.Size(86, 19);
this.checkBox_Double_Alternate.Size = new System.Drawing.Size(72, 16);
this.checkBox_Double_Alternate.TabIndex = 225;
this.checkBox_Double_Alternate.Text = "双盘测试";
this.checkBox_Double_Alternate.UseVisualStyleBackColor = true;
......@@ -142,26 +149,23 @@ namespace OnlineStore.ACSingleStore.useControl
//
// label_size
//
this.label_size.Location = new System.Drawing.Point(356, 0);
this.label_size.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label_size.Location = new System.Drawing.Point(267, 0);
this.label_size.Name = "label_size";
this.label_size.Size = new System.Drawing.Size(76, 12);
this.label_size.Size = new System.Drawing.Size(57, 10);
this.label_size.TabIndex = 224;
//
// cmbPosition
//
this.cmbPosition.Location = new System.Drawing.Point(435, 0);
this.cmbPosition.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.cmbPosition.Location = new System.Drawing.Point(326, 0);
this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(139, 14);
this.cmbPosition.Size = new System.Drawing.Size(104, 11);
this.cmbPosition.TabIndex = 224;
//
// txtJiange
//
this.txtJiange.Location = new System.Drawing.Point(279, 109);
this.txtJiange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtJiange.Location = new System.Drawing.Point(209, 87);
this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(48, 25);
this.txtJiange.Size = new System.Drawing.Size(37, 21);
this.txtJiange.TabIndex = 221;
this.txtJiange.Text = "1";
//
......@@ -170,8 +174,7 @@ namespace OnlineStore.ACSingleStore.useControl
this.lblMsg.AutoSize = true;
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Green;
this.lblMsg.Location = new System.Drawing.Point(8, 24);
this.lblMsg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblMsg.Location = new System.Drawing.Point(6, 19);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(135, 20);
this.lblMsg.TabIndex = 223;
......@@ -182,10 +185,9 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(896, 182);
this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnSavePosition.Location = new System.Drawing.Point(790, 146);
this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(127, 36);
this.btnSavePosition.Size = new System.Drawing.Size(95, 29);
this.btnSavePosition.TabIndex = 217;
this.btnSavePosition.Text = "保存位置";
this.btnSavePosition.UseVisualStyleBackColor = false;
......@@ -196,10 +198,9 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control;
this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(129, 145);
this.btnStartAuTo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnStartAuTo.Location = new System.Drawing.Point(97, 116);
this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(199, 40);
this.btnStartAuTo.Size = new System.Drawing.Size(149, 32);
this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "启动自动模式";
this.btnStartAuTo.UseVisualStyleBackColor = false;
......@@ -208,10 +209,9 @@ namespace OnlineStore.ACSingleStore.useControl
// label9
//
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.Location = new System.Drawing.Point(68, 112);
this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label9.Location = new System.Drawing.Point(51, 90);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(203, 21);
this.label9.Size = new System.Drawing.Size(152, 17);
this.label9.TabIndex = 220;
this.label9.Text = "入库间隔仓位：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -223,12 +223,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(919, 24);
this.txtInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInOutP2.Location = new System.Drawing.Point(807, 19);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(103, 23);
this.txtInOutP2.Size = new System.Drawing.Size(78, 23);
this.txtInOutP2.TabIndex = 212;
this.txtInOutP2.Text = "-1";
//
......@@ -239,12 +238,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(920, 146);
this.txtComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP3.Location = new System.Drawing.Point(808, 117);
this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP3.Size = new System.Drawing.Size(103, 23);
this.txtComP3.Size = new System.Drawing.Size(78, 23);
this.txtComP3.TabIndex = 198;
this.txtComP3.Text = "-1";
//
......@@ -255,12 +253,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(919, 106);
this.txtComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtComP2.Location = new System.Drawing.Point(807, 85);
this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtComP2.Size = new System.Drawing.Size(103, 23);
this.txtComP2.Size = new System.Drawing.Size(78, 23);
this.txtComP2.TabIndex = 196;
this.txtComP2.Text = "-1";
//
......@@ -271,12 +268,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(919, 65);
this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtInOutP3.Location = new System.Drawing.Point(807, 52);
this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(103, 23);
this.txtInOutP3.Size = new System.Drawing.Size(78, 23);
this.txtInOutP3.TabIndex = 194;
this.txtInOutP3.Text = "-1";
//
......@@ -287,12 +283,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(583, 186);
this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtMiddleP2.Location = new System.Drawing.Point(496, 149);
this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP2.Size = new System.Drawing.Size(103, 23);
this.txtMiddleP2.Size = new System.Drawing.Size(78, 23);
this.txtMiddleP2.TabIndex = 192;
this.txtMiddleP2.Text = "-1";
//
......@@ -303,12 +298,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(583, 64);
this.txtUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP5.Location = new System.Drawing.Point(496, 51);
this.txtUpDownP5.MaxLength = 20;
this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP5.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP5.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP5.TabIndex = 188;
this.txtUpDownP5.Text = "-1";
//
......@@ -319,12 +313,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(583, 145);
this.txtUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP6.Location = new System.Drawing.Point(496, 116);
this.txtUpDownP6.MaxLength = 20;
this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP6.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP6.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP6.TabIndex = 190;
this.txtUpDownP6.Text = "-1";
//
......@@ -335,12 +328,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(583, 24);
this.txtUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP3.Location = new System.Drawing.Point(496, 19);
this.txtUpDownP3.MaxLength = 20;
this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP3.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP3.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP3.TabIndex = 162;
this.txtUpDownP3.Text = "-1";
//
......@@ -349,10 +341,9 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInStore.BackColor = System.Drawing.SystemColors.Control;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(8, 55);
this.btnInStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInStore.Location = new System.Drawing.Point(6, 44);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(156, 40);
this.btnInStore.Size = new System.Drawing.Size(117, 32);
this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试";
this.btnInStore.UseVisualStyleBackColor = false;
......@@ -363,10 +354,9 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnOutStore.BackColor = System.Drawing.SystemColors.Control;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(172, 55);
this.btnOutStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnOutStore.Location = new System.Drawing.Point(129, 44);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(156, 40);
this.btnOutStore.Size = new System.Drawing.Size(117, 32);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出库测试";
this.btnOutStore.UseVisualStyleBackColor = false;
......@@ -379,12 +369,11 @@ namespace OnlineStore.ACSingleStore.useControl
this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(583, 105);
this.txtUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txtUpDownP4.Location = new System.Drawing.Point(496, 84);
this.txtUpDownP4.MaxLength = 20;
this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP4.Size = new System.Drawing.Size(103, 23);
this.txtUpDownP4.Size = new System.Drawing.Size(78, 23);
this.txtUpDownP4.TabIndex = 166;
this.txtUpDownP4.Text = "-1";
//
......@@ -397,11 +386,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(696, 18);
this.btnInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP2.Location = new System.Drawing.Point(589, 14);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(215, 36);
this.btnInOutP2.Size = new System.Drawing.Size(212, 29);
this.btnInOutP2.TabIndex = 211;
this.btnInOutP2.Text = "进出轴取料点P2：";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -416,11 +404,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(696, 141);
this.btnComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP3.Location = new System.Drawing.Point(589, 113);
this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(215, 36);
this.btnComP3.Size = new System.Drawing.Size(212, 29);
this.btnComP3.TabIndex = 197;
this.btnComP3.Text = "压紧轴压紧前点P3：";
this.btnComP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -435,11 +422,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(696, 100);
this.btnComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnComP2.Location = new System.Drawing.Point(589, 80);
this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(215, 36);
this.btnComP2.Size = new System.Drawing.Size(212, 29);
this.btnComP2.TabIndex = 195;
this.btnComP2.Text = "压紧轴压紧点P2：";
this.btnComP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -454,11 +440,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(696, 59);
this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnInOutP3.Location = new System.Drawing.Point(589, 47);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(215, 36);
this.btnInOutP3.Size = new System.Drawing.Size(212, 29);
this.btnInOutP3.TabIndex = 193;
this.btnInOutP3.Text = "进出轴取料点P3：";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -473,11 +458,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(359, 182);
this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnMiddleP2.Location = new System.Drawing.Point(269, 146);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(215, 36);
this.btnMiddleP2.Size = new System.Drawing.Size(221, 29);
this.btnMiddleP2.TabIndex = 191;
this.btnMiddleP2.Text = "旋转轴库位点P2：";
this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -492,11 +476,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(359, 59);
this.btnUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP5.Location = new System.Drawing.Point(269, 47);
this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP5.Size = new System.Drawing.Size(221, 29);
this.btnUpDownP5.TabIndex = 187;
this.btnUpDownP5.Text = "升降轴出料前点P5：";
this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -511,11 +494,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(359, 141);
this.btnUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP6.Location = new System.Drawing.Point(269, 113);
this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP6.Size = new System.Drawing.Size(221, 29);
this.btnUpDownP6.TabIndex = 189;
this.btnUpDownP6.Text = "升降轴出料缓冲点P6：";
this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -530,11 +512,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(359, 18);
this.btnUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP3.Location = new System.Drawing.Point(269, 14);
this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP3.Size = new System.Drawing.Size(221, 29);
this.btnUpDownP3.TabIndex = 161;
this.btnUpDownP3.Text = "升降轴入料前点P3：";
this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -549,11 +530,10 @@ namespace OnlineStore.ACSingleStore.useControl
this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(359, 100);
this.btnUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btnUpDownP4.Location = new System.Drawing.Point(269, 80);
this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(215, 36);
this.btnUpDownP4.Size = new System.Drawing.Size(221, 29);
this.btnUpDownP4.TabIndex = 165;
this.btnUpDownP4.Text = "升降轴入料缓冲点P4：";
this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -577,7 +557,6 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.EditMode = System.Windows.Forms.DataGridViewEditMode.EditProgrammatically;
this.dataGridView1.EnableHeadersVisualStyles = false;
this.dataGridView1.Location = new System.Drawing.Point(0, 0);
this.dataGridView1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.dataGridView1.MultiSelect = false;
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.None;
......@@ -589,30 +568,19 @@ namespace OnlineStore.ACSingleStore.useControl
this.dataGridView1.ShowCellToolTips = false;
this.dataGridView1.ShowEditingIcon = false;
this.dataGridView1.ShowRowErrors = false;
this.dataGridView1.Size = new System.Drawing.Size(1047, 391);
this.dataGridView1.Size = new System.Drawing.Size(906, 313);
this.dataGridView1.TabIndex = 103;
this.dataGridView1.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellContentClick);
this.dataGridView1.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dataGridView1_CellMouseDown);
//
// label_verify
//
this.label_verify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label_verify.AutoSize = true;
this.label_verify.Location = new System.Drawing.Point(985, 0);
this.label_verify.Name = "label_verify";
this.label_verify.Size = new System.Drawing.Size(55, 15);
this.label_verify.TabIndex = 227;
this.label_verify.Text = "label1";
//
// uc_boxdebug
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.groupInout);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "uc_boxdebug";
this.Size = new System.Drawing.Size(1047, 662);
this.Size = new System.Drawing.Size(906, 530);
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
......
source/ACSingleStore/useControl/uc_boxdebug.cs
......@@ -233,7 +233,7 @@ namespace OnlineStore.ACSingleStore.useControl
//store.PositionNumList.Reverse();
string[] posstr = store.PositionNumList[store.PositionNumList.Count-1].Split('_');
int colcount = int.Parse(Regex.Replace(posstr[1], @"[^\d]*", "")) + 1;
int colcount = int.Parse(Regex.Replace(posstr[1], @"[^\d]*", "")[0].ToString()) + 1;
for (int i = 0; i < colcount; i++)
{
dataGridView1.Columns.Add("Col" + i + "_A", "Col" + i + "_A");
......@@ -257,10 +257,12 @@ namespace OnlineStore.ACSingleStore.useControl
if (posname.StartsWith("fix"))
continue;
string[] _posstr = posname.Split('_');
int col = int.Parse(Regex.Replace(_posstr[1], @"[^\d]*", ""));
int col = int.Parse(Regex.Replace(_posstr[1], @"[^\d]*", "")[0].ToString());
string ab = "A";
if (_posstr[2].Length>1)
ab= _posstr[2][1].ToString();
else if (_posstr[1].Length > 1)
ab = _posstr[1][1].ToString();
if (ab != "A" && ab != "B")
{
if (ab == "1")
......
source/DeviceLibrary/DauxiKS107Controller.cs
......@@ -10,7 +10,7 @@ using System.Threading.Tasks;
public class DauxiKS107Controller
{
private static int baudRate =9600;//波特率
private static int baudRate = 9600;//波特率
private static Parity parity = Parity.None;//校验位
private static int dataBits = 8;//数据位
private static StopBits stopBits = StopBits.One; //停止位
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -36,9 +36,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Asa.Camera.VisionLib, Version=1.3.7927.28975, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="Asa.Camera.VisionLib, Version=1.3.8398.28384, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\ACSingleStore\bin\Debug\Asa.Camera.VisionLib.dll</HintPath>
<HintPath>..\..\..\Camera\CameraVisionLibSetting\bin\Debug\Asa.Camera.VisionLib.dll</HintPath>
</Reference>
<Reference Include="Asa.IOModule.AIOBOX">
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
......@@ -52,7 +52,7 @@ namespace OnlineStore.DeviceLibrary
private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
private int OutStoreWaitSeconds = ConfigAppSettings.GetIntValue(Setting_Init.OutStoreWaitSeconds);
public static DauxiKS107Controller Ultrasonic1 = new DauxiKS107Controller(300);
public static DauxiKS107Controller Ultrasonic1 = null;
public AC_SA_BoxBean(AC_SA_Config config)
{
......@@ -115,11 +115,14 @@ namespace OnlineStore.DeviceLibrary
return;
}
LogUtil.info(StoreName + "Ultrasonic1_Port:"+ Config.Ultrasonic1_Port);
if (!string.IsNullOrWhiteSpace(Config.Ultrasonic1_Port) && !Ultrasonic1.OpenPort(Config.Ultrasonic1_Port, out string errmsg)){
if (!string.IsNullOrWhiteSpace(Config.Ultrasonic1_Port)){
Ultrasonic1 = new DauxiKS107Controller(300);
if (!Ultrasonic1.OpenPort(Config.Ultrasonic1_Port, out string errmsg)) {
SetWarnMsg(ResourceControl.CustAlarm, errmsg);
LogUtil.error(StoreName + errmsg);
return;
}
}
......@@ -567,7 +570,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.BOX_H_OtherAxisBack_04);
LogUtil.info(LOGGER, StoreName + " 舱门口无盘, 执行往舱门口放盘");
}
else
else if (StoreMove.IsTimeOut(out _, 3))
{
SetWarnMsg("舱门口有盘无法完成回原,请取走");
//StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
......@@ -589,7 +592,7 @@ namespace OnlineStore.DeviceLibrary
var InOutAxis_DoorPosition_P2 = CSVPositionReader<ACStorePosition>.allPositionMap.First().Value.InOutAxis_DoorPosition_P2;
ACAxisMove(Config.InOut_Axis, InOutAxis_DoorPosition_P2, Config.InOutAxis_P2_Speed);
}
else
else if (StoreMove.IsTimeOut(out _, 5))
{
SetWarnMsg("舱门口有盘无法完成回原,请取走");
//StoreMove.NextMoveStep(StoreMoveStep.BOX_H_MiddleAxisToP1);
......@@ -1789,6 +1792,11 @@ namespace OnlineStore.DeviceLibrary
{
if (CodeManager.IsServerAccess())
return 0;
if (Ultrasonic1!=null) {
return CalHeight(ConvertAI(StoreManager.Store.GetADIO(1), Config.AIDI1_DefaultPosition));
}
if (Config.Default_TrayWidth.Equals(Width_7))
{
return GetSmallHeight();
......@@ -1918,7 +1926,7 @@ namespace OnlineStore.DeviceLibrary
public static double ConvertAI(double aiValue, double defaultValue)
{
double xishu = (double)StoreManager.Config.AI_ConvertPosition;
double result = Math.Round((aiValue - defaultValue) / xishu, 2);
double result = Math.Round(Math.Abs(aiValue - defaultValue) / xishu, 2);
return result;
}
#endregion
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_ADIO.cs
using OnlineStore.LoadCSVLibrary;
using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary;
using System;
using System.Collections.Generic;
using System.Linq;
......@@ -13,31 +14,76 @@ namespace OnlineStore.DeviceLibrary
switch (index)
{
case 1:
if (Ultrasonic1.IsRunning)
if (Ultrasonic1!= null)
return Ultrasonic1.Distance;
else
if (StoreManager.Config.AIDI1_Addr>=0)
return IOManager.GetADIOValue(StoreManager.Config.AIDI1_Addr);
break;
case 2:
if (StoreManager.Config.AIDI2_Addr >= 0)
return IOManager.GetADIOValue(StoreManager.Config.AIDI2_Addr);
break;
case 3:
if (StoreManager.Config.AIDI3_Addr >= 0)
return IOManager.GetADIOValue(StoreManager.Config.AIDI3_Addr);
break;
case 4:
if (StoreManager.Config.AIDI4_Addr >= 0)
return IOManager.GetADIOValue(StoreManager.Config.AIDI4_Addr);
break;
default:
return -1;
}
return -1;
}
DebounceFilter TrayCheck_DoorFilter = new DebounceFilter(10);
IO_VALUE TrayCheck_Door
{
get
{
if (Ultrasonic1.IsRunning)
return Ultrasonic1.Distance > 5 ? IO_VALUE.HIGH : IO_VALUE.LOW;
if (Ultrasonic1 != null)
{
var xx = Math.Abs(Ultrasonic1.Distance - Config.AIDI1_DefaultPosition);
var vv = xx >= 5 ? IO_VALUE.HIGH : IO_VALUE.LOW;
var Filter = TrayCheck_DoorFilter.Filter(vv);
LogUtil.info("Ultrasonic1.Distance:" + Ultrasonic1.Distance + "," + xx + "," + vv + ",Filter=" + Filter);
return Filter;
}
else
return IOManager.IOValue(IO_Type.TrayCheck_Door);
}
}
}
public class DebounceFilter
{
private IO_VALUE _lastValue;
private int _counter;
private readonly int _threshold;
public DebounceFilter(int threshold)
{
_threshold = threshold;
}
public IO_VALUE Filter(IO_VALUE value)
{
if (value == _lastValue)
{
_counter = 0;
return value;
}
_counter++;
if (_counter >= _threshold)
{
_lastValue = value;
_counter = 0;
return value;
}
return _lastValue;
}
}
}
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -404,21 +404,20 @@ namespace OnlineStore.DeviceLibrary
{
NeedCheckSafetyLight = 0;
HIKCamera.Current.CameraGrabOne(HIKCamera.Current.GetFixtureStateFilename(StoreMove.MoveParam, StoreMove.MoveType, FixtureState.DoorIn));
if (TrayCheck_Door.Equals(IO_VALUE.LOW))
{
InStoreLog("入库：SI_06 未检测到料盘,任务取消 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_14_CheckTray);
ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P1, Config.InOutAxis_P1_Speed);
HttpHelper.cancelPutInTask(Name, StoreMove.MoveParam.WareNumber);
}
else
if (TrayCheck_Door.Equals(IO_VALUE.HIGH))
{
InStoreLog("入库：SI_06 拿物品，压紧轴至P2(压紧点)) 升降轴至P7(进料口取料缓冲点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_06_DoorWarToDevice);
ComMoveToPosition(moveP.ComPress_P2, Config.CompAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P7, Config.UpDownAxis_P7_Speed);
}
else if (StoreMove.IsTimeOut(out _, 5))
{
InStoreLog("入库：SI_06 未检测到料盘,任务取消 ");
StoreMove.NextMoveStep(StoreMoveStep.SI_14_CheckTray);
ACAxisMove(Config.InOut_Axis, StoreMove.MoveParam.MoveP.InOut_P1, Config.InOutAxis_P1_Speed);
HttpHelper.cancelPutInTask(Name, StoreMove.MoveParam.WareNumber);
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_06_DoorWarToDevice)
......@@ -838,7 +837,7 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.OutStorEnd;
SendLineStatus();
}
else
else if (StoreMove.IsTimeOut(out _,5))
{
lastPosIdStatus = StoreStatus.OutStoreError;
......@@ -934,7 +933,7 @@ namespace OnlineStore.DeviceLibrary
private void SO_091_WaitNoTray()
{
if (IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
TrayCheck_Door.Equals(IO_VALUE.LOW))
{
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
......@@ -943,7 +942,7 @@ namespace OnlineStore.DeviceLibrary
OpenDoor();
}
else if (StoreMove.IsTimeOut(out double timeout)) {
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
if (TrayCheck_Door.Equals(IO_VALUE.HIGH))
{
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.TrayCheck_Door.ToString() + "=LOW", timeout.ToString("f1")+"s"); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
......@@ -1040,7 +1039,8 @@ namespace OnlineStore.DeviceLibrary
/// PosId, InOut,isSuccess
/// </summary>
public event Action<string,StoreMoveType,bool> InOutEndProcessEvent;
private string AutoOut { get => ResourceControl.GetString("自动出库："); }
private string AutoIn { get => ResourceControl.GetString("自动入库："); }
public bool Alternate = true;
private void InOutEndProcess(StoreMoveType storeMoveType,string current_posid)
{
......@@ -1088,13 +1088,13 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.info(LOGGER, StoreName + $"自动进入下一个出库：{autoPositionIndex} posid=" + posid + ",当时已经出入库" + CurrInOutACount + "次，需要重置BOX，先把出库信息存入排队列表中");
Reset(false);
autoMsg = "自动出库：" + posid;
autoMsg = AutoOut + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "", posid));
}
else
{
LogUtil.info(LOGGER, StoreName + $"自动进入下一个出库：{autoPositionIndex} posid=" + posid);
autoMsg = "自动出库：" + posid;
autoMsg = AutoOut + posid;
StartOutStoreMove(new InOutStoreParam("", posid));
}
}
......@@ -1124,13 +1124,13 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.info(LOGGER, StoreName + $"自动进入下一个入库：{autoPositionIndex} posid=" + posid + ",当时已经出入库" + CurrInOutACount + "次，需要重置BOX，先把入库信息存入排队列表中");
Reset(false);
autoMsg = "自动入库：" + posid;
autoMsg = AutoIn + posid;
AddWaitOutInfo(new FixtureCodeInfo(0, "AAAA", posid));
}
else
{
LogUtil.info(LOGGER, StoreName + $"自动进入下一个入库：{autoPositionIndex} posid=" + posid);
autoMsg = "自动入库：" + posid;
autoMsg = AutoIn + posid;
StartInStoreMove(new InOutStoreParam("AAAA", posid));
}
}
......
source/DeviceLibrary/store/Camera.cs
......@@ -11,6 +11,8 @@ using System.Text;
using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using System.Xml.Linq;
namespace OnlineStore
{
......@@ -53,6 +55,8 @@ namespace OnlineStore
LogUtil.error(Name + "加载监控相机配置文件失败:"+ e.ToString());
return;
}
PictureBox p1 = new PictureBox();
camera.PreviewImage(DeviceName, p1.Handle);
camera.Open(DeviceName);
Bitmap bmp = camera.GetImage(DeviceName);
if (bmp == null)
......@@ -125,6 +129,7 @@ namespace OnlineStore
{
LogUtil.error(Name + e.ToString());
}
LogUtil.info(Name + " 保存完毕:" + filename);
}
public string GetFixtureStateFilename(InOutStoreParam inOutParam,StoreMoveType storeMoveType, FixtureState fixtureState)
{
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
......@@ -558,7 +558,8 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("MiddleAxis_Reverse_Offset")]
public int MiddleAxis_Reverse_Offset { get; set; }
/// <summary>
/// PRO 超声波测距1端口 Ultrasonic1_Port
/// PRO
/// 测距1端口 Ultrasonic1_Port
/// </summary>
[ConfigProAttribute("Ultrasonic1_Port")]
public string Ultrasonic1_Port { get; set; }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!