Skip to content

张东亮 / SO1131-ConveyorLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit ed1d2e2f 由 张东亮
选项

添加位置误差

1 个父辈 0c68e781
内嵌 并排
正在显示 4 个修改的文件 包含 123 行增加 和 82 行删除
source/AssemblyLineClient/FrmLine.Designer.cs
......@@ -97,6 +97,8 @@
this.lblCPU = new System.Windows.Forms.ToolStripStatusLabel();
this.lblContainerWarn = new System.Windows.Forms.ToolStripStatusLabel();
this.panel3 = new System.Windows.Forms.Panel();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.textBox1 = new System.Windows.Forms.TextBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
......@@ -111,6 +113,7 @@
this.contextMenuStrip_control.SuspendLayout();
this.statusStrip1.SuspendLayout();
this.panel3.SuspendLayout();
this.tabPage3.SuspendLayout();
this.SuspendLayout();
//
// tabControl1
......@@ -118,22 +121,23 @@
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1002, 447);
this.tabControl1.Size = new System.Drawing.Size(1002, 498);
this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
//
// tabPage1
//
this.tabPage1.Controls.Add(this.tableLayoutPanel1);
this.tabPage1.Location = new System.Drawing.Point(10, 63);
this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(982, 374);
this.tabPage1.Size = new System.Drawing.Size(994, 462);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 运行日志 ";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -150,16 +154,16 @@
this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.20536F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 78.79464F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(982, 374);
this.tableLayoutPanel1.Size = new System.Drawing.Size(994, 462);
this.tableLayoutPanel1.TabIndex = 107;
//
// logBox
//
this.logBox.Dock = System.Windows.Forms.DockStyle.Fill;
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(3, 82);
this.logBox.Location = new System.Drawing.Point(3, 100);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(976, 289);
this.logBox.Size = new System.Drawing.Size(988, 359);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -170,16 +174,16 @@
this.warnBox.ForeColor = System.Drawing.Color.Green;
this.warnBox.Location = new System.Drawing.Point(3, 3);
this.warnBox.Name = "warnBox";
this.warnBox.Size = new System.Drawing.Size(976, 73);
this.warnBox.Size = new System.Drawing.Size(988, 91);
this.warnBox.TabIndex = 107;
this.warnBox.Text = "";
//
// tabPage2
//
this.tabPage2.Controls.Add(this.panel2);
this.tabPage2.Location = new System.Drawing.Point(10, 63);
this.tabPage2.Location = new System.Drawing.Point(4, 32);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(982, 374);
this.tabPage2.Size = new System.Drawing.Size(994, 462);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = "模块";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -190,7 +194,7 @@
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(982, 374);
this.panel2.Size = new System.Drawing.Size(994, 462);
this.panel2.TabIndex = 98;
//
// panel1
......@@ -199,7 +203,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(982, 374);
this.panel1.Size = new System.Drawing.Size(994, 462);
this.panel1.TabIndex = 0;
//
// flowLayoutPanel1
......@@ -208,15 +212,15 @@
this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
this.flowLayoutPanel1.Size = new System.Drawing.Size(982, 374);
this.flowLayoutPanel1.Size = new System.Drawing.Size(994, 462);
this.flowLayoutPanel1.TabIndex = 0;
//
// tabPage5
//
this.tabPage5.Controls.Add(this.panel5);
this.tabPage5.Location = new System.Drawing.Point(10, 63);
this.tabPage5.Location = new System.Drawing.Point(4, 32);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(982, 416);
this.tabPage5.Size = new System.Drawing.Size(994, 462);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "示意图";
this.tabPage5.UseVisualStyleBackColor = true;
......@@ -229,7 +233,7 @@
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(982, 416);
this.panel5.Size = new System.Drawing.Size(994, 462);
this.panel5.TabIndex = 108;
//
// picLine
......@@ -238,7 +242,7 @@
this.picLine.Image = global::ConveyorLine.Properties.Resources.line;
this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(982, 416);
this.picLine.Size = new System.Drawing.Size(994, 462);
this.picLine.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picLine.TabIndex = 107;
this.picLine.TabStop = false;
......@@ -260,24 +264,24 @@
this.toolStripSeparator8,
this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(185, 126);
this.contextMenuStrip1.Size = new System.Drawing.Size(125, 74);
//
// 显示ToolStripMenuItem
//
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(184, 58);
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(124, 32);
this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(181, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(121, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(184, 58);
this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 32);
this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
......@@ -299,60 +303,60 @@
this.toolStripSeparator2,
this.退出ToolStripMenuItem});
this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem";
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(230, 56);
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(118, 31);
this.操作ToolStripMenuItem.Text = " 设备操作 ";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(281, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(141, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(281, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(141, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(281, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(141, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(281, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(281, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(141, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(284, 60);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
......@@ -368,56 +372,56 @@
this.toolStripSeparator14,
this.线体IOToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(218, 56);
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(112, 31);
this.设置TToolStripMenuItem.Text = "设备调试 ";
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator6.Visible = false;
//
// 查看容器编码ToolStripMenuItem
//
this.查看容器编码ToolStripMenuItem.Name = "查看容器编码ToolStripMenuItem";
this.查看容器编码ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.查看容器编码ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.查看容器编码ToolStripMenuItem.Text = "查看容器编码";
this.查看容器编码ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator9.Visible = false;
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(432, 60);
this.toolStripMenuItem2.Size = new System.Drawing.Size(218, 32);
this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator13.Size = new System.Drawing.Size(215, 6);
//
// 查看托盘信息ToolStripMenuItem
//
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.查看托盘信息ToolStripMenuItem.Text = "查看容器信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator14.Size = new System.Drawing.Size(215, 6);
//
// 线体IOToolStripMenuItem
//
this.线体IOToolStripMenuItem.Name = "线体IOToolStripMenuItem";
this.线体IOToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.线体IOToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.线体IOToolStripMenuItem.Text = "查看线体IO";
this.线体IOToolStripMenuItem.Click += new System.EventHandler(this.线体IOToolStripMenuItem_Click);
//
......@@ -430,37 +434,37 @@
this.toolStripSeparator11,
this.版本号ToolStripMenuItem});
this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(162, 56);
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(84, 31);
this.帮助ToolStripMenuItem.Text = " 系统 ";
//
// 清空日志ToolStripMenuItem
//
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 60);
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(349, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(175, 6);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(352, 60);
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(349, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(175, 6);
//
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(352, 60);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......@@ -468,7 +472,6 @@
//
this.menuStrip1.BackColor = System.Drawing.Color.White;
this.menuStrip1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.menuStrip1.GripMargin = new System.Windows.Forms.Padding(2, 2, 0, 2);
this.menuStrip1.ImageScalingSize = new System.Drawing.Size(24, 24);
this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.操作ToolStripMenuItem,
......@@ -477,7 +480,7 @@
this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1002, 60);
this.menuStrip1.Size = new System.Drawing.Size(1002, 35);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -489,32 +492,32 @@
this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator24});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(206, 56);
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(106, 31);
this.运行参数ToolStripMenuItem.Text = "运行参数";
//
// 开机自动启动ToolStripMenuItem
//
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.开机自动启动ToolStripMenuItem.Text = "开机自动启动";
this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator15.Size = new System.Drawing.Size(215, 6);
//
// 启用蜂鸣器ToolStripMenuItem
//
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(432, 60);
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator24
//
this.toolStripSeparator24.Name = "toolStripSeparator24";
this.toolStripSeparator24.Size = new System.Drawing.Size(429, 6);
this.toolStripSeparator24.Size = new System.Drawing.Size(215, 6);
//
// contextMenuStrip_control
//
......@@ -533,73 +536,73 @@
this.control_Debug,
this.toolStripSeparator22});
this.contextMenuStrip_control.Name = "contextMenuStrip1";
this.contextMenuStrip_control.Size = new System.Drawing.Size(311, 300);
this.contextMenuStrip_control.Size = new System.Drawing.Size(189, 180);
//
// toolStripSeparator21
//
this.toolStripSeparator21.Name = "toolStripSeparator21";
this.toolStripSeparator21.Size = new System.Drawing.Size(307, 6);
this.toolStripSeparator21.Size = new System.Drawing.Size(185, 6);
this.toolStripSeparator21.Visible = false;
//
// toolName
//
this.toolName.BackColor = System.Drawing.Color.White;
this.toolName.Name = "toolName";
this.toolName.Size = new System.Drawing.Size(310, 52);
this.toolName.Size = new System.Drawing.Size(188, 28);
this.toolName.Visible = false;
//
// toolStripSeparator23
//
this.toolStripSeparator23.Name = "toolStripSeparator23";
this.toolStripSeparator23.Size = new System.Drawing.Size(307, 6);
this.toolStripSeparator23.Size = new System.Drawing.Size(185, 6);
//
// control_InDetial
//
this.control_InDetial.Name = "control_InDetial";
this.control_InDetial.Size = new System.Drawing.Size(310, 52);
this.control_InDetial.Size = new System.Drawing.Size(188, 28);
this.control_InDetial.Text = "进入详情界面";
this.control_InDetial.Click += new System.EventHandler(this.control_InDetial_Click);
//
// toolStripSeparator18
//
this.toolStripSeparator18.Name = "toolStripSeparator18";
this.toolStripSeparator18.Size = new System.Drawing.Size(307, 6);
this.toolStripSeparator18.Size = new System.Drawing.Size(185, 6);
//
// control_StartDebug
//
this.control_StartDebug.Name = "control_StartDebug";
this.control_StartDebug.Size = new System.Drawing.Size(310, 52);
this.control_StartDebug.Size = new System.Drawing.Size(188, 28);
this.control_StartDebug.Text = "启动调试";
this.control_StartDebug.Click += new System.EventHandler(this.control_StartDebug_Click);
//
// toolStripSeparator19
//
this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(307, 6);
this.toolStripSeparator19.Size = new System.Drawing.Size(185, 6);
//
// control_Stop
//
this.control_Stop.Name = "control_Stop";
this.control_Stop.Size = new System.Drawing.Size(310, 52);
this.control_Stop.Size = new System.Drawing.Size(188, 28);
this.control_Stop.Text = "停止运行";
this.control_Stop.Click += new System.EventHandler(this.control_Stop_Click);
//
// toolStripSeparator20
//
this.toolStripSeparator20.Name = "toolStripSeparator20";
this.toolStripSeparator20.Size = new System.Drawing.Size(307, 6);
this.toolStripSeparator20.Size = new System.Drawing.Size(185, 6);
//
// control_Debug
//
this.control_Debug.Name = "control_Debug";
this.control_Debug.Size = new System.Drawing.Size(310, 52);
this.control_Debug.Size = new System.Drawing.Size(188, 28);
this.control_Debug.Text = "启用调试";
this.control_Debug.Click += new System.EventHandler(this.control_Debug_Click);
//
// toolStripSeparator22
//
this.toolStripSeparator22.Name = "toolStripSeparator22";
this.toolStripSeparator22.Size = new System.Drawing.Size(307, 6);
this.toolStripSeparator22.Size = new System.Drawing.Size(185, 6);
//
// statusStrip1
//
......@@ -609,9 +612,9 @@
this.lblMemory,
this.lblCPU,
this.lblContainerWarn});
this.statusStrip1.Location = new System.Drawing.Point(0, 507);
this.statusStrip1.Location = new System.Drawing.Point(0, 533);
this.statusStrip1.Name = "statusStrip1";
this.statusStrip1.Size = new System.Drawing.Size(1002, 52);
this.statusStrip1.Size = new System.Drawing.Size(1002, 26);
this.statusStrip1.TabIndex = 97;
this.statusStrip1.Text = "statusStrip1";
//
......@@ -619,35 +622,55 @@
//
this.lblStatus.ForeColor = System.Drawing.Color.Green;
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(137, 39);
this.lblStatus.Size = new System.Drawing.Size(69, 20);
this.lblStatus.Text = "等待启动";
//
// lblMemory
//
this.lblMemory.Name = "lblMemory";
this.lblMemory.Size = new System.Drawing.Size(83, 39);
this.lblMemory.Size = new System.Drawing.Size(42, 20);
this.lblMemory.Text = "0MB";
//
// lblCPU
//
this.lblCPU.Name = "lblCPU";
this.lblCPU.Size = new System.Drawing.Size(62, 39);
this.lblCPU.Size = new System.Drawing.Size(31, 20);
this.lblCPU.Text = "0%";
//
// lblContainerWarn
//
this.lblContainerWarn.Name = "lblContainerWarn";
this.lblContainerWarn.Size = new System.Drawing.Size(0, 39);
this.lblContainerWarn.Size = new System.Drawing.Size(0, 20);
//
// panel3
//
this.panel3.Controls.Add(this.tabControl1);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel3.Location = new System.Drawing.Point(0, 60);
this.panel3.Location = new System.Drawing.Point(0, 35);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(1002, 447);
this.panel3.Size = new System.Drawing.Size(1002, 498);
this.panel3.TabIndex = 98;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.textBox1);
this.tabPage3.Location = new System.Drawing.Point(4, 32);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(994, 462);
this.tabPage3.TabIndex = 5;
this.tabPage3.Text = "实时信息";
this.tabPage3.UseVisualStyleBackColor = true;
//
// textBox1
//
this.textBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox1.Location = new System.Drawing.Point(3, 3);
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(988, 456);
this.textBox1.TabIndex = 0;
//
// FrmLine
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -684,6 +707,8 @@
this.statusStrip1.ResumeLayout(false);
this.statusStrip1.PerformLayout();
this.panel3.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
......@@ -758,6 +783,8 @@
private System.Windows.Forms.ToolStripStatusLabel lblContainerWarn;
private System.Windows.Forms.ToolStripStatusLabel lblMemory;
private System.Windows.Forms.ToolStripStatusLabel lblCPU;
private System.Windows.Forms.TabPage tabPage3;
private System.Windows.Forms.TextBox textBox1;
}
}
source/AssemblyLineClient/FrmLine.cs
......@@ -472,6 +472,9 @@ namespace OnlineStore.AssemblyLine
SetMenuS(复位RToolStripMenuItem, false);
SetMenuS(停止TToolStripMenuItem, false);
}
textBox1.Text = $"从AGV获取的信息:{LineManager.RobotInfo}\r\n" +
$"上报的信息：{LineManager.UploadInfo}\r\n" +
$"位置信息:{LineManager.posInfo}";
}
catch { }
finally
......
source/DeviceLibrary/lineManager/ALineManager.cs
......@@ -232,11 +232,16 @@ namespace OnlineStore.DeviceLibrary
return false;
}
static Dictionary<string, List<Point>> AgvPoints = new Dictionary<string, List<Point>>();
static string posInfo = "";
public static string posInfo = "";
public static string RobotInfo = "";
public static string UploadInfo = "";
public static void UploadAGVStatus(RobotStates robotStates)
{
try
{
RobotInfo = JsonHelper.SerializeObject(robotStates);
int errorX = ConfigHelper.Config.Get("errorPosX", 1000);
int errorY = ConfigHelper.Config.Get("errorPosY", 1000);
if (robotStates != null && robotStates.robots != null)
{
List<AgvStatus> agvs = new List<AgvStatus>();
......@@ -249,7 +254,8 @@ namespace OnlineStore.DeviceLibrary
status.type = j + 1;
foreach (var key in AgvPoints.Keys)
{
var find = AgvPoints[key].Find(s => s.X.Equals(item.positionX) && s.Y.Equals(item.positionY));
var find = AgvPoints[key].Find(s => (s.X - errorX <= item.positionX && s.X + errorX >= item.positionX)
&& (s.Y - errorY <= item.positionY && s.Y + errorY >= item.positionY));
if (find != null && find.X != 0 && find.Y != 0)
{
status.loc = key;
......@@ -262,9 +268,10 @@ namespace OnlineStore.DeviceLibrary
}
agvs.Add(status);
}
UploadInfo = JsonHelper.SerializeObject(agvs);
SServerManager.UpdateAgvStatus(agvs);
StringBuilder sb = new StringBuilder();
robotStates.robots.ForEach(s => sb.Append($"{s.robotCode} 当前位置:{s.positionX},{s.positionY}"));
robotStates.robots.ForEach(s => sb.Append($" {s.robotCode} [{s.energyLevel}]当前位置:{s.positionX},{s.positionY};"));
string curPosInfo = sb.ToString();
if (!posInfo.Equals(curPosInfo))
{
......
source/DeviceLibrary/lineManager/SServerManager.cs
......@@ -424,7 +424,7 @@ namespace OnlineStore.DeviceLibrary
/// <param name="status">状态</param>
/// <param name="locInfo">位置</param>
/// <returns></returns>
public static bool UpdateLocInfo(string deviceName, string barcode, string status, string locInfo ,out bool canRemove,out string msg)
public static bool UpdateLocInfo(string deviceName, string barcode, string status, string locInfo, out bool canRemove, out string msg)
{
msg = "";
canRemove = false;
......@@ -448,7 +448,7 @@ namespace OnlineStore.DeviceLibrary
string server = GetAddr(Addr_UpdateLocInfo, paramMap);
DateTime startTime = DateTime.Now;
string resultStr = HttpHelper.Get(server);
msg=("UpdateTrayLoc " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
msg = ("UpdateTrayLoc " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
// 返回: { "code": 0, "msg":"ok", "data":""}
ServerData serverResult = JsonHelper.DeserializeJsonToObject<ServerData>(resultStr);
if (serverResult == null)
......@@ -460,14 +460,14 @@ namespace OnlineStore.DeviceLibrary
{
canRemove = true;
// code: 0为正常,其他为异常, msg: 消息, data: 为空
// msg = deviceName + " UpdateTrayLoc 任务已完成【" + barcode + "】【" + status + "】【" + locInfo + "】 ：" + "【" + serverResult.code + "】" + serverResult.msg;
// msg = deviceName + " UpdateTrayLoc 任务已完成【" + barcode + "】【" + status + "】【" + locInfo + "】 ：" + "【" + serverResult.code + "】" + serverResult.msg;
//LogUtil.info(msg);
return true;
}
else if (serverResult.code.Equals(0).Equals(true))
{
// code: 0为正常,其他为异常, msg: 消息, data: 为空
// msg = deviceName + " UpdateTrayLoc【" + barcode + "】【" + status + "】【" + locInfo + "】 ：" + "【" + serverResult.code + "】" + serverResult.msg;
// msg = deviceName + " UpdateTrayLoc【" + barcode + "】【" + status + "】【" + locInfo + "】 ：" + "【" + serverResult.code + "】" + serverResult.msg;
// LogUtil.info(msg);
return true;
}
......@@ -531,7 +531,7 @@ namespace OnlineStore.DeviceLibrary
{
try
{
if(agvStatuses==null || agvStatuses.Count==0)
if (agvStatuses == null || agvStatuses.Count == 0)
{
LogUtil.error($"UpdateAgvStatus 无信息");
return false;
......@@ -542,10 +542,14 @@ namespace OnlineStore.DeviceLibrary
string content = JsonHelper.SerializeObject(agvStatuses);
string json = HttpHelper.Post(server, content);
ServerData rtnData = JsonHelper.DeserializeJsonToObject<ServerData>(json);
if(!agvStr.Equals(json))
if (string.IsNullOrEmpty(json))
{
LogUtil.error($"UpdateAgvStatus【{content}】【{json}】");
}
else if (!agvStr.Equals(content))
{
LogUtil.info($"UpdateAgvStatus【{content}】【{json}】");
agvStr = json;
agvStr = content;
}
if (rtnData != null && rtnData.code == 0)
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!