From 1da1f2de285b663d1fc73c2d17787cb9661d18f9 Mon Sep 17 00:00:00 2001 From: ChiKyun Kim Date: Thu, 29 Jan 2026 14:24:30 +0900 Subject: [PATCH] .. --- HMI/Project/Dialog/fSystem.cs | 2 +- HMI/Project/ViewForm/fAgv.Designer.cs | 48 +++++++++++++-------------- HMI/Project/fMain.cs | 3 ++ 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/HMI/Project/Dialog/fSystem.cs b/HMI/Project/Dialog/fSystem.cs index 7a2fa01..b02336d 100644 --- a/HMI/Project/Dialog/fSystem.cs +++ b/HMI/Project/Dialog/fSystem.cs @@ -99,7 +99,7 @@ namespace Project.Dialog private void fSystem_Load(object sender, EventArgs e) { - this.label1.Text = "Patch Version " + PUB.PatchVersion; + this.label1.Text = "Patch Version " + PUB.PatchVersion + $"IP:{PUB.IP}"; this.label2.Text = "HMI Version " + Application.ProductVersion.ToString(); } diff --git a/HMI/Project/ViewForm/fAgv.Designer.cs b/HMI/Project/ViewForm/fAgv.Designer.cs index 60ed884..1ef4359 100644 --- a/HMI/Project/ViewForm/fAgv.Designer.cs +++ b/HMI/Project/ViewForm/fAgv.Designer.cs @@ -30,11 +30,13 @@ { this.components = new System.ComponentModel.Container(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.rtSignal2 = new System.Windows.Forms.RichTextBox(); this.rtSystem0 = new System.Windows.Forms.RichTextBox(); this.rtSystem1 = new System.Windows.Forms.RichTextBox(); this.rtSignal1 = new System.Windows.Forms.RichTextBox(); this.rtError = new System.Windows.Forms.RichTextBox(); this.label1 = new System.Windows.Forms.Label(); + this.rtData = new System.Windows.Forms.RichTextBox(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.panel1 = new System.Windows.Forms.Panel(); this.button7 = new System.Windows.Forms.Button(); @@ -57,8 +59,6 @@ this.button13 = new System.Windows.Forms.Button(); this.button10 = new System.Windows.Forms.Button(); this.button16 = new System.Windows.Forms.Button(); - this.rtData = new System.Windows.Forms.RichTextBox(); - this.rtSignal2 = new System.Windows.Forms.RichTextBox(); this.tableLayoutPanel1.SuspendLayout(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -88,6 +88,16 @@ this.tableLayoutPanel1.Size = new System.Drawing.Size(1050, 461); this.tableLayoutPanel1.TabIndex = 6; // + // rtSignal2 + // + this.rtSignal2.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtSignal2.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.rtSignal2.Location = new System.Drawing.Point(527, 208); + this.rtSignal2.Name = "rtSignal2"; + this.rtSignal2.Size = new System.Drawing.Size(256, 199); + this.rtSignal2.TabIndex = 4; + this.rtSignal2.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n"; + // // rtSystem0 // this.rtSystem0.Dock = System.Windows.Forms.DockStyle.Fill; @@ -142,6 +152,16 @@ this.label1.Text = "label1"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // rtData + // + this.rtData.Dock = System.Windows.Forms.DockStyle.Fill; + this.rtData.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); + this.rtData.Location = new System.Drawing.Point(789, 208); + this.rtData.Name = "rtData"; + this.rtData.Size = new System.Drawing.Size(258, 199); + this.rtData.TabIndex = 3; + this.rtData.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n"; + // // timer1 // this.timer1.Interval = 200; @@ -149,11 +169,11 @@ // // panel1 // + this.panel1.Controls.Add(this.lbIP); this.panel1.Controls.Add(this.button7); this.panel1.Controls.Add(this.button6); this.panel1.Controls.Add(this.button5); this.panel1.Controls.Add(this.button17); - this.panel1.Controls.Add(this.lbIP); this.panel1.Controls.Add(this.button3); this.panel1.Controls.Add(this.button2); this.panel1.Controls.Add(this.button1); @@ -216,7 +236,7 @@ this.lbIP.ForeColor = System.Drawing.Color.White; this.lbIP.Location = new System.Drawing.Point(252, 0); this.lbIP.Name = "lbIP"; - this.lbIP.Size = new System.Drawing.Size(638, 58); + this.lbIP.Size = new System.Drawing.Size(318, 58); this.lbIP.TabIndex = 8; this.lbIP.Text = "000.000.000.000"; this.lbIP.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -393,26 +413,6 @@ this.button16.UseVisualStyleBackColor = true; this.button16.Click += new System.EventHandler(this.button16_Click); // - // rtData - // - this.rtData.Dock = System.Windows.Forms.DockStyle.Fill; - this.rtData.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.rtData.Location = new System.Drawing.Point(789, 208); - this.rtData.Name = "rtData"; - this.rtData.Size = new System.Drawing.Size(258, 199); - this.rtData.TabIndex = 3; - this.rtData.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n"; - // - // rtSignal2 - // - this.rtSignal2.Dock = System.Windows.Forms.DockStyle.Fill; - this.rtSignal2.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(2))); - this.rtSignal2.Location = new System.Drawing.Point(527, 208); - this.rtSignal2.Name = "rtSignal2"; - this.rtSignal2.Size = new System.Drawing.Size(256, 199); - this.rtSignal2.TabIndex = 4; - this.rtSignal2.Text = "test2\ntest3\nteat\nasdfjalsdf\nasdjfklasdfj\nkalsdjfalksdjfa\nsdjfklasdjfklasjdf\n"; - // // fAgv // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/HMI/Project/fMain.cs b/HMI/Project/fMain.cs index abe35b1..bff14eb 100644 --- a/HMI/Project/fMain.cs +++ b/HMI/Project/fMain.cs @@ -639,6 +639,9 @@ namespace Project private void btLog_Click(object sender, EventArgs e) { + if (PUB.log != null) + PUB.log.Flush(); + if (form_log == null || form_log.IsDisposed || form_log.Disposing) form_log = new Dialog.fLog();