From 1a1d68a9680326f99dad9688dda8a7c93483c658 Mon Sep 17 00:00:00 2001 From: lhiven <236881222@qq.com> Date: Mon, 11 Dec 2023 17:20:07 +0900 Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A0=8F=E5=A2=9E=E5=8A=A0Ru?= =?UTF-8?q?nState/=E6=8E=92=E6=96=99=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E3=80=81=E5=91=A8=E8=BD=AC=E6=B5=81=E7=A8=8B=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Rs.SkyLine/Home.cs | 14 +++++++ Rs.SkyLine/Home.designer.cs | 82 ++++++++++++++++++++++++++++++++++--- 2 files changed, 90 insertions(+), 6 deletions(-) diff --git a/Rs.SkyLine/Home.cs b/Rs.SkyLine/Home.cs index 7c24d2b..6b35a8c 100644 --- a/Rs.SkyLine/Home.cs +++ b/Rs.SkyLine/Home.cs @@ -244,6 +244,20 @@ namespace Rs.MotionPlat { if(MachineManage.Instance.MachineStatus.ToString()!=lblMachineState.Text) lblMachineState.Text=MachineManage.Instance.MachineStatus.ToString(); + if(MachineManage.Instance.GetLoadUnloadStatus().ToString() != lblRunState.Text.Replace("RunState:","")) + { + lblRunState.Text = "RunState:" + MachineManage.Instance.GetLoadUnloadStatus().ToString(); + } + if(DischargeFlow.Instance.GetCurStep().ToString()!=lblDischargeFlow.Text.Replace("Discharge:","")) + { + lblDischargeFlow.Text = "Discharge:"+DischargeFlow.Instance.GetCurStep().ToString(); + } + + if (TurnoverFlow.Instance.GetStep().ToString() != lblTurnoverFlow.Text.Replace("Turnover:", "")) + { + if (TurnoverFlow.Instance.GetStep().ToString() != lblTurnoverFlow.Text.Replace("Turnover:", "")) + lblTurnoverFlow.Text = "Turnover:" + TurnoverFlow.Instance.GetStep().ToString(); + } } public override bool WindowsClose() diff --git a/Rs.SkyLine/Home.designer.cs b/Rs.SkyLine/Home.designer.cs index f4779b0..a08a20e 100644 --- a/Rs.SkyLine/Home.designer.cs +++ b/Rs.SkyLine/Home.designer.cs @@ -41,6 +41,7 @@ this.btnRecipe = new Rs.Controls.ButtonEx(); this.panel1 = new System.Windows.Forms.Panel(); this.panelEx2 = new Rs.Controls.PanelEx(); + this.lblRunState = new System.Windows.Forms.Label(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label1 = new System.Windows.Forms.Label(); this.lblMachineState = new System.Windows.Forms.Label(); @@ -48,11 +49,18 @@ this.panel2 = new System.Windows.Forms.Panel(); this.lblVersion = new System.Windows.Forms.Label(); this.timer1 = new System.Windows.Forms.Timer(this.components); + this.panel3 = new System.Windows.Forms.Panel(); + this.lblDischargeFlow = new System.Windows.Forms.Label(); + this.panel4 = new System.Windows.Forms.Panel(); + this.lblTurnoverFlow = new System.Windows.Forms.Label(); this.tableLayoutPanel2.SuspendLayout(); this.panel1.SuspendLayout(); + this.panelEx2.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); this.panelEx1.SuspendLayout(); this.panel2.SuspendLayout(); + this.panel3.SuspendLayout(); + this.panel4.SuspendLayout(); this.SuspendLayout(); // // panel_main @@ -279,6 +287,8 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(46)))), ((int)(((byte)(46)))), ((int)(((byte)(46))))); + this.panel1.Controls.Add(this.panel4); + this.panel1.Controls.Add(this.panel3); this.panel1.Controls.Add(this.panelEx2); this.panel1.Controls.Add(this.tableLayoutPanel3); this.panel1.Controls.Add(this.panelEx1); @@ -290,12 +300,24 @@ // // panelEx2 // + this.panelEx2.Controls.Add(this.lblRunState); this.panelEx2.Dock = System.Windows.Forms.DockStyle.Left; - this.panelEx2.Location = new System.Drawing.Point(158, 0); + this.panelEx2.Location = new System.Drawing.Point(166, 0); this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(286, 33); + this.panelEx2.Size = new System.Drawing.Size(165, 33); this.panelEx2.TabIndex = 2; // + // lblRunState + // + this.lblRunState.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblRunState.ForeColor = System.Drawing.Color.White; + this.lblRunState.Location = new System.Drawing.Point(0, 0); + this.lblRunState.Name = "lblRunState"; + this.lblRunState.Size = new System.Drawing.Size(165, 33); + this.lblRunState.TabIndex = 2; + this.lblRunState.Text = "RunState:"; + this.lblRunState.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // tableLayoutPanel3 // this.tableLayoutPanel3.ColumnCount = 2; @@ -308,7 +330,7 @@ this.tableLayoutPanel3.Name = "tableLayoutPanel3"; this.tableLayoutPanel3.RowCount = 1; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(158, 33); + this.tableLayoutPanel3.Size = new System.Drawing.Size(166, 33); this.tableLayoutPanel3.TabIndex = 1; // // label1 @@ -317,7 +339,7 @@ this.label1.ForeColor = System.Drawing.Color.White; this.label1.Location = new System.Drawing.Point(3, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(41, 33); + this.label1.Size = new System.Drawing.Size(43, 33); this.label1.TabIndex = 0; this.label1.Text = "State:"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -326,9 +348,9 @@ // this.lblMachineState.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMachineState.ForeColor = System.Drawing.Color.White; - this.lblMachineState.Location = new System.Drawing.Point(50, 0); + this.lblMachineState.Location = new System.Drawing.Point(52, 0); this.lblMachineState.Name = "lblMachineState"; - this.lblMachineState.Size = new System.Drawing.Size(105, 33); + this.lblMachineState.Size = new System.Drawing.Size(111, 33); this.lblMachineState.TabIndex = 1; this.lblMachineState.Text = "Noinit"; this.lblMachineState.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -366,6 +388,46 @@ this.timer1.Interval = 300; this.timer1.Tick += new System.EventHandler(this.timer1_Tick); // + // panel3 + // + this.panel3.Controls.Add(this.lblDischargeFlow); + this.panel3.Dock = System.Windows.Forms.DockStyle.Left; + this.panel3.Location = new System.Drawing.Point(331, 0); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(215, 33); + this.panel3.TabIndex = 3; + // + // lblDischargeFlow + // + this.lblDischargeFlow.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblDischargeFlow.ForeColor = System.Drawing.Color.White; + this.lblDischargeFlow.Location = new System.Drawing.Point(0, 0); + this.lblDischargeFlow.Name = "lblDischargeFlow"; + this.lblDischargeFlow.Size = new System.Drawing.Size(215, 33); + this.lblDischargeFlow.TabIndex = 3; + this.lblDischargeFlow.Text = "Discharge:"; + this.lblDischargeFlow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // panel4 + // + this.panel4.Controls.Add(this.lblTurnoverFlow); + this.panel4.Dock = System.Windows.Forms.DockStyle.Left; + this.panel4.Location = new System.Drawing.Point(546, 0); + this.panel4.Name = "panel4"; + this.panel4.Size = new System.Drawing.Size(215, 33); + this.panel4.TabIndex = 4; + // + // lblTurnoverFlow + // + this.lblTurnoverFlow.Dock = System.Windows.Forms.DockStyle.Fill; + this.lblTurnoverFlow.ForeColor = System.Drawing.Color.White; + this.lblTurnoverFlow.Location = new System.Drawing.Point(0, 0); + this.lblTurnoverFlow.Name = "lblTurnoverFlow"; + this.lblTurnoverFlow.Size = new System.Drawing.Size(215, 33); + this.lblTurnoverFlow.TabIndex = 3; + this.lblTurnoverFlow.Text = "Turnover:"; + this.lblTurnoverFlow.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // Home // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -384,9 +446,12 @@ this.Controls.SetChildIndex(this.panel_main, 0); this.tableLayoutPanel2.ResumeLayout(false); this.panel1.ResumeLayout(false); + this.panelEx2.ResumeLayout(false); this.tableLayoutPanel3.ResumeLayout(false); this.panelEx1.ResumeLayout(false); this.panel2.ResumeLayout(false); + this.panel3.ResumeLayout(false); + this.panel4.ResumeLayout(false); this.ResumeLayout(false); } @@ -412,5 +477,10 @@ private Controls.PanelEx panelEx2; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Label lblVersion; + private System.Windows.Forms.Label lblRunState; + private System.Windows.Forms.Panel panel4; + private System.Windows.Forms.Label lblTurnoverFlow; + private System.Windows.Forms.Panel panel3; + private System.Windows.Forms.Label lblDischargeFlow; } } \ No newline at end of file