From 3be4b185d6398172ca457df2066762bebfc6f6b4 Mon Sep 17 00:00:00 2001 From: TD Date: Thu, 27 Mar 2025 15:11:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4UPH=20=E5=87=86=E5=A4=87?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DH.Devices.PLC/XinJEPLCTcpNet.cs | 13 +- DHSoftware/MainWindow.Designer.cs | 533 +++++++++++++++--------------- DHSoftware/MainWindow.cs | 37 ++- DHSoftware/MainWindow.resx | 4 +- 4 files changed, 309 insertions(+), 278 deletions(-) diff --git a/DH.Devices.PLC/XinJEPLCTcpNet.cs b/DH.Devices.PLC/XinJEPLCTcpNet.cs index 820831f..1444366 100644 --- a/DH.Devices.PLC/XinJEPLCTcpNet.cs +++ b/DH.Devices.PLC/XinJEPLCTcpNet.cs @@ -593,7 +593,7 @@ namespace DH.Devices.PLC if (pLCItem == null) return; - WriteBool(pLCItem.Name, true); + WriteBool(pLCItem.Address, true); await Task.Delay(900); // 非阻塞，等待1秒 } } @@ -693,7 +693,16 @@ namespace DH.Devices.PLC TurnStart(true); } - + public void CloseProcess() + { + StatusReset(); + VisionPos(false); + CountToZero(); + TurnStart(false); + TurnEnable(false); + OpenHeartbeat(false); + PLCDisConnect(); + } public void InitProcessAction() => ProcessAction(ConfigModel.GlobalList?.FirstOrDefault()?.InitProcessList?.ToList() ?? new List()); diff --git a/DHSoftware/MainWindow.Designer.cs b/DHSoftware/MainWindow.Designer.cs index 4336cd6..4101135 100644 --- a/DHSoftware/MainWindow.Designer.cs +++ b/DHSoftware/MainWindow.Designer.cs @@ -28,8 +28,8 @@ /// private void InitializeComponent() { - AntdUI.Tabs.StyleCard styleCard3 = new AntdUI.Tabs.StyleCard(); - AntdUI.Tabs.StyleCard styleCard4 = new AntdUI.Tabs.StyleCard(); + AntdUI.Tabs.StyleLine styleLine2 = new AntdUI.Tabs.StyleLine(); + AntdUI.Tabs.StyleCard styleCard2 = new AntdUI.Tabs.StyleCard(); AntdUI.SegmentedItem segmentedItem6 = new AntdUI.SegmentedItem(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); AntdUI.SegmentedItem segmentedItem7 = new AntdUI.SegmentedItem(); @@ -37,23 +37,37 @@ AntdUI.SegmentedItem segmentedItem9 = new AntdUI.SegmentedItem(); AntdUI.SegmentedItem segmentedItem10 = new AntdUI.SegmentedItem(); titlebar = new AntdUI.PageHeader(); - tabsStas=new AntdUI.Tabs(); - tabPage3=new AntdUI.TabPage(); lbName = new AntdUI.Label(); + tabsStas = new AntdUI.Tabs(); + tabPage3 = new AntdUI.TabPage(); + panel7 = new Panel(); + panel5 = new Panel(); + lblNowtime = new Label(); + label8 = new Label(); + lblstarttime = new Label(); + label6 = new Label(); + lblUPH = new Label(); + label4 = new Label(); + lblNum = new Label(); + label2 = new Label(); pageHeader1 = new AntdUI.PageHeader(); labuph = new Label(); - tabMain=new AntdUI.TabPage(); divider2 = new AntdUI.Divider(); + tabMain = new AntdUI.TabPage(); panelmain = new AntdUI.Panel(); panel2 = new AntdUI.Panel(); - panel4 = new AntdUI.Panel(); - panel6 = new AntdUI.Panel(); - splitContainer1 = new SplitContainer(); - splitContainer2 = new SplitContainer(); tabImgDisplay = new AntdUI.Tabs(); + panel4 = new AntdUI.Panel(); richTextBox1 = new RichTextBox(); - tabsConfig = new AntdUI.Tabs(); - tabPage2 = new AntdUI.TabPage(); + panel6 = new AntdUI.Panel(); + lblNum2 = new Label(); + label12 = new Label(); + lblNowtime2 = new Label(); + label10 = new Label(); + lblstarttime2 = new Label(); + label7 = new Label(); + lblUPH2 = new Label(); + label1 = new Label(); panel1 = new AntdUI.Panel(); panel3 = new AntdUI.Panel(); btnDeleteProject = new AntdUI.Button(); @@ -61,35 +75,17 @@ btnLoadProject = new AntdUI.Button(); sltProjects = new AntdUI.Select(); segmented1 = new AntdUI.Segmented(); - panel5 = new Panel(); - panel7 = new Panel(); - label2 = new Label(); - lblNum = new Label(); - lblUPH = new Label(); - label4 = new Label(); - lblstarttime = new Label(); - label6 = new Label(); - lblNowtime = new Label(); - label8 = new Label(); titlebar.SuspendLayout(); + tabsStas.SuspendLayout(); + tabPage3.SuspendLayout(); + panel5.SuspendLayout(); pageHeader1.SuspendLayout(); panelmain.SuspendLayout(); panel2.SuspendLayout(); panel4.SuspendLayout(); panel6.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)splitContainer1).BeginInit(); - splitContainer1.Panel1.SuspendLayout(); - splitContainer1.Panel2.SuspendLayout(); - splitContainer1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)splitContainer2).BeginInit(); - splitContainer2.Panel1.SuspendLayout(); - splitContainer2.Panel2.SuspendLayout(); - splitContainer2.SuspendLayout(); - tabsConfig.SuspendLayout(); panel1.SuspendLayout(); panel3.SuspendLayout(); - panel5.SuspendLayout(); - panel7.SuspendLayout(); SuspendLayout(); // // titlebar @@ -122,6 +118,123 @@ lbName.Text = ""; lbName.TextAlign = ContentAlignment.MiddleRight; // + // tabsStas + // + tabsStas.Dock = DockStyle.Fill; + tabsStas.Location = new Point(0, 0); + tabsStas.Name = "tabsStas"; + tabsStas.Pages.Add(tabPage3); + tabsStas.Size = new Size(580, 176); + tabsStas.Style = styleLine2; + tabsStas.TabIndex = 3; + tabsStas.Text = "tabs3"; + // + // tabPage3 + // + tabPage3.Controls.Add(panel7); + tabPage3.Controls.Add(panel5); + tabPage3.Location = new Point(3, 3); + tabPage3.Name = "tabPage3"; + tabPage3.Size = new Size(574, 170); + tabPage3.TabIndex = 0; + tabPage3.Text = "日志"; + // + // panel7 + // + panel7.Dock = DockStyle.Fill; + panel7.Location = new Point(0, 0); + panel7.Name = "panel7"; + panel7.Size = new Size(374, 170); + panel7.TabIndex = 2; + // + // panel5 + // + panel5.Controls.Add(lblNowtime); + panel5.Controls.Add(label8); + panel5.Controls.Add(lblstarttime); + panel5.Controls.Add(label6); + panel5.Controls.Add(lblUPH); + panel5.Controls.Add(label4); + panel5.Controls.Add(lblNum); + panel5.Controls.Add(label2); + panel5.Dock = DockStyle.Right; + panel5.Location = new Point(374, 0); + panel5.Name = "panel5"; + panel5.Size = new Size(200, 170); + panel5.TabIndex = 1; + // + // lblNowtime + // + lblNowtime.AutoSize = true; + lblNowtime.Location = new Point(69, 41); + lblNowtime.Name = "lblNowtime"; + lblNowtime.Size = new Size(15, 17); + lblNowtime.TabIndex = 7; + lblNowtime.Text = "0"; + // + // label8 + // + label8.AutoSize = true; + label8.Location = new Point(7, 41); + label8.Name = "label8"; + label8.Size = new Size(56, 17); + label8.TabIndex = 6; + label8.Text = "此刻时间"; + // + // lblstarttime + // + lblstarttime.AutoSize = true; + lblstarttime.Location = new Point(69, 15); + lblstarttime.Name = "lblstarttime"; + lblstarttime.Size = new Size(15, 17); + lblstarttime.TabIndex = 5; + lblstarttime.Text = "0"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new Point(7, 15); + label6.Name = "label6"; + label6.Size = new Size(56, 17); + label6.TabIndex = 4; + label6.Text = "开始时间"; + // + // lblUPH + // + lblUPH.AutoSize = true; + lblUPH.Location = new Point(70, 105); + lblUPH.Name = "lblUPH"; + lblUPH.Size = new Size(15, 17); + lblUPH.TabIndex = 3; + lblUPH.Text = "0"; + // + // label4 + // + label4.AutoSize = true; + label4.Location = new Point(7, 105); + label4.Name = "label4"; + label4.Size = new Size(33, 17); + label4.TabIndex = 2; + label4.Text = "UPH"; + // + // lblNum + // + lblNum.AutoSize = true; + lblNum.Location = new Point(70, 75); + lblNum.Name = "lblNum"; + lblNum.Size = new Size(15, 17); + lblNum.TabIndex = 1; + lblNum.Text = "0"; + // + // label2 + // + label2.AutoSize = true; + label2.Location = new Point(7, 75); + label2.Name = "label2"; + label2.Size = new Size(32, 17); + label2.TabIndex = 0; + label2.Text = "总数"; + // // pageHeader1 // pageHeader1.Controls.Add(labuph); @@ -154,9 +267,18 @@ divider2.TabIndex = 0; divider2.Text = ""; // + // tabMain + // + tabMain.Location = new Point(3, 28); + tabMain.Name = "tabMain"; + tabMain.Size = new Size(574, 289); + tabMain.TabIndex = 0; + tabMain.Text = "检测"; + // // panelmain // panelmain.Controls.Add(panel2); + panelmain.Controls.Add(panel4); panelmain.Controls.Add(panel1); panelmain.Dock = DockStyle.Fill; panelmain.Location = new Point(0, 40); @@ -167,139 +289,132 @@ // // panel2 // - panel2.Controls.Add(panel4); + panel2.Controls.Add(tabImgDisplay); panel2.Dock = DockStyle.Fill; panel2.Location = new Point(0, 68); panel2.Name = "panel2"; - panel2.Size = new Size(1024, 500); - panel2.TabIndex = 1; + panel2.Size = new Size(1024, 388); + panel2.TabIndex = 3; panel2.Text = "panel2"; // - // panel4 - // - panel4.Controls.Add(panel6); - panel4.Dock = DockStyle.Fill; - panel4.Location = new Point(0, 0); - panel4.Name = "panel4"; - panel4.Size = new Size(1024, 500); - panel4.TabIndex = 1; - panel4.Text = "panel4"; - // - // panel6 - // - panel6.Controls.Add(splitContainer1); - panel6.Dock = DockStyle.Fill; - panel6.Location = new Point(0, 0); - panel6.Name = "panel6"; - panel6.Size = new Size(1024, 500); - panel6.TabIndex = 1; - panel6.Text = "panel6"; - // - // splitContainer1 - // - splitContainer1.BackColor = SystemColors.Control; - splitContainer1.Dock = DockStyle.Fill; - splitContainer1.Location = new Point(0, 0); - splitContainer1.Name = "splitContainer1"; - // - // splitContainer1.Panel1 - // - splitContainer1.Panel1.Controls.Add(splitContainer2); - // - // splitContainer1.Panel2 - // - splitContainer1.Panel2.BackColor = SystemColors.ButtonFace; - splitContainer1.Panel2.Controls.Add(tabsConfig); - splitContainer1.Size = new Size(1024, 500); - splitContainer1.SplitterDistance = 606; - splitContainer1.SplitterIncrement = 2; - splitContainer1.SplitterWidth = 10; - splitContainer1.TabIndex = 0; - // - // splitContainer2 - // - splitContainer2.Dock = DockStyle.Fill; - splitContainer2.Location = new Point(0, 0); - splitContainer2.Name = "splitContainer2"; - splitContainer2.Orientation = Orientation.Horizontal; - // - // splitContainer2.Panel1 - // - splitContainer2.Panel1.Controls.Add(tabImgDisplay); - // - // splitContainer2.Panel2 - // - splitContainer2.Panel2.Controls.Add(richTextBox1); - splitContainer2.Size = new Size(606, 500); - splitContainer2.SplitterDistance = 320; - splitContainer2.TabIndex = 0; - // // tabImgDisplay // tabImgDisplay.Dock = DockStyle.Fill; tabImgDisplay.Location = new Point(0, 0); tabImgDisplay.Name = "tabImgDisplay"; - tabImgDisplay.Size = new Size(606, 320); - tabImgDisplay.Style = styleCard3; - tabImgDisplay.TabIndex = 1; + tabImgDisplay.Size = new Size(1024, 388); + tabImgDisplay.Style = styleCard2; + tabImgDisplay.TabIndex = 3; tabImgDisplay.Text = "tabs1"; // - // tabMain + // panel4 // - tabMain.Location = new Point(3, 28); - tabMain.Name = "tabMain"; - tabMain.Size = new Size(574, 289); - tabMain.TabIndex = 0; - tabMain.Text = "检测"; - // - // tabsStas - // - tabsStas.Dock = DockStyle.Fill; - tabsStas.Location = new Point(0, 0); - tabsStas.Name = "tabsStas"; - tabsStas.Pages.Add(tabPage3); - tabsStas.Size = new Size(580, 176); - tabsStas.TabIndex = 3; - tabsStas.Text = "tabs3"; - // - // tabPage3 - // - tabPage3.Controls.Add(panel7); - tabPage3.Controls.Add(panel5); - tabPage3.Location = new Point(3, 28); - tabPage3.Name = "tabPage3"; - tabPage3.Size = new Size(574, 145); - tabPage3.TabIndex = 0; - tabPage3.Text = "日志"; + panel4.Controls.Add(richTextBox1); + panel4.Controls.Add(panel6); + panel4.Dock = DockStyle.Bottom; + panel4.Location = new Point(0, 456); + panel4.Name = "panel4"; + panel4.Size = new Size(1024, 112); + panel4.TabIndex = 2; + panel4.Text = "panel4"; // // richTextBox1 // richTextBox1.Dock = DockStyle.Fill; richTextBox1.Location = new Point(0, 0); richTextBox1.Name = "richTextBox1"; - richTextBox1.Size = new Size(374, 145); - richTextBox1.TabIndex = 0; + richTextBox1.Size = new Size(719, 112); + richTextBox1.TabIndex = 1; richTextBox1.Text = ""; - richTextBox1.TextChanged += richTextBox1_TextChanged; // - // tabsConfig + // panel6 // - tabsConfig.Dock = DockStyle.Fill; - tabsConfig.Location = new Point(0, 0); - tabsConfig.Name = "tabsConfig"; - tabsConfig.Pages.Add(tabPage2); - tabsConfig.Size = new Size(408, 500); - tabsConfig.Style = styleCard4; - tabsConfig.TabIndex = 2; - tabsConfig.Text = "tabs2"; + panel6.Controls.Add(lblNum2); + panel6.Controls.Add(label12); + panel6.Controls.Add(lblNowtime2); + panel6.Controls.Add(label10); + panel6.Controls.Add(lblstarttime2); + panel6.Controls.Add(label7); + panel6.Controls.Add(lblUPH2); + panel6.Controls.Add(label1); + panel6.Dock = DockStyle.Right; + panel6.Location = new Point(719, 0); + panel6.Name = "panel6"; + panel6.Size = new Size(305, 112); + panel6.TabIndex = 0; + panel6.Text = "panel6"; // - // tabPage2 + // lblNum2 // - tabPage2.Location = new Point(3, 28); - tabPage2.Name = "tabPage2"; - tabPage2.Size = new Size(402, 469); - tabPage2.TabIndex = 0; - tabPage2.Text = "配置"; + lblNum2.AutoSize = true; + lblNum2.Location = new Point(68, 92); + lblNum2.Name = "lblNum2"; + lblNum2.Size = new Size(15, 17); + lblNum2.TabIndex = 7; + lblNum2.Text = "0"; + // + // label12 + // + label12.AutoSize = true; + label12.Location = new Point(6, 92); + label12.Name = "label12"; + label12.Size = new Size(44, 17); + label12.TabIndex = 6; + label12.Text = "总计数"; + // + // lblNowtime2 + // + lblNowtime2.AutoSize = true; + lblNowtime2.Location = new Point(68, 68); + lblNowtime2.Name = "lblNowtime2"; + lblNowtime2.Size = new Size(15, 17); + lblNowtime2.TabIndex = 5; + lblNowtime2.Text = "0"; + // + // label10 + // + label10.AutoSize = true; + label10.Location = new Point(6, 68); + label10.Name = "label10"; + label10.Size = new Size(56, 17); + label10.TabIndex = 4; + label10.Text = "运行时间"; + // + // lblstarttime2 + // + lblstarttime2.AutoSize = true; + lblstarttime2.Location = new Point(68, 37); + lblstarttime2.Name = "lblstarttime2"; + lblstarttime2.Size = new Size(15, 17); + lblstarttime2.TabIndex = 3; + lblstarttime2.Text = "0"; + // + // label7 + // + label7.AutoSize = true; + label7.Location = new Point(6, 37); + label7.Name = "label7"; + label7.Size = new Size(56, 17); + label7.TabIndex = 2; + label7.Text = "开始时间"; + // + // lblUPH2 + // + lblUPH2.AutoSize = true; + lblUPH2.Location = new Point(68, 11); + lblUPH2.Name = "lblUPH2"; + lblUPH2.Size = new Size(15, 17); + lblUPH2.TabIndex = 1; + lblUPH2.Text = "0"; + // + // label1 + // + label1.AutoSize = true; + label1.Location = new Point(6, 11); + label1.Name = "label1"; + label1.Size = new Size(33, 17); + label1.TabIndex = 0; + label1.Text = "UPH"; // // panel1 // @@ -445,103 +560,6 @@ segmented1.Text = "segmented1"; segmented1.SelectIndexChanged += segmented1_SelectIndexChanged; // - // panel5 - // - panel5.Controls.Add(lblNowtime); - panel5.Controls.Add(label8); - panel5.Controls.Add(lblstarttime); - panel5.Controls.Add(label6); - panel5.Controls.Add(lblUPH); - panel5.Controls.Add(label4); - panel5.Controls.Add(lblNum); - panel5.Controls.Add(label2); - panel5.Dock = DockStyle.Right; - panel5.Location = new Point(374, 0); - panel5.Name = "panel5"; - panel5.Size = new Size(200, 145); - panel5.TabIndex = 1; - // - // panel7 - // - panel7.Controls.Add(richTextBox1); - panel7.Dock = DockStyle.Fill; - panel7.Location = new Point(0, 0); - panel7.Name = "panel7"; - panel7.Size = new Size(374, 145); - panel7.TabIndex = 2; - // - // label2 - // - label2.AutoSize = true; - label2.Location = new Point(7, 75); - label2.Name = "label2"; - label2.Size = new Size(32, 17); - label2.TabIndex = 0; - label2.Text = "总数"; - // - // lblNum - // - lblNum.AutoSize = true; - lblNum.Location = new Point(70, 75); - lblNum.Name = "lblNum"; - lblNum.Size = new Size(15, 17); - lblNum.TabIndex = 1; - lblNum.Text = "0"; - // - // lblUPH - // - lblUPH.AutoSize = true; - lblUPH.Location = new Point(70, 105); - lblUPH.Name = "lblUPH"; - lblUPH.Size = new Size(15, 17); - lblUPH.TabIndex = 3; - lblUPH.Text = "0"; - // - // label4 - // - label4.AutoSize = true; - label4.Location = new Point(7, 105); - label4.Name = "label4"; - label4.Size = new Size(33, 17); - label4.TabIndex = 2; - label4.Text = "UPH"; - // - // lblstarttime - // - lblstarttime.AutoSize = true; - lblstarttime.Location = new Point(69, 15); - lblstarttime.Name = "lblstarttime"; - lblstarttime.Size = new Size(15, 17); - lblstarttime.TabIndex = 5; - lblstarttime.Text = "0"; - // - // label6 - // - label6.AutoSize = true; - label6.Location = new Point(7, 15); - label6.Name = "label6"; - label6.Size = new Size(56, 17); - label6.TabIndex = 4; - label6.Text = "开始时间"; - // - // lblNowtime - // - lblNowtime.AutoSize = true; - lblNowtime.Location = new Point(69, 41); - lblNowtime.Name = "lblNowtime"; - lblNowtime.Size = new Size(15, 17); - lblNowtime.TabIndex = 7; - lblNowtime.Text = "0"; - // - // label8 - // - label8.AutoSize = true; - label8.Location = new Point(7, 41); - label8.Name = "label8"; - label8.Size = new Size(56, 17); - label8.TabIndex = 6; - label8.Text = "此刻时间"; - // // MainWindow // ClientSize = new Size(1024, 648); @@ -558,26 +576,19 @@ FormClosing += MainWindow_FormClosing; Load += MainWindow_Load; titlebar.ResumeLayout(false); + tabsStas.ResumeLayout(false); + tabPage3.ResumeLayout(false); + panel5.ResumeLayout(false); + panel5.PerformLayout(); pageHeader1.ResumeLayout(false); pageHeader1.PerformLayout(); panelmain.ResumeLayout(false); panel2.ResumeLayout(false); panel4.ResumeLayout(false); panel6.ResumeLayout(false); - splitContainer1.Panel1.ResumeLayout(false); - splitContainer1.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)splitContainer1).EndInit(); - splitContainer1.ResumeLayout(false); - splitContainer2.Panel1.ResumeLayout(false); - splitContainer2.Panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)splitContainer2).EndInit(); - splitContainer2.ResumeLayout(false); - tabsConfig.ResumeLayout(false); + panel6.PerformLayout(); panel1.ResumeLayout(false); panel3.ResumeLayout(false); - panel5.ResumeLayout(false); - panel5.PerformLayout(); - panel7.ResumeLayout(false); ResumeLayout(false); } @@ -589,16 +600,9 @@ private AntdUI.Panel panelmain; private AntdUI.Panel panel1; private AntdUI.Segmented segmented1; - private AntdUI.Panel panel2; - private AntdUI.Panel panel4; - private AntdUI.Panel panel6; private Label labuph; private AntdUI.Splitter splitter1; - private SplitContainer splitContainer1; - private SplitContainer splitContainer2; - private AntdUI.Tabs tabImgDisplay; - private AntdUI.Tabs tabsConfig; - private AntdUI.TabPage tabPage2; + private AntdUI.Label lbName; private AntdUI.Panel panel3; private AntdUI.Button btnDeleteProject; @@ -615,10 +619,21 @@ private Label label6; private Label lblUPH; private Label label4; - private RichTextBox richTextBox1; private AntdUI.TabPage tabPage3; private AntdUI.TabPage tabMain; private AntdUI.Tabs tabsStas; private Label label1; + private AntdUI.Panel panel2; + private AntdUI.Panel panel4; + private AntdUI.Tabs tabImgDisplay; + private RichTextBox richTextBox1; + private AntdUI.Panel panel6; + private Label lblUPH2; + private Label lblNum2; + private Label label12; + private Label lblNowtime2; + private Label label10; + private Label lblstarttime2; + private Label label7; } } \ No newline at end of file diff --git a/DHSoftware/MainWindow.cs b/DHSoftware/MainWindow.cs index ae52e31..5de03cd 100644 --- a/DHSoftware/MainWindow.cs +++ b/DHSoftware/MainWindow.cs @@ -322,10 +322,10 @@ namespace DHSoftware detectionConfig.ModelHeight = detection.ModelHeight; detectionConfig.In_lable_path = detection.In_lable_path; detectionConfig.IsEnabled = detection.IsEnabled; - detectionConfig.ShowLocation.X = (i + 1) % 5+ (i + 1) / 5; - // detectionConfig.ShowLocation.X = detection.ShowLocation.X; - detectionConfig.ShowLocation.Y = (i + 1) / 5+1; - // detectionConfig.ShowLocation.Y = detection.ShowLocation.Y; + detectionConfig.ShowLocation.X = (i + 1) % 5 + (i + 1) / 5; + // detectionConfig.ShowLocation.X = detection.ShowLocation.X; + detectionConfig.ShowLocation.Y = (i + 1) / 5 + 1; + // detectionConfig.ShowLocation.Y = detection.ShowLocation.Y; DetectionConfigs.Add(detectionConfig); } } @@ -513,7 +513,10 @@ namespace DHSoftware camera.CameraDisConnect(); } if (PLC != null) - PLC.PLCDisConnect(); + { + PLC.CloseProcess(); + } + CloseWindow.Instance.Close();// 关闭提示窗口 //Application.Exit(); System.Environment.Exit(0); @@ -582,12 +585,12 @@ namespace DHSoftware private void StartProcess() { - ProcessstartTime= DateTime.Now; - lblstarttime.Text = ProcessstartTime.ToString("yyyy-MM-dd HH:mm:ss"); + ProcessstartTime = DateTime.Now; + lblstarttime2.Text = ProcessstartTime.ToString("yyyy-MM-dd HH:mm:ss"); //计数清零 PieceCount = 0; - + if (PLC?.Enable == true) { PLC.OnNewPieces -= MainMotion_NewPieces; @@ -696,10 +699,10 @@ namespace DHSoftware - + } - + private uint PieceCount = 0; private List> _productLists = new List>(); private int ProductListMulti = 2; @@ -902,7 +905,7 @@ namespace DHSoftware product.ProductResult = product.ResultCollection.Any(u => u.ResultState != ResultState.OK) ? ResultState.B_NG : ResultState.OK; - if (product.ProductResult == ResultState.OK) + if (product.ProductResult == ResultState.OK) { PLC.Blowing(productNumber, 1); } @@ -1025,10 +1028,9 @@ namespace DHSoftware //UPM = (int)UPH / 60; this.BeginInvoke(new MethodInvoker(delegate () { - lblNowtime.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); - label1.Text = UPH.ToString(); - lblUPH.Text = UPH.ToString(); - lblNum.Text = ProductNum_Total.ToString(); + lblNowtime2.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + lblUPH2.Text = UPH.ToString(); + lblNum2.Text = ProductNum_Total.ToString(); labuph.Text = UPH.ToString(); })); } @@ -1061,5 +1063,10 @@ namespace DHSoftware { } + + private void splitContainer2_Panel1_Paint(object sender, PaintEventArgs e) + { + + } } } \ No newline at end of file diff --git a/DHSoftware/MainWindow.resx b/DHSoftware/MainWindow.resx index 8bed97b..ea83a3c 100644 --- a/DHSoftware/MainWindow.resx +++ b/DHSoftware/MainWindow.resx @@ -1,7 +1,7 @@