From 0407bc1c92c7089d8aa2ffbee06019b7a3f7e358 Mon Sep 17 00:00:00 2001 From: "DESKTOP-999R8N3\\CJY" Date: Thu, 11 Apr 2024 15:20:20 +0900 Subject: [PATCH] =?UTF-8?q?=20-=20=ED=91=9C=EA=B7=B8=EB=9E=98=ED=94=84=20?= =?UTF-8?q?=20=20=201.=20=EA=B2=BD=EB=9F=89=20=EC=8B=9C=20=EB=B9=A8?= =?UTF-8?q?=EA=B0=95,=20=EA=B3=BC=EB=9F=89=20=EC=8B=9C=20=EB=85=B8?= =?UTF-8?q?=EB=9E=91=EC=83=89=EC=9C=BC=EB=A1=9C=20=ED=91=9C=EC=8B=9C=20=20?= =?UTF-8?q?=20=202.=20=ED=91=9C=EA=B7=B8=EB=9E=98=ED=94=84=20=EA=B8=80?= =?UTF-8?q?=EC=94=A8=20Tahoma=20->=20Arial?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ControlMainDisplayTable10.Designer.cs | 17 ++++++----------- .../Controls/ControlMainDisplayTable10.cs | 4 ++-- .../Controls/ControlMainDisplayTable12.cs | 4 ++-- INT69DC_7C/Controls/ControlMainDisplayTable7.cs | 4 ++-- INT69DC_7C/Controls/ControlMainDisplayTable8.cs | 4 ++-- INT69DC_7C/Forms/FormInformation.cs | 2 +- INT69DC_7C/Version.txt | 8 ++++++++ 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable10.Designer.cs b/INT69DC_7C/Controls/ControlMainDisplayTable10.Designer.cs index 60d31bd..f48290d 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable10.Designer.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable10.Designer.cs @@ -764,7 +764,8 @@ this.label8Col1Row.BackPictureBox2 = null; this.label8Col1Row.BorderColor = System.Drawing.Color.Black; this.label8Col1Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label8Col1Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); + this.label8Col1Row.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold); + this.label8Col1Row.ForeColor = System.Drawing.Color.Black; this.label8Col1Row.InitVisible = true; this.label8Col1Row.LineSpacing = 0F; this.label8Col1Row.Location = new System.Drawing.Point(711, 19); @@ -1340,13 +1341,15 @@ this.label8Col8Row.BackPictureBox2 = null; this.label8Col8Row.BorderColor = System.Drawing.Color.Black; this.label8Col8Row.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.label8Col8Row.Font = new System.Drawing.Font("Arial", 16F, System.Drawing.FontStyle.Bold); + this.label8Col8Row.ForeColor = System.Drawing.Color.Black; this.label8Col8Row.InitVisible = true; this.label8Col8Row.LineSpacing = 0F; this.label8Col8Row.Location = new System.Drawing.Point(711, 243); this.label8Col8Row.Name = "label8Col8Row"; this.label8Col8Row.Size = new System.Drawing.Size(92, 30); this.label8Col8Row.TabIndex = 651; - this.label8Col8Row.Text = "label4Col3Row"; + this.label8Col8Row.Text = "9999.9"; this.label8Col8Row.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.label8Col8Row.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.label8Col8Row.Wordwrap = false; @@ -2102,7 +2105,7 @@ this.label6Col6Row.BackPictureBox2 = null; this.label6Col6Row.BorderColor = System.Drawing.Color.Black; this.label6Col6Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label6Col6Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); + this.label6Col6Row.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); this.label6Col6Row.InitVisible = true; this.label6Col6Row.LineSpacing = 0F; this.label6Col6Row.Location = new System.Drawing.Point(515, 179); @@ -2122,7 +2125,6 @@ this.label2Col6Row.BackPictureBox2 = null; this.label2Col6Row.BorderColor = System.Drawing.Color.Black; this.label2Col6Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label2Col6Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label2Col6Row.InitVisible = true; this.label2Col6Row.LineSpacing = 0F; this.label2Col6Row.Location = new System.Drawing.Point(123, 179); @@ -2142,7 +2144,6 @@ this.label2Col1Row.BackPictureBox2 = null; this.label2Col1Row.BorderColor = System.Drawing.Color.Black; this.label2Col1Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label2Col1Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label2Col1Row.InitVisible = true; this.label2Col1Row.LineSpacing = 0F; this.label2Col1Row.Location = new System.Drawing.Point(123, 19); @@ -2372,7 +2373,6 @@ this.label5Col7Row.BackPictureBox2 = null; this.label5Col7Row.BorderColor = System.Drawing.Color.Black; this.label5Col7Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label5Col7Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label5Col7Row.InitVisible = true; this.label5Col7Row.LineSpacing = 0F; this.label5Col7Row.Location = new System.Drawing.Point(417, 211); @@ -2392,7 +2392,6 @@ this.label1Col7Row.BackPictureBox2 = null; this.label1Col7Row.BorderColor = System.Drawing.Color.Black; this.label1Col7Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label1Col7Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label1Col7Row.InitVisible = true; this.label1Col7Row.LineSpacing = 0F; this.label1Col7Row.Location = new System.Drawing.Point(25, 211); @@ -2412,7 +2411,6 @@ this.label1Col2Row.BackPictureBox2 = null; this.label1Col2Row.BorderColor = System.Drawing.Color.Black; this.label1Col2Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label1Col2Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label1Col2Row.InitVisible = true; this.label1Col2Row.LineSpacing = 0F; this.label1Col2Row.Location = new System.Drawing.Point(25, 51); @@ -2432,7 +2430,6 @@ this.label5Col6Row.BackPictureBox2 = null; this.label5Col6Row.BorderColor = System.Drawing.Color.Black; this.label5Col6Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label5Col6Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label5Col6Row.InitVisible = true; this.label5Col6Row.LineSpacing = 0F; this.label5Col6Row.Location = new System.Drawing.Point(417, 179); @@ -2452,7 +2449,6 @@ this.label1Col6Row.BackPictureBox2 = null; this.label1Col6Row.BorderColor = System.Drawing.Color.Black; this.label1Col6Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label1Col6Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label1Col6Row.InitVisible = true; this.label1Col6Row.LineSpacing = 0F; this.label1Col6Row.Location = new System.Drawing.Point(25, 179); @@ -2472,7 +2468,6 @@ this.label1Col1Row.BackPictureBox2 = null; this.label1Col1Row.BorderColor = System.Drawing.Color.Black; this.label1Col1Row.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.label1Col1Row.Font = new System.Drawing.Font("Tahoma", 16F, System.Drawing.FontStyle.Bold); this.label1Col1Row.InitVisible = true; this.label1Col1Row.LineSpacing = 0F; this.label1Col1Row.Location = new System.Drawing.Point(25, 19); diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs index 00e8b81..f878ca8 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs @@ -17,7 +17,7 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Red; + private Color WeightOverColor = Color.Yellow; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; @@ -280,7 +280,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Tahoma", 16, FontStyle.Bold); + label.Font = new Font("Arial", 16, FontStyle.Bold); } private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable12.cs b/INT69DC_7C/Controls/ControlMainDisplayTable12.cs index 2c5b514..878c8b7 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable12.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable12.cs @@ -18,7 +18,7 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Red; + private Color WeightOverColor = Color.Yellow; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; @@ -320,7 +320,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Tahoma", 16, FontStyle.Bold); + label.Font = new Font("Arial", 16, FontStyle.Bold); } private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable7.cs b/INT69DC_7C/Controls/ControlMainDisplayTable7.cs index f62cfbd..c2d4753 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable7.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable7.cs @@ -18,7 +18,7 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Red; + private Color WeightOverColor = Color.Yellow; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; @@ -224,7 +224,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Tahoma", 16, FontStyle.Bold); + label.Font = new Font("Arial", 16, FontStyle.Bold); } private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable8.cs b/INT69DC_7C/Controls/ControlMainDisplayTable8.cs index e396a4e..012a15e 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable8.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable8.cs @@ -18,7 +18,7 @@ namespace INT69DC_7C.Controls #region Field private FormMainDisplay m_ParentForm; - private Color WeightOverColor = Color.Red; + private Color WeightOverColor = Color.Yellow; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; @@ -243,7 +243,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Tahoma", 16, FontStyle.Bold); + label.Font = new Font("Arial", 16, FontStyle.Bold); } private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 05a750b..577f08a 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "11.0.3"; + this.labelDisplayVer.Text = "11.0.4"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index c3deafe..c169746 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,6 +15,14 @@ 멀티형 8,10,12열 컨베어/스틱 계량기 */ +@ Ver 11.0.4 by CJY + - 2024.04.11 + - Ver 11.0.3 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - 표그래프 + 1. 경량 시 빨강, 과량 시 노랑색으로 표시 + 2. 표그래프 글씨 Tahoma -> Arial + @ Ver 11.0.3 by LSJ - 2024.03.08 - Ver 11.0.2 Modify