From 8231522ea5b410f38cd18fcf5c8d2f9e54cf3e5d Mon Sep 17 00:00:00 2001 From: sj84 Date: Thu, 16 May 2024 14:25:55 +0900 Subject: [PATCH] =?UTF-8?q?@=20Ver=2011.1.0=20by=20LSJ=20=20-=202024.04.11?= =?UTF-8?q?=20=20-=20Ver=2011.0.3=20Modify=20=20-=20Framework=20:=20SmartX?= =?UTF-8?q?=20Framework=20V3.1.1(update:=202019.03.21)=20=20-=20=ED=91=9C?= =?UTF-8?q?=EA=B7=B8=EB=9E=98=ED=94=84=20=20=20=201.=20=ED=91=9C=EA=B7=B8?= =?UTF-8?q?=EB=9E=98=ED=94=84=20=EA=B8=80=EC=94=A8=20Tahoma=20->=20Arial?= =?UTF-8?q?=20=20-=20=EC=8A=A4=ED=8B=B11=EB=AA=A8=EB=93=9C=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EA=B0=9C=EB=B3=84NG(OFF)=20=EC=9D=BC=EB=95=8C=20?= =?UTF-8?q?=EC=A4=91=EB=9F=89=20=ED=8C=90=EC=A0=95=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=20=EC=88=98=EC=A0=95=20=20=20=20=EC=98=88)=2010?= =?UTF-8?q?=EA=B0=9C=20=EC=A4=91=201=EA=B0=9C=20=EB=B6=88=EB=9F=89?= =?UTF-8?q?=EC=9D=B4=EB=A9=B4,=201=EA=B0=9C=20NG=209=EA=B0=9C=20=EC=A0=95?= =?UTF-8?q?=EC=83=81=20=ED=8C=90=EC=A0=95=20=20=20=20=20=20=20=20=EC=A0=9C?= =?UTF-8?q?=ED=92=88=20=EB=AA=A8=EB=91=90=20=EB=A6=AC=EC=A0=9D=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=EB=90=A8=20=20=20=20=EB=B3=80=EA=B2=BD=20=EC=A0=84=20?= =?UTF-8?q?:=20=EC=A0=95=EC=83=81=20=EC=88=98=EB=9F=89=EC=9D=80=209?= =?UTF-8?q?=EA=B0=9C=20=EC=A6=9D=EA=B0=80=ED=95=A8=20=20=20=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20=ED=9B=84=20:=20=EC=A0=95=EC=83=81=20=EC=A0=9C?= =?UTF-8?q?=ED=92=88=20EX=20NG=20=EB=B6=88=EB=9F=89=20=EC=9C=BC=EB=A1=9C?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controls/ControlMainDisplayTable10.cs | 2 +- .../Controls/ControlMainDisplayTable12.cs | 2 +- .../Controls/ControlMainDisplayTable7.cs | 2 +- .../Controls/ControlMainDisplayTable8.cs | 2 +- INT69DC_7C/Forms/FormInformation.cs | 2 +- INT69DC_7C/Forms/FormMain.cs | 74 ++++++++++++++++--- INT69DC_7C/Forms/FormMainDisplay.Designer.cs | 20 ++--- INT69DC_7C/Version.txt | 12 +++ 8 files changed, 92 insertions(+), 24 deletions(-) diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs index f878ca8..b79b266 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs @@ -280,7 +280,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Arial", 16, FontStyle.Bold); + label.Font = new Font("Tahoma", 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 878c8b7..41c19d2 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable12.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable12.cs @@ -320,7 +320,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Arial", 16, FontStyle.Bold); + label.Font = new Font("Tahoma", 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 c2d4753..55fd853 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable7.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable7.cs @@ -224,7 +224,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Arial", 16, FontStyle.Bold); + label.Font = new Font("Tahoma", 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 012a15e..4fe46f8 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable8.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable8.cs @@ -243,7 +243,7 @@ namespace INT69DC_7C.Controls } private void SetLabelProperty(Control label) { - label.Font = new Font("Arial", 16, FontStyle.Bold); + label.Font = new Font("Tahoma", 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 577f08a..a288ce0 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.4"; + this.labelDisplayVer.Text = "11.1.0"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index e745aab..a9e2fac 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -109,6 +109,8 @@ namespace INT69DC_7C.Forms public List ListDllUserName; // Dataviewer Filter public DataViewerFilter CurrentDataViewerFilter; + // Judgment Result Buffer + private Collection CollJudgmentStatus; // Collection private Collection CollectionGraphData; // 판정설정 그래프 데이터 @@ -325,6 +327,7 @@ namespace INT69DC_7C.Forms this.CollectionIndividualDirection = new Collection(); this.CollectionProductName = new Collection(); this.CollectionFeedbackStatus = new Collection(); + this.CollJudgmentStatus = new Collection(); this.CollectionWeightData.Clear(); this.CollectionWeightDataTest.Clear(); @@ -341,6 +344,7 @@ namespace INT69DC_7C.Forms this.CollectionIndividualDirection.Clear(); this.CollectionProductName.Clear(); this.CollectionFeedbackStatus.Clear(); + this.CollJudgmentStatus.Clear(); for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { @@ -354,6 +358,7 @@ namespace INT69DC_7C.Forms this.CollectionDigit.Add(""); this.CollectionFilter.Add(""); this.CollectionFeedbackStatus.Add(new FeedBackSystem1()); + this.CollJudgmentStatus.Add(DataStore.JudgmentStatus.Empty); } for (int i = 0; i < 13; i++) @@ -812,7 +817,8 @@ namespace INT69DC_7C.Forms this.CollectionWeightData[index].WeightString = receiveData.Substring(2, 5); this.CollectionWeightData[index].ADCValue = receiveData.Substring(7, 5); - this.Update30000ModbusData(index); + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(index); } else { @@ -823,7 +829,8 @@ namespace INT69DC_7C.Forms this.CollectionWeightData[index2].WeightString = receiveData.Substring(2, 5); this.CollectionWeightData[index2].ADCValue = receiveData.Substring(7, 5); - this.Update30000ModbusData(index2); + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(index2); } } private void UpdateWeightDataTest(int index, string receiveData) @@ -5048,26 +5055,78 @@ namespace INT69DC_7C.Forms { if (this.SystemConfig.IsWeightViewForward == true) { + DataStore.JudgmentStatus jStatus = DataStore.JudgmentStatus.Empty; + bool result1 = false; + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) { - this.CollectionWeightData[i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); + jStatus = Helper.StringToJudgmentStatus(receiveData.Substring(i * 12, 2)); + this.CollJudgmentStatus[i] = jStatus; + + if (jStatus != DataStore.JudgmentStatus.Pass) + result1 = true; + } + + if (this.SystemConfig.IsIndividualNG == false) + { + // 판정데이터 검사 + if (result1 == true) + { + for (int i = 0; i < this.CollJudgmentStatus.Count; i++) + { + if (this.CollJudgmentStatus[i] == DataStore.JudgmentStatus.Pass) + this.CollJudgmentStatus[i] = DataStore.JudgmentStatus.EXNg; + } + } + } + + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + { + this.CollectionWeightData[i].JudgmentStatus = this.CollJudgmentStatus[i]; this.CollectionWeightData[i].Weight = Helper.StringToWeight(receiveData.Substring(i * 12 + 2, 5), this.SystemConfig.DecimalPlaces); this.CollectionWeightData[i].WeightString = receiveData.Substring(i * 12 + 2, 5); this.CollectionWeightData[i].ADCValue = receiveData.Substring(i * 12 + 7, 5); - this.Update30000ModbusData(i); + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(i); } } else { + DataStore.JudgmentStatus jStatus = DataStore.JudgmentStatus.Empty; + bool result1 = false; + + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + jStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2)); + this.CollJudgmentStatus[this.CollJudgmentStatus.Count - i] = jStatus; + + if (jStatus != DataStore.JudgmentStatus.Pass) + result1 = true; + } + + if (this.SystemConfig.IsIndividualNG == false) + { + // 판정데이터 검사 + if (result1 == true) + { + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) + { + if (this.CollJudgmentStatus[i] == DataStore.JudgmentStatus.Pass) + this.CollJudgmentStatus[i] = DataStore.JudgmentStatus.EXNg; + } + } + } + for (int i = 1; i <= this.SystemConfig.EquipmentColumns; i++) { this.CollectionWeightData[this.CollectionWeightData.Count - i].JudgmentStatus = Helper.StringToJudgmentStatus(receiveData.Substring((i - 1) * 12, 2)); this.CollectionWeightData[this.CollectionWeightData.Count - i].Weight = Helper.StringToWeight(receiveData.Substring((i - 1) * 12 + 2, 5), this.SystemConfig.DecimalPlaces); this.CollectionWeightData[this.CollectionWeightData.Count - i].WeightString = receiveData.Substring((i - 1) * 12 + 2, 5); this.CollectionWeightData[this.CollectionWeightData.Count - i].ADCValue = receiveData.Substring((i - 1) * 12 + 7, 5); - - this.Update30000ModbusData(this.CollectionWeightData.Count - i); + + if (this.SystemConfig.EthernetOperationMode == 3) + this.Update30000ModbusData(this.CollectionWeightData.Count - i); } } } @@ -5092,9 +5151,6 @@ namespace INT69DC_7C.Forms } } } - - //foreach (WeightData data in this.CollectionWeightData) - // data.IsUpdate = true; #endregion if (this.SystemConfig.CurrentForm == DataStore.FormStore.FormMainDisplay) diff --git a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs index e883e42..f7e6a88 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs @@ -430,12 +430,12 @@ this.labelTotalCount.BackPictureBox2 = null; this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular); + this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); this.labelTotalCount.InitVisible = true; this.labelTotalCount.LineSpacing = 0F; - this.labelTotalCount.Location = new System.Drawing.Point(108, 703); + this.labelTotalCount.Location = new System.Drawing.Point(99, 703); this.labelTotalCount.Name = "labelTotalCount"; - this.labelTotalCount.Size = new System.Drawing.Size(135, 41); + this.labelTotalCount.Size = new System.Drawing.Size(142, 41); this.labelTotalCount.TabIndex = 444; this.labelTotalCount.Text = "999999999"; this.labelTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -450,7 +450,7 @@ this.labelProductionSpeed.BackPictureBox2 = null; this.labelProductionSpeed.BorderColor = System.Drawing.Color.Black; this.labelProductionSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular); + this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); this.labelProductionSpeed.InitVisible = true; this.labelProductionSpeed.LineSpacing = 0F; this.labelProductionSpeed.Location = new System.Drawing.Point(524, 704); @@ -488,12 +488,12 @@ this.labelNGCount.BackPictureBox2 = null; this.labelNGCount.BorderColor = System.Drawing.Color.Black; this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular); + this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); this.labelNGCount.InitVisible = true; this.labelNGCount.LineSpacing = 0F; - this.labelNGCount.Location = new System.Drawing.Point(362, 703); + this.labelNGCount.Location = new System.Drawing.Point(344, 703); this.labelNGCount.Name = "labelNGCount"; - this.labelNGCount.Size = new System.Drawing.Size(125, 41); + this.labelNGCount.Size = new System.Drawing.Size(142, 41); this.labelNGCount.TabIndex = 442; this.labelNGCount.Text = "1234567"; this.labelNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; @@ -1572,7 +1572,7 @@ this.buttonCut.ForeColor = System.Drawing.Color.White; this.buttonCut.GroupID = 0; this.buttonCut.InitVisible = true; - this.buttonCut.Location = new System.Drawing.Point(508, 694); + this.buttonCut.Location = new System.Drawing.Point(509, 694); this.buttonCut.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCut.Name = "buttonCut"; this.buttonCut.NestedClickEventPrevent = false; @@ -1672,7 +1672,7 @@ this.labelTitleTotalCount.BackPictureBox2 = null; this.labelTitleTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTitleTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleTotalCount.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); this.labelTitleTotalCount.InitVisible = true; this.labelTitleTotalCount.LineSpacing = 0F; this.labelTitleTotalCount.Location = new System.Drawing.Point(23, 703); @@ -1692,7 +1692,7 @@ this.labelTitleNGCount.BackPictureBox2 = null; this.labelTitleNGCount.BorderColor = System.Drawing.Color.Black; this.labelTitleNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleNGCount.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleNGCount.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); this.labelTitleNGCount.InitVisible = true; this.labelTitleNGCount.LineSpacing = 0F; this.labelTitleNGCount.Location = new System.Drawing.Point(274, 703); diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index c169746..d9fd95d 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,6 +15,18 @@ Ƽ 8,10,12 /ƽ 跮 */ +@ Ver 11.1.0 by LSJ + - 2024.04.11 + - Ver 11.0.3 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ǥ׷ + 1. ǥ׷ ۾ Tahoma -> Arial + - ƽ1忡 NG(OFF) ϶ ߷ + ) 10 1 ҷ̸, 1 NG 9 + ǰ ó + : 9 + : ǰ EX NG ҷ + @ Ver 11.0.4 by CJY - 2024.04.11 - Ver 11.0.3 Modify