Skip to content

孙克 / ACSingleStore

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

界面调整1024X768

1 个父辈 1a935e7c
内嵌 并排
正在显示 11 个修改的文件 包含 418 行增加 和 362 行删除
SO852.txt 0 → 100644
分辨率改为1024X768
source/ACSingleStore/FrmBase.cs
......@@ -44,7 +44,7 @@ namespace OnlineStore.ACSingleStore
}
return str;
}
internal static string GetCodeNum(string codeName = "RC-SISO-ACSingleStore")
internal static string GetCodeNum(string codeName = "SO852-ACSingleStore")
{
byte[] byteArray = System.Text.Encoding.ASCII.GetBytes(codeName);
string result = "";
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -31,19 +31,13 @@
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.chbIsDebug = new System.Windows.Forms.CheckBox();
this.chbBuzzer = new System.Windows.Forms.CheckBox();
this.btnStoreExit = new System.Windows.Forms.Button();
this.btnStoreHome = new System.Windows.Forms.Button();
this.chbAuto = new System.Windows.Forms.CheckBox();
this.btnSotreReset = new System.Windows.Forms.Button();
this.btnStoreStop = new System.Windows.Forms.Button();
this.btnStoreStart = new System.Windows.Forms.Button();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.btnUpdown = new System.Windows.Forms.Button();
this.btnDebug = new System.Windows.Forms.Button();
this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button();
this.btnScanCode = new System.Windows.Forms.Button();
this.btnAxisP = new System.Windows.Forms.Button();
this.btnIO = new System.Windows.Forms.Button();
......@@ -51,22 +45,30 @@
this.btnOpenAutoInOut = new System.Windows.Forms.Button();
this.btnLan = new System.Windows.Forms.Button();
this.button4 = new System.Windows.Forms.Button();
this.btnUpdown = new System.Windows.Forms.Button();
this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button();
this.chbIsDebug = new System.Windows.Forms.CheckBox();
this.chbBuzzer = new System.Windows.Forms.CheckBox();
this.chbAuto = new System.Windows.Forms.CheckBox();
this.btnLogDebug = new System.Windows.Forms.Button();
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage7 = new System.Windows.Forms.TabPage();
this.btnHul = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label();
this.btnOpenDoor = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.btnOpenLed = new System.Windows.Forms.Button();
this.btnOpenDLed = new System.Windows.Forms.Button();
this.btnCloseDoor = new System.Windows.Forms.Button();
this.btnCloseDLed = new System.Windows.Forms.Button();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.chbOpenLog = new System.Windows.Forms.CheckBox();
this.btnClearLog = new System.Windows.Forms.Button();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.btnHul = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl();
this.btnOpenDoor = new System.Windows.Forms.Button();
this.btnCloseDoor = new System.Windows.Forms.Button();
this.btnCloseDLed = new System.Windows.Forms.Button();
this.btnOpenLed = new System.Windows.Forms.Button();
this.btnCloseLed = new System.Windows.Forms.Button();
this.btnOpenDLed = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.groupHistory = new System.Windows.Forms.GroupBox();
this.txtHistoryTemp = new System.Windows.Forms.TextBox();
......@@ -89,9 +91,7 @@
this.label27 = new System.Windows.Forms.Label();
this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.lblThisSta = new System.Windows.Forms.Label();
this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl();
this.groupInout = new System.Windows.Forms.GroupBox();
this.lblTempStr = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
......@@ -134,6 +134,7 @@
this.btnUpDownP6 = new System.Windows.Forms.Button();
this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.料仓操作ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
......@@ -172,12 +173,12 @@
this.tabPage5.SuspendLayout();
this.tabPage6.SuspendLayout();
this.tabControl1.SuspendLayout();
this.tabPage7.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tabPage3.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabPage2.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupHistory.SuspendLayout();
this.groupBox3.SuspendLayout();
this.groupInout.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.SuspendLayout();
......@@ -229,56 +230,29 @@
this.tabControl2.Location = new System.Drawing.Point(6, 4);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(1091, 80);
this.tabControl2.Size = new System.Drawing.Size(998, 80);
this.tabControl2.TabIndex = 271;
//
// tabPage4
//
this.tabPage4.Controls.Add(this.chbIsDebug);
this.tabPage4.Controls.Add(this.chbBuzzer);
this.tabPage4.Controls.Add(this.btnStoreExit);
this.tabPage4.Controls.Add(this.btnStoreHome);
this.tabPage4.Controls.Add(this.chbAuto);
this.tabPage4.Controls.Add(this.btnSotreReset);
this.tabPage4.Controls.Add(this.btnStoreStop);
this.tabPage4.Controls.Add(this.btnStoreStart);
this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(1083, 47);
this.tabPage4.Size = new System.Drawing.Size(990, 47);
this.tabPage4.TabIndex = 0;
this.tabPage4.Text = " 料仓操作 ";
this.tabPage4.UseVisualStyleBackColor = true;
//
// chbIsDebug
//
this.chbIsDebug.AutoSize = true;
this.chbIsDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbIsDebug.Location = new System.Drawing.Point(685, 13);
this.chbIsDebug.Name = "chbIsDebug";
this.chbIsDebug.Size = new System.Drawing.Size(84, 24);
this.chbIsDebug.TabIndex = 272;
this.chbIsDebug.Text = "调试状态";
this.chbIsDebug.UseVisualStyleBackColor = true;
this.chbIsDebug.CheckedChanged += new System.EventHandler(this.chbIsDebug_CheckedChanged);
//
// chbBuzzer
//
this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(803, 13);
this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 271;
this.chbBuzzer.Text = "启用蜂鸣器";
this.chbBuzzer.UseVisualStyleBackColor = true;
this.chbBuzzer.CheckedChanged += new System.EventHandler(this.chbBuzzer_CheckedChanged);
//
// btnStoreExit
//
this.btnStoreExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreExit.Location = new System.Drawing.Point(541, 1);
this.btnStoreExit.Location = new System.Drawing.Point(538, 1);
this.btnStoreExit.Name = "btnStoreExit";
this.btnStoreExit.Size = new System.Drawing.Size(132, 45);
this.btnStoreExit.TabIndex = 4;
......@@ -290,7 +264,7 @@
//
this.btnStoreHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreHome.Location = new System.Drawing.Point(406, 1);
this.btnStoreHome.Location = new System.Drawing.Point(405, 1);
this.btnStoreHome.Name = "btnStoreHome";
this.btnStoreHome.Size = new System.Drawing.Size(132, 45);
this.btnStoreHome.TabIndex = 3;
......@@ -298,23 +272,11 @@
this.btnStoreHome.UseVisualStyleBackColor = true;
this.btnStoreHome.Click += new System.EventHandler(this.回待机点ToolStripMenuItem_Click);
//
// chbAuto
//
this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(960, 13);
this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270;
this.chbAuto.Text = "开机自动启动";
this.chbAuto.UseVisualStyleBackColor = true;
this.chbAuto.CheckedChanged += new System.EventHandler(this.chbAuto_CheckedChanged);
//
// btnSotreReset
//
this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSotreReset.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSotreReset.Location = new System.Drawing.Point(273, 1);
this.btnSotreReset.Location = new System.Drawing.Point(272, 1);
this.btnSotreReset.Name = "btnSotreReset";
this.btnSotreReset.Size = new System.Drawing.Size(132, 45);
this.btnSotreReset.TabIndex = 2;
......@@ -326,7 +288,7 @@
//
this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreStop.Location = new System.Drawing.Point(140, 1);
this.btnStoreStop.Location = new System.Drawing.Point(139, 1);
this.btnStoreStop.Name = "btnStoreStop";
this.btnStoreStop.Size = new System.Drawing.Size(132, 45);
this.btnStoreStop.TabIndex = 1;
......@@ -338,7 +300,7 @@
//
this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStart.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStoreStart.Location = new System.Drawing.Point(7, 1);
this.btnStoreStart.Location = new System.Drawing.Point(6, 1);
this.btnStoreStart.Name = "btnStoreStart";
this.btnStoreStart.Size = new System.Drawing.Size(132, 45);
this.btnStoreStart.TabIndex = 0;
......@@ -348,38 +310,23 @@
//
// tabPage5
//
this.tabPage5.Controls.Add(this.btnUpdown);
this.tabPage5.Controls.Add(this.btnDebug);
this.tabPage5.Controls.Add(this.btnAxisOff);
this.tabPage5.Controls.Add(this.btnAxisOn);
this.tabPage5.Controls.Add(this.btnScanCode);
this.tabPage5.Controls.Add(this.btnAxisP);
this.tabPage5.Controls.Add(this.btnIO);
this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
this.tabPage5.Size = new System.Drawing.Size(1083, 47);
this.tabPage5.Size = new System.Drawing.Size(990, 47);
this.tabPage5.TabIndex = 1;
this.tabPage5.Text = " 设备调试 ";
this.tabPage5.UseVisualStyleBackColor = true;
//
// btnUpdown
//
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(672, 0);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(132, 45);
this.btnUpdown.TabIndex = 272;
this.btnUpdown.Text = "升降轴位置调试";
this.btnUpdown.UseVisualStyleBackColor = true;
this.btnUpdown.Click += new System.EventHandler(this.btnUpdown_Click);
//
// btnDebug
//
this.btnDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDebug.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDebug.Location = new System.Drawing.Point(806, 0);
this.btnDebug.Location = new System.Drawing.Point(405, 1);
this.btnDebug.Name = "btnDebug";
this.btnDebug.Size = new System.Drawing.Size(132, 45);
this.btnDebug.TabIndex = 12;
......@@ -387,35 +334,11 @@
this.btnDebug.UseVisualStyleBackColor = true;
this.btnDebug.Click += new System.EventHandler(this.btnDebug_Click);
//
// btnAxisOff
//
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(539, 0);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(132, 45);
this.btnAxisOff.TabIndex = 11;
this.btnAxisOff.Text = "料仓运转OFF";
this.btnAxisOff.UseVisualStyleBackColor = true;
this.btnAxisOff.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
//
// btnAxisOn
//
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(406, 0);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(132, 45);
this.btnAxisOn.TabIndex = 10;
this.btnAxisOn.Text = "料仓运转ON";
this.btnAxisOn.UseVisualStyleBackColor = true;
this.btnAxisOn.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
//
// btnScanCode
//
this.btnScanCode.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScanCode.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnScanCode.Location = new System.Drawing.Point(140, 0);
this.btnScanCode.Location = new System.Drawing.Point(139, 1);
this.btnScanCode.Name = "btnScanCode";
this.btnScanCode.Size = new System.Drawing.Size(132, 45);
this.btnScanCode.TabIndex = 9;
......@@ -427,7 +350,7 @@
//
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisP.Location = new System.Drawing.Point(273, 0);
this.btnAxisP.Location = new System.Drawing.Point(272, 1);
this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(132, 45);
this.btnAxisP.TabIndex = 8;
......@@ -439,7 +362,7 @@
//
this.btnIO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnIO.Location = new System.Drawing.Point(7, 0);
this.btnIO.Location = new System.Drawing.Point(6, 1);
this.btnIO.Name = "btnIO";
this.btnIO.Size = new System.Drawing.Size(132, 45);
this.btnIO.TabIndex = 5;
......@@ -452,10 +375,9 @@
this.tabPage6.Controls.Add(this.btnOpenAutoInOut);
this.tabPage6.Controls.Add(this.btnLan);
this.tabPage6.Controls.Add(this.button4);
this.tabPage6.Controls.Add(this.btnLogDebug);
this.tabPage6.Location = new System.Drawing.Point(4, 29);
this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(1083, 47);
this.tabPage6.Size = new System.Drawing.Size(990, 47);
this.tabPage6.TabIndex = 2;
this.tabPage6.Text = " 其他 ";
this.tabPage6.UseVisualStyleBackColor = true;
......@@ -465,7 +387,7 @@
this.btnOpenAutoInOut.BackColor = System.Drawing.Color.Transparent;
this.btnOpenAutoInOut.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAutoInOut.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAutoInOut.Location = new System.Drawing.Point(417, 1);
this.btnOpenAutoInOut.Location = new System.Drawing.Point(272, 1);
this.btnOpenAutoInOut.Name = "btnOpenAutoInOut";
this.btnOpenAutoInOut.Size = new System.Drawing.Size(132, 45);
this.btnOpenAutoInOut.TabIndex = 271;
......@@ -490,7 +412,7 @@
//
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(270, 1);
this.button4.Location = new System.Drawing.Point(138, 1);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(132, 45);
this.button4.TabIndex = 15;
......@@ -498,13 +420,85 @@
this.button4.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// btnUpdown
//
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(834, 383);
this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(135, 45);
this.btnUpdown.TabIndex = 272;
this.btnUpdown.Text = "升降轴位置调试";
this.btnUpdown.UseVisualStyleBackColor = true;
this.btnUpdown.Click += new System.EventHandler(this.btnUpdown_Click);
//
// btnAxisOff
//
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(694, 383);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(135, 45);
this.btnAxisOff.TabIndex = 11;
this.btnAxisOff.Text = "料仓运转OFF";
this.btnAxisOff.UseVisualStyleBackColor = true;
this.btnAxisOff.Click += new System.EventHandler(this.料仓运转OFFToolStripMenuItem_Click);
//
// btnAxisOn
//
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(554, 383);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(135, 45);
this.btnAxisOn.TabIndex = 10;
this.btnAxisOn.Text = "料仓运转ON";
this.btnAxisOn.UseVisualStyleBackColor = true;
this.btnAxisOn.Click += new System.EventHandler(this.料仓运转ONToolStripMenuItem_Click);
//
// chbIsDebug
//
this.chbIsDebug.AutoSize = true;
this.chbIsDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbIsDebug.Location = new System.Drawing.Point(596, 32);
this.chbIsDebug.Name = "chbIsDebug";
this.chbIsDebug.Size = new System.Drawing.Size(84, 24);
this.chbIsDebug.TabIndex = 272;
this.chbIsDebug.Text = "调试状态";
this.chbIsDebug.UseVisualStyleBackColor = true;
this.chbIsDebug.CheckedChanged += new System.EventHandler(this.chbIsDebug_CheckedChanged);
//
// chbBuzzer
//
this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(712, 32);
this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 271;
this.chbBuzzer.Text = "启用蜂鸣器";
this.chbBuzzer.UseVisualStyleBackColor = true;
this.chbBuzzer.CheckedChanged += new System.EventHandler(this.chbBuzzer_CheckedChanged);
//
// chbAuto
//
this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(842, 32);
this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270;
this.chbAuto.Text = "开机自动启动";
this.chbAuto.UseVisualStyleBackColor = true;
this.chbAuto.CheckedChanged += new System.EventHandler(this.chbAuto_CheckedChanged);
//
// btnLogDebug
//
this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLogDebug.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLogDebug.Location = new System.Drawing.Point(137, 1);
this.btnLogDebug.Location = new System.Drawing.Point(704, 3);
this.btnLogDebug.Name = "btnLogDebug";
this.btnLogDebug.Size = new System.Drawing.Size(132, 45);
this.btnLogDebug.Size = new System.Drawing.Size(132, 38);
this.btnLogDebug.TabIndex = 13;
this.btnLogDebug.Text = "开启DEBUG";
this.btnLogDebug.UseVisualStyleBackColor = true;
......@@ -515,89 +509,39 @@
this.tabControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage7);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(542, 85);
this.tabControl1.Location = new System.Drawing.Point(6, 85);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(555, 655);
this.tabControl1.Size = new System.Drawing.Size(998, 636);
this.tabControl1.TabIndex = 272;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.chbOpenLog);
this.tabPage3.Controls.Add(this.btnClearLog);
this.tabPage3.Controls.Add(this.richTextBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 29);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Size = new System.Drawing.Size(547, 622);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 操作日志 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// chbOpenLog
//
this.chbOpenLog.AutoSize = true;
this.chbOpenLog.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbOpenLog.Location = new System.Drawing.Point(21, 13);
this.chbOpenLog.Name = "chbOpenLog";
this.chbOpenLog.Size = new System.Drawing.Size(84, 24);
this.chbOpenLog.TabIndex = 272;
this.chbOpenLog.Text = "显示日志";
this.chbOpenLog.UseVisualStyleBackColor = true;
this.chbOpenLog.CheckedChanged += new System.EventHandler(this.chbOpenLog_CheckedChanged);
//
// btnClearLog
//
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(390, 3);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(149, 45);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// richTextBox1
//
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(5, 52);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(534, 565);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.Visible = false;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.btnHul);
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Controls.Add(this.btnOpenDoor);
this.tabPage1.Controls.Add(this.btnCloseDoor);
this.tabPage1.Controls.Add(this.btnCloseDLed);
this.tabPage1.Controls.Add(this.btnOpenLed);
this.tabPage1.Controls.Add(this.btnCloseLed);
this.tabPage1.Controls.Add(this.btnOpenDLed);
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(547, 622);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
// tabPage7
//
this.tabPage7.Controls.Add(this.btnHul);
this.tabPage7.Controls.Add(this.groupBox3);
this.tabPage7.Controls.Add(this.btnOpenDoor);
this.tabPage7.Controls.Add(this.btnCloseLed);
this.tabPage7.Controls.Add(this.btnOpenLed);
this.tabPage7.Controls.Add(this.btnOpenDLed);
this.tabPage7.Controls.Add(this.btnCloseDoor);
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(990, 603);
this.tabPage7.TabIndex = 3;
this.tabPage7.Text = " 设备状态 ";
this.tabPage7.UseVisualStyleBackColor = true;
//
// btnHul
//
this.btnHul.BackColor = System.Drawing.Color.White;
this.btnHul.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHul.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnHul.Location = new System.Drawing.Point(375, 6);
this.btnHul.Location = new System.Drawing.Point(463, 204);
this.btnHul.Name = "btnHul";
this.btnHul.Size = new System.Drawing.Size(149, 45);
this.btnHul.TabIndex = 263;
......@@ -606,34 +550,105 @@
this.btnHul.Visible = false;
this.btnHul.Click += new System.EventHandler(this.btnHul_Click);
//
// axisMoveControl1
// groupBox3
//
this.axisMoveControl1.Location = new System.Drawing.Point(4, 107);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(540, 509);
this.axisMoveControl1.TabIndex = 0;
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox3.Controls.Add(this.chbIsDebug);
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.chbBuzzer);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbAuto);
this.groupBox3.Location = new System.Drawing.Point(7, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(976, 189);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
//
// lblWarnMsg
//
this.lblWarnMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(5, 83);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(965, 98);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblThisSta
//
this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(23, 35);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
//
// btnOpenDoor
//
this.btnOpenDoor.BackColor = System.Drawing.Color.White;
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(6, 6);
this.btnOpenDoor.Location = new System.Drawing.Point(7, 204);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(117, 45);
this.btnOpenDoor.Size = new System.Drawing.Size(149, 45);
this.btnOpenDoor.TabIndex = 257;
this.btnOpenDoor.Text = "打开仓门";
this.btnOpenDoor.UseVisualStyleBackColor = false;
this.btnOpenDoor.Click += new System.EventHandler(this.btnOpenDoor_Click);
//
// btnCloseLed
//
this.btnCloseLed.BackColor = System.Drawing.Color.White;
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(159, 254);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(149, 45);
this.btnCloseLed.TabIndex = 260;
this.btnCloseLed.Text = "关闭相机照明";
this.btnCloseLed.UseVisualStyleBackColor = false;
this.btnCloseLed.Click += new System.EventHandler(this.btnCloseLed_Click);
//
// btnOpenLed
//
this.btnOpenLed.BackColor = System.Drawing.Color.White;
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(159, 204);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(149, 45);
this.btnOpenLed.TabIndex = 259;
this.btnOpenLed.Text = "打开相机照明";
this.btnOpenLed.UseVisualStyleBackColor = false;
this.btnOpenLed.Click += new System.EventHandler(this.btnOpenLed_Click);
//
// btnOpenDLed
//
this.btnOpenDLed.BackColor = System.Drawing.Color.White;
this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDLed.Location = new System.Drawing.Point(311, 204);
this.btnOpenDLed.Name = "btnOpenDLed";
this.btnOpenDLed.Size = new System.Drawing.Size(149, 45);
this.btnOpenDLed.TabIndex = 261;
this.btnOpenDLed.Text = "打开设备照明";
this.btnOpenDLed.UseVisualStyleBackColor = false;
this.btnOpenDLed.Click += new System.EventHandler(this.btnOpenDLed_Click);
//
// btnCloseDoor
//
this.btnCloseDoor.BackColor = System.Drawing.Color.White;
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(6, 56);
this.btnCloseDoor.Location = new System.Drawing.Point(7, 254);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(117, 45);
this.btnCloseDoor.Size = new System.Drawing.Size(149, 45);
this.btnCloseDoor.TabIndex = 258;
this.btnCloseDoor.Text = "关闭仓门";
this.btnCloseDoor.UseVisualStyleBackColor = false;
......@@ -644,63 +659,80 @@
this.btnCloseDLed.BackColor = System.Drawing.Color.White;
this.btnCloseDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDLed.Location = new System.Drawing.Point(252, 56);
this.btnCloseDLed.Location = new System.Drawing.Point(311, 254);
this.btnCloseDLed.Name = "btnCloseDLed";
this.btnCloseDLed.Size = new System.Drawing.Size(117, 45);
this.btnCloseDLed.Size = new System.Drawing.Size(149, 45);
this.btnCloseDLed.TabIndex = 262;
this.btnCloseDLed.Text = "关闭设备照明";
this.btnCloseDLed.UseVisualStyleBackColor = false;
this.btnCloseDLed.Click += new System.EventHandler(this.btnCloseDLed_Click);
//
// btnOpenLed
// tabPage3
//
this.btnOpenLed.BackColor = System.Drawing.Color.White;
this.btnOpenLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenLed.Location = new System.Drawing.Point(129, 6);
this.btnOpenLed.Name = "btnOpenLed";
this.btnOpenLed.Size = new System.Drawing.Size(117, 45);
this.btnOpenLed.TabIndex = 259;
this.btnOpenLed.Text = "打开相机照明";
this.btnOpenLed.UseVisualStyleBackColor = false;
this.btnOpenLed.Click += new System.EventHandler(this.btnOpenLed_Click);
this.tabPage3.Controls.Add(this.chbOpenLog);
this.tabPage3.Controls.Add(this.btnClearLog);
this.tabPage3.Controls.Add(this.richTextBox1);
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(990, 603);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = " 操作日志 ";
this.tabPage3.UseVisualStyleBackColor = true;
//
// btnCloseLed
// chbOpenLog
//
this.btnCloseLed.BackColor = System.Drawing.Color.White;
this.btnCloseLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseLed.Location = new System.Drawing.Point(129, 56);
this.btnCloseLed.Name = "btnCloseLed";
this.btnCloseLed.Size = new System.Drawing.Size(117, 45);
this.btnCloseLed.TabIndex = 260;
this.btnCloseLed.Text = "关闭相机照明";
this.btnCloseLed.UseVisualStyleBackColor = false;
this.btnCloseLed.Click += new System.EventHandler(this.btnCloseLed_Click);
this.chbOpenLog.AutoSize = true;
this.chbOpenLog.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbOpenLog.Location = new System.Drawing.Point(22, 10);
this.chbOpenLog.Name = "chbOpenLog";
this.chbOpenLog.Size = new System.Drawing.Size(84, 24);
this.chbOpenLog.TabIndex = 272;
this.chbOpenLog.Text = "显示日志";
this.chbOpenLog.UseVisualStyleBackColor = true;
this.chbOpenLog.CheckedChanged += new System.EventHandler(this.chbOpenLog_CheckedChanged);
//
// btnOpenDLed
// btnClearLog
//
this.btnOpenDLed.BackColor = System.Drawing.Color.White;
this.btnOpenDLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDLed.Location = new System.Drawing.Point(252, 6);
this.btnOpenDLed.Name = "btnOpenDLed";
this.btnOpenDLed.Size = new System.Drawing.Size(117, 45);
this.btnOpenDLed.TabIndex = 261;
this.btnOpenDLed.Text = "打开设备照明";
this.btnOpenDLed.UseVisualStyleBackColor = false;
this.btnOpenDLed.Click += new System.EventHandler(this.btnOpenDLed_Click);
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(842, 3);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(132, 38);
this.btnClearLog.TabIndex = 224;
this.btnClearLog.Text = "清理日志";
this.btnClearLog.UseVisualStyleBackColor = false;
this.btnClearLog.Click += new System.EventHandler(this.btnClearLog_Click);
//
// tabPage2
// richTextBox1
//
this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(547, 622);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 压紧轴/温湿度 ";
this.tabPage2.UseVisualStyleBackColor = true;
this.richTextBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(5, 44);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(978, 553);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.Visible = false;
//
// tabPage1
//
this.tabPage1.Controls.Add(this.btnUpdown);
this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Controls.Add(this.btnAxisOff);
this.tabPage1.Controls.Add(this.btnAxisOn);
this.tabPage1.Controls.Add(this.groupInout);
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(990, 603);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true;
//
// groupBox7
//
......@@ -715,9 +747,9 @@
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(8, 6);
this.groupBox7.Location = new System.Drawing.Point(549, 441);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(530, 126);
this.groupBox7.Size = new System.Drawing.Size(427, 124);
this.groupBox7.TabIndex = 272;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "温控器调试";
......@@ -866,7 +898,7 @@
// btnSelTemp
//
this.btnSelTemp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSelTemp.Location = new System.Drawing.Point(212, 74);
this.btnSelTemp.Location = new System.Drawing.Point(204, 74);
this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(157, 33);
this.btnSelTemp.TabIndex = 248;
......@@ -940,7 +972,7 @@
// btnTempClose
//
this.btnTempClose.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTempClose.Location = new System.Drawing.Point(322, 26);
this.btnTempClose.Location = new System.Drawing.Point(310, 26);
this.btnTempClose.Name = "btnTempClose";
this.btnTempClose.Size = new System.Drawing.Size(100, 33);
this.btnTempClose.TabIndex = 89;
......@@ -951,7 +983,7 @@
// btnTempInit
//
this.btnTempInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTempInit.Location = new System.Drawing.Point(212, 26);
this.btnTempInit.Location = new System.Drawing.Point(204, 26);
this.btnTempInit.Name = "btnTempInit";
this.btnTempInit.Size = new System.Drawing.Size(100, 33);
this.btnTempInit.TabIndex = 88;
......@@ -959,37 +991,12 @@
this.btnTempInit.UseVisualStyleBackColor = true;
this.btnTempInit.Click += new System.EventHandler(this.btnTempInit_Click);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(7, 85);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(529, 131);
this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
//
// lblWarnMsg
//
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(5, 49);
this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(519, 77);
this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblThisSta
// axisMoveControl1
//
this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(72, 22);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动";
this.axisMoveControl1.Location = new System.Drawing.Point(545, 4);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(437, 374);
this.axisMoveControl1.TabIndex = 0;
//
// groupInout
//
......@@ -1035,9 +1042,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(7, 218);
this.groupInout.Location = new System.Drawing.Point(6, 6);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(529, 520);
this.groupInout.Size = new System.Drawing.Size(533, 561);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
......@@ -1084,7 +1091,7 @@
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(271, 70);
this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(117, 38);
this.btnStartAuTo.Size = new System.Drawing.Size(167, 38);
this.btnStartAuTo.TabIndex = 222;
this.btnStartAuTo.Text = "启动自动模式";
this.btnStartAuTo.UseVisualStyleBackColor = false;
......@@ -1684,6 +1691,16 @@
this.btnUpDownP4.UseVisualStyleBackColor = false;
this.btnUpDownP4.Click += new System.EventHandler(this.btnUpDownP4_Click);
//
// tabPage2
//
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
this.tabPage2.Size = new System.Drawing.Size(990, 603);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 压紧轴/温湿度 ";
this.tabPage2.UseVisualStyleBackColor = true;
//
// menuStrip1
//
this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -1928,11 +1945,9 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1101, 749);
this.ClientSize = new System.Drawing.Size(1008, 726);
this.Controls.Add(this.tabControl2);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.groupBox3);
this.Controls.Add(this.groupInout);
this.Controls.Add(this.menuStrip1);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
......@@ -1948,20 +1963,19 @@
this.contextMenuStrip1.ResumeLayout(false);
this.tabControl2.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout();
this.tabPage5.ResumeLayout(false);
this.tabPage6.ResumeLayout(false);
this.tabControl1.ResumeLayout(false);
this.tabPage7.ResumeLayout(false);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.tabPage1.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupHistory.ResumeLayout(false);
this.groupHistory.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
this.menuStrip1.ResumeLayout(false);
......@@ -2072,10 +2086,6 @@
private System.Windows.Forms.Label label27;
private System.Windows.Forms.Button btnTempClose;
private System.Windows.Forms.Button btnTempInit;
private System.Windows.Forms.Button btnCloseDoor;
private System.Windows.Forms.Button btnOpenDoor;
private System.Windows.Forms.Button btnCloseLed;
private System.Windows.Forms.Button btnOpenLed;
private System.Windows.Forms.TabControl tabControl2;
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.TabPage tabPage5;
......@@ -2110,11 +2120,16 @@
private System.Windows.Forms.Button btnUpdown;
private System.Windows.Forms.Button btnLan;
private System.Windows.Forms.CheckBox chbIsDebug;
private System.Windows.Forms.Button btnCloseDLed;
private System.Windows.Forms.Button btnOpenDLed;
private System.Windows.Forms.Button btnOpenAutoInOut;
private System.Windows.Forms.Button btnHul;
private System.Windows.Forms.CheckBox chbOpenLog;
private System.Windows.Forms.TabPage tabPage7;
private System.Windows.Forms.Button btnHul;
private System.Windows.Forms.Button btnOpenDoor;
private System.Windows.Forms.Button btnCloseLed;
private System.Windows.Forms.Button btnOpenLed;
private System.Windows.Forms.Button btnOpenDLed;
private System.Windows.Forms.Button btnCloseDoor;
private System.Windows.Forms.Button btnCloseDLed;
}
}
source/ACSingleStore/FrmStoreBox.cs
......@@ -170,8 +170,22 @@ namespace OnlineStore.ACSingleStore
}
LanguageProcess();
LanguagePro();
tabControl1.TabPages.Remove(tabPage3);
richTextBox1.Visible = false;
tabControl1.TabPages.Remove(tabPage2);
bool showLog = true;
if (showLog)
{
richTextBox1.Visible = true;
chbIsDebug.Checked = true;
}
else
{
chbIsDebug.Checked = false;
richTextBox1.Visible = false ;
tabControl1.TabPages.Remove(tabPage3);
}
// this.tabControl1.TabPages.Remove(tabPage3);
// groupCode.Visible = false;
}
......
source/ACSingleStore/positionTool/FrmPositionTool.Designer.cs
......@@ -88,7 +88,7 @@
this.groupBox6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox6.Location = new System.Drawing.Point(6, 5);
this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(1008, 707);
this.groupBox6.Size = new System.Drawing.Size(992, 707);
this.groupBox6.TabIndex = 250;
this.groupBox6.TabStop = false;
//
......@@ -499,7 +499,7 @@
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.Location = new System.Drawing.Point(838, 665);
this.btnExit.Location = new System.Drawing.Point(822, 665);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(132, 36);
this.btnExit.TabIndex = 281;
......@@ -510,7 +510,7 @@
// btnClear
//
this.btnClear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClear.Location = new System.Drawing.Point(691, 665);
this.btnClear.Location = new System.Drawing.Point(675, 665);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(132, 36);
this.btnClear.TabIndex = 106;
......@@ -526,7 +526,7 @@
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(473, 20);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(526, 642);
this.richTextBox1.Size = new System.Drawing.Size(510, 642);
this.richTextBox1.TabIndex = 105;
this.richTextBox1.Text = "";
//
......@@ -539,7 +539,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1020, 719);
this.ClientSize = new System.Drawing.Size(1004, 719);
this.Controls.Add(this.groupBox6);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "FrmPositionTool";
......
source/ACSingleStore/resource/language.resource
......@@ -321,4 +321,5 @@ FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_Text,FrmStoreBox_lblTempStr_T
Y11,设备照明开,Equipment lighting on
FrmIOStatus_btnCDLed_Text,关闭设备照明,Turn off equipment lighting
FrmIOStatus_btnDevideLed_Text,打开设备照明,Turn on equipment lighting
FrmStoreBox_chbOpenLog_Text,显示日志,Open Log
\ No newline at end of file
FrmStoreBox_chbOpenLog_Text,显示日志,Open Log
FrmStoreBox_tabPage7_Text, 设备状态 , Machine state
\ No newline at end of file
source/ACSingleStore/useControl/AxisMoveControl.Designer.cs
......@@ -135,15 +135,14 @@
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, 4);
this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(533, 298);
this.groupAxis.Size = new System.Drawing.Size(423, 361);
this.groupAxis.TabIndex = 217;
this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动";
this.groupAxis.Enter += new System.EventHandler(this.groupAxis_Enter);
//
// label7
//
this.label7.Location = new System.Drawing.Point(10, 163);
this.label7.Location = new System.Drawing.Point(10, 216);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(99, 17);
this.label7.TabIndex = 328;
......@@ -153,14 +152,14 @@
// txtServoStatue
//
this.txtServoStatue.Enabled = false;
this.txtServoStatue.Location = new System.Drawing.Point(112, 160);
this.txtServoStatue.Location = new System.Drawing.Point(112, 213);
this.txtServoStatue.Name = "txtServoStatue";
this.txtServoStatue.Size = new System.Drawing.Size(25, 23);
this.txtServoStatue.TabIndex = 327;
//
// label17
//
this.label17.Location = new System.Drawing.Point(144, 263);
this.label17.Location = new System.Drawing.Point(142, 329);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(99, 17);
this.label17.TabIndex = 316;
......@@ -170,14 +169,14 @@
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(247, 260);
this.txtLimit2.Location = new System.Drawing.Point(245, 326);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313;
//
// label19
//
this.label19.Location = new System.Drawing.Point(144, 229);
this.label19.Location = new System.Drawing.Point(142, 290);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(99, 17);
this.label19.TabIndex = 312;
......@@ -187,14 +186,14 @@
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(247, 226);
this.txtLimit1.Location = new System.Drawing.Point(245, 287);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309;
//
// label6
//
this.label6.Location = new System.Drawing.Point(144, 195);
this.label6.Location = new System.Drawing.Point(142, 251);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(99, 17);
this.label6.TabIndex = 300;
......@@ -204,14 +203,14 @@
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(247, 192);
this.txtHomeSingle.Location = new System.Drawing.Point(245, 248);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
//
// label11
//
this.label11.Location = new System.Drawing.Point(10, 263);
this.label11.Location = new System.Drawing.Point(10, 329);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(99, 17);
this.label11.TabIndex = 292;
......@@ -221,14 +220,14 @@
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(112, 260);
this.txtHomeStatus.Location = new System.Drawing.Point(112, 326);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// label10
//
this.label10.Location = new System.Drawing.Point(10, 229);
this.label10.Location = new System.Drawing.Point(10, 290);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(99, 17);
this.label10.TabIndex = 289;
......@@ -238,14 +237,14 @@
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(112, 226);
this.txtBusyStatus.Location = new System.Drawing.Point(112, 287);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// label2
//
this.label2.Location = new System.Drawing.Point(10, 195);
this.label2.Location = new System.Drawing.Point(10, 251);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(99, 17);
this.label2.TabIndex = 286;
......@@ -255,7 +254,7 @@
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(112, 192);
this.txtAlarmStatus.Location = new System.Drawing.Point(112, 248);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
......@@ -264,7 +263,7 @@
//
this.btnGetAlarm.BackColor = System.Drawing.SystemColors.Control;
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Location = new System.Drawing.Point(291, 196);
this.btnGetAlarm.Location = new System.Drawing.Point(284, 282);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(115, 33);
this.btnGetAlarm.TabIndex = 284;
......@@ -279,7 +278,7 @@
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(409, 235);
this.btnReadPosition.Location = new System.Drawing.Point(284, 243);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(115, 33);
......@@ -291,7 +290,7 @@
// label8
//
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(144, 162);
this.label8.Location = new System.Drawing.Point(142, 216);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(99, 17);
this.label8.TabIndex = 255;
......@@ -305,7 +304,7 @@
this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(291, 25);
this.btnOpenAxis.Location = new System.Drawing.Point(300, 18);
this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(115, 33);
......@@ -321,7 +320,7 @@
this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(409, 25);
this.btnCloseAxis.Location = new System.Drawing.Point(300, 56);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(115, 33);
......@@ -332,10 +331,10 @@
//
// txtP
//
this.txtP.Location = new System.Drawing.Point(247, 160);
this.txtP.Location = new System.Drawing.Point(245, 213);
this.txtP.Name = "txtP";
this.txtP.ReadOnly = true;
this.txtP.Size = new System.Drawing.Size(87, 23);
this.txtP.Size = new System.Drawing.Size(110, 23);
this.txtP.TabIndex = 38;
//
// txtASpeed
......@@ -345,11 +344,11 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(201, 111);
this.txtASpeed.Location = new System.Drawing.Point(86, 133);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtASpeed.Size = new System.Drawing.Size(85, 23);
this.txtASpeed.Size = new System.Drawing.Size(87, 23);
this.txtASpeed.TabIndex = 251;
this.txtASpeed.Text = "30";
//
......@@ -358,10 +357,10 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(144, 113);
this.label47.Location = new System.Drawing.Point(5, 137);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(55, 17);
this.label47.Size = new System.Drawing.Size(75, 17);
this.label47.TabIndex = 250;
this.label47.Text = "速度:";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -373,7 +372,7 @@
this.btnAxisVMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(291, 106);
this.btnAxisVMove.Location = new System.Drawing.Point(58, 172);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(115, 33);
......@@ -389,7 +388,7 @@
this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(409, 67);
this.btnAxisRMove.Location = new System.Drawing.Point(179, 133);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(115, 33);
......@@ -405,7 +404,7 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(409, 196);
this.btnAxisReturnHome.Location = new System.Drawing.Point(179, 172);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(115, 33);
......@@ -421,7 +420,7 @@
this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(291, 67);
this.btnAxisAMove.Location = new System.Drawing.Point(179, 95);
this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(115, 33);
......@@ -434,7 +433,7 @@
//
this.btnComAlarmClear.BackColor = System.Drawing.SystemColors.Control;
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(291, 235);
this.btnComAlarmClear.Location = new System.Drawing.Point(284, 321);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(115, 33);
this.btnComAlarmClear.TabIndex = 50;
......@@ -448,11 +447,11 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(201, 72);
this.txtAPosition.Location = new System.Drawing.Point(86, 99);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAPosition.Size = new System.Drawing.Size(85, 23);
this.txtAPosition.Size = new System.Drawing.Size(87, 23);
this.txtAPosition.TabIndex = 244;
this.txtAPosition.Text = "3000";
//
......@@ -461,10 +460,10 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(144, 74);
this.label48.Location = new System.Drawing.Point(5, 102);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(55, 17);
this.label48.Size = new System.Drawing.Size(75, 17);
this.label48.TabIndex = 243;
this.label48.Text = "位置:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -476,10 +475,10 @@
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(409, 106);
this.btnAxisStop.Location = new System.Drawing.Point(300, 95);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(115, 33);
this.btnAxisStop.Size = new System.Drawing.Size(115, 110);
this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = false;
......@@ -488,7 +487,7 @@
// txtAxisValue
//
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(83, 109);
this.txtAxisValue.Location = new System.Drawing.Point(227, 59);
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true;
......@@ -499,7 +498,7 @@
// txtAxisDeviceName
//
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(83, 70);
this.txtAxisDeviceName.Location = new System.Drawing.Point(83, 59);
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true;
......@@ -511,7 +510,7 @@
//
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(5, 75);
this.label45.Location = new System.Drawing.Point(5, 64);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(75, 17);
this.label45.TabIndex = 240;
......@@ -522,7 +521,7 @@
//
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(5, 114);
this.label46.Location = new System.Drawing.Point(149, 64);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(75, 17);
this.label46.TabIndex = 239;
......@@ -535,9 +534,9 @@
this.comboBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboBox1.FormattingEnabled = true;
this.comboBox1.ItemHeight = 17;
this.comboBox1.Location = new System.Drawing.Point(8, 28);
this.comboBox1.Location = new System.Drawing.Point(8, 23);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(278, 25);
this.comboBox1.Size = new System.Drawing.Size(277, 25);
this.comboBox1.TabIndex = 234;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
......@@ -570,12 +569,13 @@
this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(4, 304);
this.groupBox1.Location = new System.Drawing.Point(4, 369);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(533, 203);
this.groupBox1.Size = new System.Drawing.Size(417, 203);
this.groupBox1.TabIndex = 218;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态";
this.groupBox1.Visible = false;
//
// axis_4_Alarm
//
......@@ -796,10 +796,10 @@
// AxisMoveControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupAxis);
this.Controls.Add(this.groupBox1);
this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(542, 514);
this.Size = new System.Drawing.Size(432, 623);
this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout();
this.groupBox1.ResumeLayout(false);
......
source/ACSingleStore/useControl/AxisMoveControl.cs
......@@ -182,11 +182,13 @@ namespace OnlineStore.ACPackingStore
{
txtServoStatue.Text = "✘";
}
ReadA(BoxBean.Config.Middle_Axis, lblActual1, lblTargetP1, txtMiddleTarget, axis_1_Alarm);
ReadA(BoxBean.Config.UpDown_Axis, lblActual2, lblTargetP2, txtUpdownTarget, axis_2_Alarm);
ReadA(BoxBean.Config.InOut_Axis, lblActual3, lblTargetP3, txtInoutTarget, axis_3_Alarm);
ReadA(BoxBean.Config.Comp_Axis, lblActual4, lblTargetP4, txt4Target, axis_4_Alarm);
if (groupBox1.Visible)
{
ReadA(BoxBean.Config.Middle_Axis, lblActual1, lblTargetP1, txtMiddleTarget, axis_1_Alarm);
ReadA(BoxBean.Config.UpDown_Axis, lblActual2, lblTargetP2, txtUpdownTarget, axis_2_Alarm);
ReadA(BoxBean.Config.InOut_Axis, lblActual3, lblTargetP3, txtInoutTarget, axis_3_Alarm);
ReadA(BoxBean.Config.Comp_Axis, lblActual4, lblTargetP4, txt4Target, axis_4_Alarm);
}
}
private void ReadA(ConfigMoveAxis axis, TextBox lblActual, TextBox lblTarget, TextBox lblT, IOStatusControl sta)
{
......@@ -250,10 +252,6 @@ namespace OnlineStore.ACPackingStore
moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
}
private void groupAxis_Enter(object sender, EventArgs e)
{
}
}
}
source/ACSingleStore/记录.txt
 // 机器状态 顶灯显示
20210222新建分支 SO852-ACSingleStore-SISO，基于RCDL-ACSingleStore-SISO，主要修改显示器分辨率1024X768
// 机器状态 顶灯显示
// 绿 黄 红
//机器复位中 闪 灭 灭
//机器待机中 亮 灭 灭
......
墨西哥料仓.txt deleted 100644 → 0
SISO料仓9台
datalogic版本，增加照明DO，门打开时自动打开照明。
DIDO定义修改。
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!