From 9da7015581d4b638c7fc1be28807e50c1c9b455a Mon Sep 17 00:00:00 2001 From: sj84 Date: Tue, 5 Mar 2024 14:58:18 +0900 Subject: [PATCH] =?UTF-8?q?@=20Ver=2011.0.2=20by=20LSJ=20=20-=202024.01.04?= =?UTF-8?q?=20=20-=20Ver=2011.0.1=20Modify=20=20-=20Framework=20:=20SmartX?= =?UTF-8?q?=20Framework=20V3.1.1(update:=202019.03.21)=20=20-=20=EC=A4=91?= =?UTF-8?q?=EB=9F=89=20=EC=A1=B0=EC=A0=95=20=EC=BD=94=EB=93=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC=20=20=20=20Finish=20->=20Success=20=20-=20=ED=9E=88?= =?UTF-8?q?=EB=93=A0=EB=A9=94=EB=89=B4=20=EB=B2=84=ED=8A=BC=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95=20=20=20=20=EB=B9=84=EB=B0=80?= =?UTF-8?q?=EB=B2=88=ED=98=B8=20:=20MMdd=20+=200810=20=20-=20=EC=98=B5?= =?UTF-8?q?=EC=85=98=20=EC=84=A4=EC=A0=95=20=EB=A9=94=EB=89=B4=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- INT69DC_7C/Controls/ControlCalibration10.cs | 68 +++---- INT69DC_7C/Controls/ControlCalibration12.cs | 72 ++++---- INT69DC_7C/Controls/ControlCalibration7.cs | 64 +++---- INT69DC_7C/Controls/ControlCalibration8.cs | 66 +++---- .../DialogForms/DialogFormMessage.Designer.cs | 8 +- .../DialogForms/DialogFormPasswordKeyPad1.cs | 41 +++-- INT69DC_7C/Forms/FormCommunication.cs | 2 - INT69DC_7C/Forms/FormInformation.cs | 2 +- INT69DC_7C/Forms/FormMain.cs | 38 ++-- INT69DC_7C/Forms/FormMainDisplay.Designer.cs | 94 +++++----- INT69DC_7C/Forms/FormMenu.cs | 31 ++-- .../Forms/FormOptionSetting.Designer.cs | 166 +++++++++--------- INT69DC_7C/Forms/FormOptionSetting.cs | 2 + INT69DC_7C/Version.txt | 10 ++ 14 files changed, 334 insertions(+), 330 deletions(-) diff --git a/INT69DC_7C/Controls/ControlCalibration10.cs b/INT69DC_7C/Controls/ControlCalibration10.cs index 1548c2b..af78768 100644 --- a/INT69DC_7C/Controls/ControlCalibration10.cs +++ b/INT69DC_7C/Controls/ControlCalibration10.cs @@ -21,7 +21,7 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollButtonLine; + private Collection CollButtonLane; private Collection CollLabelWeight; private Collection CollLabelADC; private Collection CollLabelConstant; @@ -53,28 +53,28 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollButtonLine = new Collection(); + this.CollButtonLane = new Collection(); this.CollLabelWeight = new Collection(); this.CollLabelADC = new Collection(); this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLine.Clear(); + this.CollButtonLane.Clear(); this.CollLabelWeight.Clear(); this.CollLabelADC.Clear(); this.CollLabelConstant.Clear(); this.CollCalStatus.Clear(); - this.CollButtonLine.Add(this.buttonLine1); - this.CollButtonLine.Add(this.buttonLine2); - this.CollButtonLine.Add(this.buttonLine3); - this.CollButtonLine.Add(this.buttonLine4); - this.CollButtonLine.Add(this.buttonLine5); - this.CollButtonLine.Add(this.buttonLine6); - this.CollButtonLine.Add(this.buttonLine7); - this.CollButtonLine.Add(this.buttonLine8); - this.CollButtonLine.Add(this.buttonLine9); - this.CollButtonLine.Add(this.buttonLine10); + this.CollButtonLane.Add(this.buttonLine1); + this.CollButtonLane.Add(this.buttonLine2); + this.CollButtonLane.Add(this.buttonLine3); + this.CollButtonLane.Add(this.buttonLine4); + this.CollButtonLane.Add(this.buttonLine5); + this.CollButtonLane.Add(this.buttonLine6); + this.CollButtonLane.Add(this.buttonLine7); + this.CollButtonLane.Add(this.buttonLine8); + this.CollButtonLane.Add(this.buttonLine9); + this.CollButtonLane.Add(this.buttonLine10); this.CollLabelWeight.Add(this.labelWeight1); this.CollLabelWeight.Add(this.labelWeight2); @@ -128,12 +128,12 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) + if (this.CollButtonLane == null || this.CollButtonLane.Count == 0) return; - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - this.CollButtonLine[i].ButtonUp(); + this.CollButtonLane[i].ButtonUp(); this.CollCalStatus[i].Initialize(); } } @@ -173,11 +173,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -224,11 +224,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -239,7 +239,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = false; + this.CollButtonLane[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); @@ -274,11 +274,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -292,7 +292,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = true; + this.CollButtonLane[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -349,13 +349,13 @@ namespace INT69DC_7C.Controls for (int i = 0; i < weights.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } @@ -445,7 +445,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -454,7 +454,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsFinish == false) { this.CollCalStatus[index].IsFinish = true; - detail = string.Format("{0}Lane Finish", index + 1); + detail = string.Format("{0} Lane Success", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } @@ -496,7 +496,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -505,7 +505,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsError == false) { this.CollCalStatus[index].IsError = true; - detail = string.Format("{0}Lane Error", index + 1); + detail = string.Format("{0} Lane Error", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } diff --git a/INT69DC_7C/Controls/ControlCalibration12.cs b/INT69DC_7C/Controls/ControlCalibration12.cs index ef5a6a7..074bb56 100644 --- a/INT69DC_7C/Controls/ControlCalibration12.cs +++ b/INT69DC_7C/Controls/ControlCalibration12.cs @@ -21,7 +21,7 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollButtonLine; + private Collection CollButtonLane; private Collection CollLabelWeight; private Collection CollLabelADC; private Collection CollLabelConstant; @@ -53,30 +53,30 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollButtonLine = new Collection(); + this.CollButtonLane = new Collection(); this.CollLabelWeight = new Collection(); this.CollLabelADC = new Collection(); this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLine.Clear(); + this.CollButtonLane.Clear(); this.CollLabelWeight.Clear(); this.CollLabelADC.Clear(); this.CollLabelConstant.Clear(); this.CollCalStatus.Clear(); - this.CollButtonLine.Add(this.buttonLine1); - this.CollButtonLine.Add(this.buttonLine2); - this.CollButtonLine.Add(this.buttonLine3); - this.CollButtonLine.Add(this.buttonLine4); - this.CollButtonLine.Add(this.buttonLine5); - this.CollButtonLine.Add(this.buttonLine6); - this.CollButtonLine.Add(this.buttonLine7); - this.CollButtonLine.Add(this.buttonLine8); - this.CollButtonLine.Add(this.buttonLine9); - this.CollButtonLine.Add(this.buttonLine10); - this.CollButtonLine.Add(this.buttonLine11); - this.CollButtonLine.Add(this.buttonLine12); + this.CollButtonLane.Add(this.buttonLine1); + this.CollButtonLane.Add(this.buttonLine2); + this.CollButtonLane.Add(this.buttonLine3); + this.CollButtonLane.Add(this.buttonLine4); + this.CollButtonLane.Add(this.buttonLine5); + this.CollButtonLane.Add(this.buttonLine6); + this.CollButtonLane.Add(this.buttonLine7); + this.CollButtonLane.Add(this.buttonLine8); + this.CollButtonLane.Add(this.buttonLine9); + this.CollButtonLane.Add(this.buttonLine10); + this.CollButtonLane.Add(this.buttonLine11); + this.CollButtonLane.Add(this.buttonLine12); this.CollLabelWeight.Add(this.labelWeight1); this.CollLabelWeight.Add(this.labelWeight2); @@ -135,12 +135,12 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) + if (this.CollButtonLane == null || this.CollButtonLane.Count == 0) return; - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - this.CollButtonLine[i].ButtonUp(); + this.CollButtonLane[i].ButtonUp(); this.CollCalStatus[i].Initialize(); } } @@ -179,11 +179,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -230,11 +230,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -245,7 +245,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = false; + this.CollButtonLane[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); @@ -280,11 +280,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -298,7 +298,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = true; + this.CollButtonLane[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -363,13 +363,13 @@ namespace INT69DC_7C.Controls for (int i = 0; i < weights.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } @@ -459,7 +459,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -468,7 +468,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsFinish == false) { this.CollCalStatus[index].IsFinish = true; - detail = string.Format("{0}Lane Finish", index + 1); + detail = string.Format("{0} Lane Success", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } @@ -510,7 +510,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -519,7 +519,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsError == false) { this.CollCalStatus[index].IsError = true; - detail = string.Format("{0}Lane Error", index + 1); + detail = string.Format("{0} Lane Error", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } diff --git a/INT69DC_7C/Controls/ControlCalibration7.cs b/INT69DC_7C/Controls/ControlCalibration7.cs index c61f444..9ff2be2 100644 --- a/INT69DC_7C/Controls/ControlCalibration7.cs +++ b/INT69DC_7C/Controls/ControlCalibration7.cs @@ -21,7 +21,7 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollButtonLine; + private Collection CollButtonLane; private Collection CollLabelWeight; private Collection CollLabelADC; private Collection CollLabelConstant; @@ -53,25 +53,25 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollButtonLine = new Collection(); + this.CollButtonLane = new Collection(); this.CollLabelWeight = new Collection(); this.CollLabelADC = new Collection(); this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLine.Clear(); + this.CollButtonLane.Clear(); this.CollLabelWeight.Clear(); this.CollLabelADC.Clear(); this.CollLabelConstant.Clear(); this.CollCalStatus.Clear(); - this.CollButtonLine.Add(this.buttonLane1); - this.CollButtonLine.Add(this.buttonLane2); - this.CollButtonLine.Add(this.buttonLane3); - this.CollButtonLine.Add(this.buttonLane4); - this.CollButtonLine.Add(this.buttonLane5); - this.CollButtonLine.Add(this.buttonLane6); - this.CollButtonLine.Add(this.buttonLane7); + this.CollButtonLane.Add(this.buttonLane1); + this.CollButtonLane.Add(this.buttonLane2); + this.CollButtonLane.Add(this.buttonLane3); + this.CollButtonLane.Add(this.buttonLane4); + this.CollButtonLane.Add(this.buttonLane5); + this.CollButtonLane.Add(this.buttonLane6); + this.CollButtonLane.Add(this.buttonLane7); this.CollLabelWeight.Add(this.labelWeight1); this.CollLabelWeight.Add(this.labelWeight2); @@ -115,12 +115,12 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) + if (this.CollButtonLane == null || this.CollButtonLane.Count == 0) return; - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - this.CollButtonLine[i].ButtonUp(); + this.CollButtonLane[i].ButtonUp(); this.CollCalStatus[i].Initialize(); } } @@ -159,11 +159,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -210,11 +210,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -225,7 +225,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = false; + this.CollButtonLane[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); @@ -260,11 +260,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -278,7 +278,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = true; + this.CollButtonLane[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -323,13 +323,13 @@ namespace INT69DC_7C.Controls for (int i = 0; i < weights.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } @@ -418,7 +418,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -427,7 +427,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsFinish == false) { this.CollCalStatus[index].IsFinish = true; - detail = string.Format("{0}Lane Finish", index + 1); + detail = string.Format("{0} Lane Success", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } @@ -469,7 +469,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -478,7 +478,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsError == false) { this.CollCalStatus[index].IsError = true; - detail = string.Format("{0}Lane Error", index + 1); + detail = string.Format("{0} Lane Error", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } @@ -511,7 +511,7 @@ namespace INT69DC_7C.Controls else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) { this.ParentForm.listBoxHelp.Items.Add("Calibration"); - this.ParentForm.listBoxHelp.Items.Add("After selecting line, "); + this.ParentForm.listBoxHelp.Items.Add("After selecting lane, "); this.ParentForm.listBoxHelp.Items.Add("push the [Start] button."); } else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) diff --git a/INT69DC_7C/Controls/ControlCalibration8.cs b/INT69DC_7C/Controls/ControlCalibration8.cs index 0912df6..03907cd 100644 --- a/INT69DC_7C/Controls/ControlCalibration8.cs +++ b/INT69DC_7C/Controls/ControlCalibration8.cs @@ -21,7 +21,7 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollButtonLine; + private Collection CollButtonLane; private Collection CollLabelWeight; private Collection CollLabelADC; private Collection CollLabelConstant; @@ -53,26 +53,26 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollButtonLine = new Collection(); + this.CollButtonLane = new Collection(); this.CollLabelWeight = new Collection(); this.CollLabelADC = new Collection(); this.CollLabelConstant = new Collection(); this.CollCalStatus = new Collection(); - this.CollButtonLine.Clear(); + this.CollButtonLane.Clear(); this.CollLabelWeight.Clear(); this.CollLabelADC.Clear(); this.CollLabelConstant.Clear(); this.CollCalStatus.Clear(); - this.CollButtonLine.Add(this.buttonLine1); - this.CollButtonLine.Add(this.buttonLine2); - this.CollButtonLine.Add(this.buttonLine3); - this.CollButtonLine.Add(this.buttonLine4); - this.CollButtonLine.Add(this.buttonLine5); - this.CollButtonLine.Add(this.buttonLine6); - this.CollButtonLine.Add(this.buttonLine7); - this.CollButtonLine.Add(this.buttonLine8); + this.CollButtonLane.Add(this.buttonLine1); + this.CollButtonLane.Add(this.buttonLine2); + this.CollButtonLane.Add(this.buttonLine3); + this.CollButtonLane.Add(this.buttonLine4); + this.CollButtonLane.Add(this.buttonLine5); + this.CollButtonLane.Add(this.buttonLine6); + this.CollButtonLane.Add(this.buttonLine7); + this.CollButtonLane.Add(this.buttonLine8); this.CollLabelWeight.Add(this.labelWeight1); this.CollLabelWeight.Add(this.labelWeight2); @@ -119,12 +119,12 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) + if (this.CollButtonLane == null || this.CollButtonLane.Count == 0) return; - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - this.CollButtonLine[i].ButtonUp(); + this.CollButtonLane[i].ButtonUp(); this.CollCalStatus[i].Initialize(); } } @@ -163,11 +163,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -214,11 +214,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -229,7 +229,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = false; + this.CollButtonLane[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); @@ -264,11 +264,11 @@ namespace INT69DC_7C.Controls } - for (int i = 0; i < this.CollButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLane.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLane[i].Tag.ToString()); // Part 11 if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) @@ -282,7 +282,7 @@ namespace INT69DC_7C.Controls } } - this.CollButtonLine[i].Enabled = true; + this.CollButtonLane[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -331,13 +331,13 @@ namespace INT69DC_7C.Controls for (int i = 0; i < weights.Count; i++) { - if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLane[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLane[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } @@ -426,7 +426,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -435,7 +435,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsFinish == false) { this.CollCalStatus[index].IsFinish = true; - detail = string.Format("{0}Lane Finish", index + 1); + detail = string.Format("{0} Lane Success", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } @@ -477,7 +477,7 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLane) bt.Enabled = true; // Part11 @@ -486,7 +486,7 @@ namespace INT69DC_7C.Controls if (this.CollCalStatus[index].IsError == false) { this.CollCalStatus[index].IsError = true; - detail = string.Format("{0}Lane Error", index + 1); + detail = string.Format("{0} Lane Error", index + 1); this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); } } @@ -519,7 +519,7 @@ namespace INT69DC_7C.Controls else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.English) { this.ParentForm.listBoxHelp.Items.Add("Calibration"); - this.ParentForm.listBoxHelp.Items.Add("After selecting line, "); + this.ParentForm.listBoxHelp.Items.Add("After selecting lane, "); this.ParentForm.listBoxHelp.Items.Add("push the [Start] button."); } else if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) diff --git a/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs b/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs index eb3a8c8..b39d21b 100644 --- a/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs +++ b/INT69DC_7C/DialogForms/DialogFormMessage.Designer.cs @@ -88,7 +88,7 @@ // // labelMessage2 // - this.labelMessage2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage2.Location = new System.Drawing.Point(67, 51); this.labelMessage2.Name = "labelMessage2"; this.labelMessage2.Size = new System.Drawing.Size(350, 20); @@ -96,7 +96,7 @@ // // labelMessage1 // - this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage1.Location = new System.Drawing.Point(67, 20); this.labelMessage1.Name = "labelMessage1"; this.labelMessage1.Size = new System.Drawing.Size(350, 20); @@ -105,7 +105,7 @@ // buttonOK // this.buttonOK.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(40)))), ((int)(((byte)(40)))), ((int)(((byte)(40))))); - this.buttonOK.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonOK.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonOK.ForeColor = System.Drawing.Color.White; this.buttonOK.Location = new System.Drawing.Point(335, 135); this.buttonOK.Name = "buttonOK"; @@ -117,7 +117,7 @@ // // labelErrorCode // - this.labelErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelErrorCode.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelErrorCode.Location = new System.Drawing.Point(15, 11); this.labelErrorCode.Name = "labelErrorCode"; this.labelErrorCode.Size = new System.Drawing.Size(350, 20); diff --git a/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs b/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs index b6c7b2c..291f14d 100644 --- a/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs +++ b/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs @@ -62,15 +62,31 @@ namespace INT69DC_7C.DialogForms #region Method private void InputNum(string key) { - if (this.InputKey.Length >= 4) + if (this.Digit == 8) { - this.InputKey = key; - this.labelScreen.Text = "*"; + if (this.InputKey.Length >= 8) + { + this.InputKey = key; + this.labelScreen.Text = "*"; + } + else + { + this.InputKey += key; + this.labelScreen.Text += "*"; + } } else { - this.InputKey += key; - this.labelScreen.Text += "*"; + if (this.InputKey.Length >= 4) + { + this.InputKey = key; + this.labelScreen.Text = "*"; + } + else + { + this.InputKey += key; + this.labelScreen.Text += "*"; + } } } @@ -130,17 +146,12 @@ namespace INT69DC_7C.DialogForms #region Event Handler private void buttonEnter_Click(object sender, EventArgs e) { - if (this.labelScreen.Text.Length == 4) + if (this.Digit == 8) { - this.DialogResult = DialogResult.OK; - } - else if (this.labelScreen.Text.Length == 8) - { - if (this.Digit == 8) - { - if (this.InputKey == this.PasswordHiddenMenu) - this.DialogResult = DialogResult.OK; - } + if (this.InputKey == this.PasswordHiddenMenu) + this.DialogResult = DialogResult.OK; + else + this.DialogResult = DialogResult.Cancel; } } diff --git a/INT69DC_7C/Forms/FormCommunication.cs b/INT69DC_7C/Forms/FormCommunication.cs index 5800708..35adafd 100644 --- a/INT69DC_7C/Forms/FormCommunication.cs +++ b/INT69DC_7C/Forms/FormCommunication.cs @@ -796,7 +796,6 @@ namespace INT69DC_7C.Forms { if (this.labelServerStatus.Text != ">Start") this.labelServerStatus.Text = ">Start"; - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetConnect, "Server"); this.smartListBoxClientList.ClearAll(); this.labelClientCount.Text = "-"; @@ -819,7 +818,6 @@ namespace INT69DC_7C.Forms { if (this.labelServerStatus.Text != ">Stop") this.labelServerStatus.Text = ">Stop"; - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.EthernetDisconnect, "Server"); this.smartListBoxClientList.ClearAll(); this.labelClientCount.Text = "-"; diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index d68cca1..8bebc11 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.1"; + this.labelDisplayVer.Text = "11.0.2"; 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 b3ff25e..e745aab 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -457,6 +457,10 @@ namespace INT69DC_7C.Forms if (Directory.Exists(this.PathDataInspectionFolder) == false) Directory.CreateDirectory(this.PathDataInspectionFolder); + // Others 폴더 생성 + if (Directory.Exists(this.PathDataOthersFolder) == false) + Directory.CreateDirectory(this.PathDataOthersFolder); + // Encryption 폴더 생성 if (Directory.Exists(this.PathEncryptionFolder) == false) Directory.CreateDirectory(this.PathEncryptionFolder); @@ -5907,7 +5911,14 @@ namespace INT69DC_7C.Forms // AutomaticLogout this.SystemConfig.AutomaticLogout = structItem2.AutomaticLogout; - this.SystemConfig.DataStoragePeriod = structItem2.DataStoragePeriod; + // DataStoragePeriod + if (structItem2.DataStoragePeriod == 0) + { + save = true; + this.SystemConfig.DataStoragePeriod = 12; + } + else + this.SystemConfig.DataStoragePeriod = structItem2.DataStoragePeriod; } catch { @@ -7406,7 +7417,7 @@ namespace INT69DC_7C.Forms if (this.CollectionWeightData[index].UpdateCount > 65535) this.CollectionWeightData[index].UpdateCount = 0; else - this.CollectionWeightData[index].UpdateCount++; + this.CollectionWeightData[index].UpdateCount++; this.Current30000ModbusData.LaneModbusData[index].Update = this.CollectionWeightData[index].UpdateCount; } @@ -11478,30 +11489,9 @@ namespace INT69DC_7C.Forms } private void RemoveHistoryDataFile() { - bool directoryCheck = false; - try { - string dday = string.Format("{0:yyyyMMdd}", DateTime.Now.AddDays(-180)) + ".csv"; - - DirectoryInfo dir = new DirectoryInfo(this.PathDataHistoryFolder); - - directoryCheck = dir.Exists; - // 폴더 체크 - if (directoryCheck == false) - dir.Create(); - - FileInfo[] files = dir.GetFiles(); - foreach (FileInfo subfile in files) - { - if (subfile.Name.StartsWith("20")) // 날짜 비교하여 10일 지난화일은 삭제함 - { - if (subfile.Name.CompareTo(dday) < 0) - { - subfile.Delete(); - } - } - } + this.DeleteLogFile(this.PathDataHistoryFolder, DataStore.E_DataType.History); } catch { diff --git a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs index 021e4dd..e883e42 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs @@ -711,7 +711,7 @@ this.groupBoxJudgment.Controls.Add(this.labelStaticDoubleDelayTime); this.groupBoxJudgment.Controls.Add(this.labelStaticJudgmentDelayTime); this.groupBoxJudgment.Controls.Add(this.labelStaticFilter); - this.groupBoxJudgment.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxJudgment.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxJudgment.ForeColor = System.Drawing.Color.White; this.groupBoxJudgment.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxJudgment.FrameLineColor2 = System.Drawing.Color.Black; @@ -819,7 +819,7 @@ this.labelStaticJudgmentCount.BackPictureBox2 = null; this.labelStaticJudgmentCount.BorderColor = System.Drawing.Color.Black; this.labelStaticJudgmentCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticJudgmentCount.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticJudgmentCount.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticJudgmentCount.ForeColor = System.Drawing.Color.White; this.labelStaticJudgmentCount.InitVisible = true; this.labelStaticJudgmentCount.LineSpacing = 0F; @@ -840,7 +840,7 @@ this.labelStaticDoubleDelayTime.BackPictureBox2 = null; this.labelStaticDoubleDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticDoubleDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticDoubleDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticDoubleDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticDoubleDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticDoubleDelayTime.InitVisible = true; this.labelStaticDoubleDelayTime.LineSpacing = 0F; @@ -861,7 +861,7 @@ this.labelStaticJudgmentDelayTime.BackPictureBox2 = null; this.labelStaticJudgmentDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticJudgmentDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticJudgmentDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticJudgmentDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticJudgmentDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticJudgmentDelayTime.InitVisible = true; this.labelStaticJudgmentDelayTime.LineSpacing = 0F; @@ -882,7 +882,7 @@ this.labelStaticFilter.BackPictureBox2 = null; this.labelStaticFilter.BorderColor = System.Drawing.Color.Black; this.labelStaticFilter.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFilter.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFilter.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFilter.ForeColor = System.Drawing.Color.White; this.labelStaticFilter.InitVisible = true; this.labelStaticFilter.LineSpacing = 0F; @@ -910,7 +910,7 @@ this.groupBoxConveyor.Controls.Add(this.labelStaticFeedingRunTime); this.groupBoxConveyor.Controls.Add(this.labelStaticFeedingDelayTime); this.groupBoxConveyor.Controls.Add(this.labelStaticRejectConveyorRunTime); - this.groupBoxConveyor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxConveyor.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxConveyor.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxConveyor.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxConveyor.FrameLineThickness = 1; @@ -933,7 +933,7 @@ this.labelStaticFeedingConveyor.BackPictureBox2 = null; this.labelStaticFeedingConveyor.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedingConveyor.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingConveyor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedingConveyor.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingConveyor.ForeColor = System.Drawing.Color.White; this.labelStaticFeedingConveyor.InitVisible = true; this.labelStaticFeedingConveyor.LineSpacing = 0F; @@ -954,7 +954,7 @@ this.labelStaticRejectConveyor.BackPictureBox2 = null; this.labelStaticRejectConveyor.BorderColor = System.Drawing.Color.Black; this.labelStaticRejectConveyor.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRejectConveyor.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticRejectConveyor.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticRejectConveyor.ForeColor = System.Drawing.Color.White; this.labelStaticRejectConveyor.InitVisible = true; this.labelStaticRejectConveyor.LineSpacing = 0F; @@ -1038,7 +1038,7 @@ this.labelStaticRejectConveyorDelayTime.BackPictureBox2 = null; this.labelStaticRejectConveyorDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticRejectConveyorDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRejectConveyorDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticRejectConveyorDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticRejectConveyorDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticRejectConveyorDelayTime.InitVisible = true; this.labelStaticRejectConveyorDelayTime.LineSpacing = 0F; @@ -1080,7 +1080,7 @@ this.labelStaticFeedingRunTime.BackPictureBox2 = null; this.labelStaticFeedingRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedingRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedingRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingRunTime.ForeColor = System.Drawing.Color.White; this.labelStaticFeedingRunTime.InitVisible = true; this.labelStaticFeedingRunTime.LineSpacing = 0F; @@ -1101,7 +1101,7 @@ this.labelStaticFeedingDelayTime.BackPictureBox2 = null; this.labelStaticFeedingDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticFeedingDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticFeedingDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticFeedingDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticFeedingDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticFeedingDelayTime.InitVisible = true; this.labelStaticFeedingDelayTime.LineSpacing = 0F; @@ -1122,7 +1122,7 @@ this.labelStaticRejectConveyorRunTime.BackPictureBox2 = null; this.labelStaticRejectConveyorRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticRejectConveyorRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticRejectConveyorRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticRejectConveyorRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticRejectConveyorRunTime.ForeColor = System.Drawing.Color.White; this.labelStaticRejectConveyorRunTime.InitVisible = true; this.labelStaticRejectConveyorRunTime.LineSpacing = 0F; @@ -1153,7 +1153,7 @@ this.groupBoxSorter.Controls.Add(this.labelSorterDelayTime); this.groupBoxSorter.Controls.Add(this.labelStaticSorterDelayTime); this.groupBoxSorter.Controls.Add(this.labelStaticSorterRunTime); - this.groupBoxSorter.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.groupBoxSorter.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.groupBoxSorter.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxSorter.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxSorter.FrameLineThickness = 1; @@ -1218,7 +1218,7 @@ this.labelStaticSorterDelayTime.BackPictureBox2 = null; this.labelStaticSorterDelayTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorterDelayTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorterDelayTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorterDelayTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorterDelayTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorterDelayTime.InitVisible = true; this.labelStaticSorterDelayTime.LineSpacing = 0F; @@ -1239,7 +1239,7 @@ this.labelStaticSorterRunTime.BackPictureBox2 = null; this.labelStaticSorterRunTime.BorderColor = System.Drawing.Color.Black; this.labelStaticSorterRunTime.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticSorterRunTime.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelStaticSorterRunTime.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelStaticSorterRunTime.ForeColor = System.Drawing.Color.White; this.labelStaticSorterRunTime.InitVisible = true; this.labelStaticSorterRunTime.LineSpacing = 0F; @@ -1300,7 +1300,7 @@ this.buttonDown.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonDown.DisableImage = null; this.buttonDown.DownImage = null; - this.buttonDown.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonDown.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonDown.GroupID = 0; this.buttonDown.InitVisible = true; this.buttonDown.Location = new System.Drawing.Point(397, 80); @@ -1333,7 +1333,7 @@ this.buttonUp.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonUp.DisableImage = null; this.buttonUp.DownImage = null; - this.buttonUp.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.buttonUp.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.buttonUp.GroupID = 0; this.buttonUp.InitVisible = true; this.buttonUp.Location = new System.Drawing.Point(397, 33); @@ -1364,7 +1364,7 @@ this.smartListBox1.ColumnAlign = SmartX.SmartListBox.COLUMNALIGNS.CENTER; this.smartListBox1.ColumnDelimiter = '\0'; this.smartListBox1.ColumnOffsets = null; - this.smartListBox1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartListBox1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartListBox1.FontColor = System.Drawing.Color.Black; this.smartListBox1.InitVisible = true; this.smartListBox1.ItemAddOrder = SmartX.SmartListBox.ITEMADDORDERS.BOTTOMADD; @@ -1403,7 +1403,7 @@ this.labelAlarm2ErrorCode.BackPictureBox2 = null; this.labelAlarm2ErrorCode.BorderColor = System.Drawing.Color.Black; this.labelAlarm2ErrorCode.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelAlarm2ErrorCode.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelAlarm2ErrorCode.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelAlarm2ErrorCode.InitVisible = true; this.labelAlarm2ErrorCode.LineSpacing = 0F; this.labelAlarm2ErrorCode.Location = new System.Drawing.Point(11, 4); @@ -1464,7 +1464,7 @@ this.labelMessage1.BackPictureBox2 = null; this.labelMessage1.BorderColor = System.Drawing.Color.Black; this.labelMessage1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage1.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage1.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage1.InitVisible = true; this.labelMessage1.LineSpacing = 0F; this.labelMessage1.Location = new System.Drawing.Point(75, 62); @@ -1483,7 +1483,7 @@ this.smartLabel2.BackPictureBox2 = null; this.smartLabel2.BorderColor = System.Drawing.Color.Black; this.smartLabel2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel2.InitVisible = true; this.smartLabel2.LineSpacing = 0F; this.smartLabel2.Location = new System.Drawing.Point(11, 4); @@ -1568,7 +1568,7 @@ this.buttonCut.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCut.DisableImage = null; this.buttonCut.DownImage = null; - this.buttonCut.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); + this.buttonCut.Font = new System.Drawing.Font("New Gulim", 18F, System.Drawing.FontStyle.Bold); this.buttonCut.ForeColor = System.Drawing.Color.White; this.buttonCut.GroupID = 0; this.buttonCut.InitVisible = true; @@ -1632,17 +1632,17 @@ this.labelUserLevel.BackPictureBox2 = null; this.labelUserLevel.BorderColor = System.Drawing.Color.LightGray; this.labelUserLevel.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUserLevel.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserLevel.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserLevel.ForeColor = System.Drawing.Color.Black; this.labelUserLevel.InitVisible = true; this.labelUserLevel.LineSpacing = 0F; - this.labelUserLevel.Location = new System.Drawing.Point(664, 27); + this.labelUserLevel.Location = new System.Drawing.Point(661, 30); this.labelUserLevel.Name = "labelUserLevel"; - this.labelUserLevel.Size = new System.Drawing.Size(148, 15); + this.labelUserLevel.Size = new System.Drawing.Size(148, 17); this.labelUserLevel.TabIndex = 503; this.labelUserLevel.Text = "Level3"; this.labelUserLevel.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUserLevel.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; this.labelUserLevel.Wordwrap = false; // // labelUserID @@ -1653,16 +1653,16 @@ this.labelUserID.BackPictureBox2 = null; this.labelUserID.BorderColor = System.Drawing.Color.LightGray; this.labelUserID.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelUserID.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelUserID.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelUserID.InitVisible = true; this.labelUserID.LineSpacing = 0F; - this.labelUserID.Location = new System.Drawing.Point(664, 6); + this.labelUserID.Location = new System.Drawing.Point(661, 9); this.labelUserID.Name = "labelUserID"; - this.labelUserID.Size = new System.Drawing.Size(148, 15); + this.labelUserID.Size = new System.Drawing.Size(148, 17); this.labelUserID.TabIndex = 505; this.labelUserID.Text = "ABCDEFGHAB"; this.labelUserID.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelUserID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelUserID.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; this.labelUserID.Wordwrap = false; // // labelTitleTotalCount @@ -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("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.Font = new System.Drawing.Font("New Gulim", 15F, 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("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleNGCount.Font = new System.Drawing.Font("New Gulim", 15F, System.Drawing.FontStyle.Bold); this.labelTitleNGCount.InitVisible = true; this.labelTitleNGCount.LineSpacing = 0F; this.labelTitleNGCount.Location = new System.Drawing.Point(274, 703); @@ -1712,7 +1712,7 @@ this.labelTitleScreen.BackPictureBox2 = null; this.labelTitleScreen.BorderColor = System.Drawing.Color.Black; this.labelTitleScreen.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleScreen.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleScreen.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelTitleScreen.InitVisible = true; this.labelTitleScreen.LineSpacing = 0F; this.labelTitleScreen.Location = new System.Drawing.Point(664, 583); @@ -1811,7 +1811,7 @@ this.smartLabel3.BackPictureBox2 = null; this.smartLabel3.BorderColor = System.Drawing.Color.Black; this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; this.smartLabel3.Location = new System.Drawing.Point(363, 8); @@ -1884,7 +1884,7 @@ this.labelStaticAlarmContinuousNG.BackPictureBox2 = null; this.labelStaticAlarmContinuousNG.BorderColor = System.Drawing.Color.Black; this.labelStaticAlarmContinuousNG.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticAlarmContinuousNG.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticAlarmContinuousNG.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticAlarmContinuousNG.InitVisible = true; this.labelStaticAlarmContinuousNG.LineSpacing = 0F; this.labelStaticAlarmContinuousNG.Location = new System.Drawing.Point(207, 8); @@ -1934,7 +1934,7 @@ this.labelTitleBypass.BackPictureBox2 = null; this.labelTitleBypass.BorderColor = System.Drawing.Color.Black; this.labelTitleBypass.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleBypass.Font = new System.Drawing.Font("굴림", 14F, System.Drawing.FontStyle.Bold); + this.labelTitleBypass.Font = new System.Drawing.Font("Gulim", 14F, System.Drawing.FontStyle.Bold); this.labelTitleBypass.InitVisible = true; this.labelTitleBypass.LineSpacing = 0F; this.labelTitleBypass.Location = new System.Drawing.Point(35, 8); @@ -2105,7 +2105,7 @@ this.labelStaticATPC.BackPictureBox2 = null; this.labelStaticATPC.BorderColor = System.Drawing.Color.Black; this.labelStaticATPC.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticATPC.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticATPC.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticATPC.InitVisible = true; this.labelStaticATPC.LineSpacing = 0F; this.labelStaticATPC.Location = new System.Drawing.Point(26, 8); @@ -2197,7 +2197,7 @@ this.labelMessage3.BackPictureBox2 = null; this.labelMessage3.BorderColor = System.Drawing.Color.Black; this.labelMessage3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelMessage3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.labelMessage3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.labelMessage3.InitVisible = true; this.labelMessage3.LineSpacing = 0F; this.labelMessage3.Location = new System.Drawing.Point(75, 30); @@ -2216,7 +2216,7 @@ this.smartLabel4.BackPictureBox2 = null; this.smartLabel4.BorderColor = System.Drawing.Color.Black; this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel4.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Regular); + this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Regular); this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; this.smartLabel4.Location = new System.Drawing.Point(11, 4); @@ -2293,7 +2293,7 @@ this.buttonATPC_Reset.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonATPC_Reset.DisableImage = null; this.buttonATPC_Reset.DownImage = null; - this.buttonATPC_Reset.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.buttonATPC_Reset.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.buttonATPC_Reset.GroupID = 0; this.buttonATPC_Reset.InitVisible = true; this.buttonATPC_Reset.Location = new System.Drawing.Point(337, 42); @@ -2323,7 +2323,7 @@ this.labelStaticATPC_Lack.BackPictureBox2 = null; this.labelStaticATPC_Lack.BorderColor = System.Drawing.Color.Black; this.labelStaticATPC_Lack.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticATPC_Lack.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticATPC_Lack.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticATPC_Lack.InitVisible = true; this.labelStaticATPC_Lack.LineSpacing = 0F; this.labelStaticATPC_Lack.Location = new System.Drawing.Point(522, 8); @@ -2363,7 +2363,7 @@ this.labelStaticATPC_Pass.BackPictureBox2 = null; this.labelStaticATPC_Pass.BorderColor = System.Drawing.Color.Black; this.labelStaticATPC_Pass.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticATPC_Pass.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticATPC_Pass.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticATPC_Pass.InitVisible = true; this.labelStaticATPC_Pass.LineSpacing = 0F; this.labelStaticATPC_Pass.Location = new System.Drawing.Point(416, 8); @@ -2402,7 +2402,7 @@ this.labelStaticATPC_Count.BackPictureBox2 = null; this.labelStaticATPC_Count.BorderColor = System.Drawing.Color.Black; this.labelStaticATPC_Count.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticATPC_Count.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelStaticATPC_Count.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.labelStaticATPC_Count.InitVisible = true; this.labelStaticATPC_Count.LineSpacing = 0F; this.labelStaticATPC_Count.Location = new System.Drawing.Point(231, 8); @@ -2450,17 +2450,17 @@ this.labelExpireOfPassword.BackPictureBox2 = null; this.labelExpireOfPassword.BorderColor = System.Drawing.Color.LightGray; this.labelExpireOfPassword.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelExpireOfPassword.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.labelExpireOfPassword.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.labelExpireOfPassword.ForeColor = System.Drawing.Color.Black; this.labelExpireOfPassword.InitVisible = true; this.labelExpireOfPassword.LineSpacing = 0F; - this.labelExpireOfPassword.Location = new System.Drawing.Point(664, 48); + this.labelExpireOfPassword.Location = new System.Drawing.Point(661, 51); this.labelExpireOfPassword.Name = "labelExpireOfPassword"; - this.labelExpireOfPassword.Size = new System.Drawing.Size(148, 15); + this.labelExpireOfPassword.Size = new System.Drawing.Size(148, 17); this.labelExpireOfPassword.TabIndex = 574; this.labelExpireOfPassword.Text = "Level3"; this.labelExpireOfPassword.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelExpireOfPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelExpireOfPassword.TextVAlign = SmartX.SmartLabel.TextVerAlign.Top; this.labelExpireOfPassword.Visible = false; this.labelExpireOfPassword.Wordwrap = false; // diff --git a/INT69DC_7C/Forms/FormMenu.cs b/INT69DC_7C/Forms/FormMenu.cs index 8b41193..9e19d18 100644 --- a/INT69DC_7C/Forms/FormMenu.cs +++ b/INT69DC_7C/Forms/FormMenu.cs @@ -763,25 +763,9 @@ namespace INT69DC_7C.Forms } else if (button == this.buttonOptionSetting) { - #region 옵션설정 - if (this.ParentForm.SystemConfig.IsPart11 == true && this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer) - { - ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOptionSetting); - this.ParentForm.ChildFormOptionSetting.DisplayRefresh(); - } - else - { - DialogFormPasswordKeyPad1 password = new DialogFormPasswordKeyPad1(8, this.ParentForm.SystemConfig.Language); - DialogResult dialogResult = password.ShowDialog(); - if (dialogResult == DialogResult.OK) - { - if (this.ParentForm.ChildFormOptionSetting != null) - { - ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOptionSetting); - this.ParentForm.ChildFormOptionSetting.DisplayRefresh(); - } - } - } + #region 옵션설정 + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOptionSetting); + this.ParentForm.ChildFormOptionSetting.DisplayRefresh(); #endregion } else if (button == this.buttonCommunication) @@ -808,8 +792,13 @@ namespace INT69DC_7C.Forms { if (this.ParentForm.SystemConfig.IsLogin == false) { - this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer; - this.UpdateDisplayMenuAccess(this.ParentForm.SystemConfig.CurrentUser); + DialogFormPasswordKeyPad1 password = new DialogFormPasswordKeyPad1(8, this.ParentForm.SystemConfig.Language); + DialogResult dialogResult = password.ShowDialog(); + if (dialogResult == DialogResult.OK) + { + this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer; + this.UpdateDisplayMenuAccess(this.ParentForm.SystemConfig.CurrentUser); + } } else { diff --git a/INT69DC_7C/Forms/FormOptionSetting.Designer.cs b/INT69DC_7C/Forms/FormOptionSetting.Designer.cs index 4b38709..6579381 100644 --- a/INT69DC_7C/Forms/FormOptionSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormOptionSetting.Designer.cs @@ -33,9 +33,6 @@ this.buttonBack = new SmartX.SmartButton(); this.labelTitle = new SmartX.SmartLabel(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); - this.labelBuadrateWarning2 = new SmartX.SmartLabel(); - this.labelBuadrateWarning = new SmartX.SmartLabel(); - this.buttonSave = new SmartX.SmartButton(); this.smartLabel3 = new SmartX.SmartLabel(); this.buttonPart11 = new SmartX.SmartButton(); this.smartLabel5 = new SmartX.SmartLabel(); @@ -43,6 +40,9 @@ this.smartLabel1 = new SmartX.SmartLabel(); this.buttonFeedbackUse = new SmartX.SmartButton(); this.smartLabel4 = new SmartX.SmartLabel(); + this.labelBuadrateWarning2 = new SmartX.SmartLabel(); + this.labelBuadrateWarning = new SmartX.SmartLabel(); + this.buttonSave = new SmartX.SmartButton(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -100,7 +100,7 @@ this.labelTitle.BackPictureBox2 = null; this.labelTitle.BorderColor = System.Drawing.Color.Black; this.labelTitle.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitle.Font = new System.Drawing.Font("새굴림", 35F, System.Drawing.FontStyle.Bold); + this.labelTitle.Font = new System.Drawing.Font("New Gulim", 35F, System.Drawing.FontStyle.Bold); this.labelTitle.InitVisible = true; this.labelTitle.LineSpacing = 0F; this.labelTitle.Location = new System.Drawing.Point(199, 7); @@ -142,79 +142,6 @@ this.smartGroupBox1.Text = "smartGroupBox1"; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // - // labelBuadrateWarning2 - // - this.labelBuadrateWarning2.BackColor = System.Drawing.Color.Silver; - this.labelBuadrateWarning2.BackPictureBox = this.smartForm1; - this.labelBuadrateWarning2.BackPictureBox1 = null; - this.labelBuadrateWarning2.BackPictureBox2 = null; - this.labelBuadrateWarning2.BorderColor = System.Drawing.Color.Black; - this.labelBuadrateWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelBuadrateWarning2.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.DarkRed; - this.labelBuadrateWarning2.InitVisible = true; - this.labelBuadrateWarning2.LineSpacing = 0F; - this.labelBuadrateWarning2.Location = new System.Drawing.Point(14, 723); - this.labelBuadrateWarning2.Name = "labelBuadrateWarning2"; - this.labelBuadrateWarning2.Size = new System.Drawing.Size(811, 21); - this.labelBuadrateWarning2.TabIndex = 209; - this.labelBuadrateWarning2.Text = "※ 엔지니어 이외에 절대 변경하지 마십시오."; - this.labelBuadrateWarning2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelBuadrateWarning2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelBuadrateWarning2.Wordwrap = false; - // - // labelBuadrateWarning - // - this.labelBuadrateWarning.BackColor = System.Drawing.Color.Silver; - this.labelBuadrateWarning.BackPictureBox = this.smartForm1; - this.labelBuadrateWarning.BackPictureBox1 = null; - this.labelBuadrateWarning.BackPictureBox2 = null; - this.labelBuadrateWarning.BorderColor = System.Drawing.Color.Black; - this.labelBuadrateWarning.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelBuadrateWarning.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); - this.labelBuadrateWarning.ForeColor = System.Drawing.Color.DarkRed; - this.labelBuadrateWarning.InitVisible = true; - this.labelBuadrateWarning.LineSpacing = 0F; - this.labelBuadrateWarning.Location = new System.Drawing.Point(14, 694); - this.labelBuadrateWarning.Name = "labelBuadrateWarning"; - this.labelBuadrateWarning.Size = new System.Drawing.Size(811, 23); - this.labelBuadrateWarning.TabIndex = 208; - this.labelBuadrateWarning.Text = "※ 설정 변경 후, 전원을 껐다 켜야 합니다"; - this.labelBuadrateWarning.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelBuadrateWarning.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelBuadrateWarning.Wordwrap = false; - // - // buttonSave - // - this.buttonSave.BackPictureBox = null; - this.buttonSave.BackPictureBox1 = null; - this.buttonSave.BackPictureBox2 = null; - this.buttonSave.ButtonColor = System.Drawing.Color.Gray; - this.buttonSave.ButtonImageAutoSize = true; - this.buttonSave.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonSave.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.DisableImage"))); - this.buttonSave.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.DownImage"))); - this.buttonSave.GroupID = 0; - this.buttonSave.InitVisible = true; - this.buttonSave.Location = new System.Drawing.Point(834, 666); - this.buttonSave.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonSave.Name = "buttonSave"; - this.buttonSave.NestedClickEventPrevent = false; - this.buttonSave.OutlinePixel = 1; - this.buttonSave.RepeatInterval = 200; - this.buttonSave.RepeatIntervalAccelerate = null; - this.buttonSave.SafeInterval = 200; - this.buttonSave.Size = new System.Drawing.Size(84, 87); - this.buttonSave.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonSave.TabIndex = 207; - this.buttonSave.TextColor = System.Drawing.Color.Black; - this.buttonSave.TextDownColor = System.Drawing.Color.White; - this.buttonSave.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonSave.TextLocation = new System.Drawing.Point(0, 0); - this.buttonSave.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonSave.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.UpImage"))); - this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); - // // smartLabel3 // this.smartLabel3.BackColor = System.Drawing.Color.Silver; @@ -223,7 +150,7 @@ this.smartLabel3.BackPictureBox2 = null; this.smartLabel3.BorderColor = System.Drawing.Color.Black; this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 10F, System.Drawing.FontStyle.Bold); + this.smartLabel3.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); this.smartLabel3.ForeColor = System.Drawing.Color.DarkRed; this.smartLabel3.InitVisible = true; this.smartLabel3.LineSpacing = 0F; @@ -265,6 +192,7 @@ this.buttonPart11.TextLocation = new System.Drawing.Point(0, 0); this.buttonPart11.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonPart11.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.UpImage"))); + this.buttonPart11.Click += new System.EventHandler(this.Control_Click); // // smartLabel5 // @@ -273,7 +201,7 @@ this.smartLabel5.BackPictureBox2 = null; this.smartLabel5.BorderColor = System.Drawing.Color.Black; this.smartLabel5.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel5.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel5.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.smartLabel5.InitVisible = true; this.smartLabel5.LineSpacing = 0F; this.smartLabel5.Location = new System.Drawing.Point(207, 359); @@ -314,6 +242,7 @@ this.buttonDataStatistics.TextLocation = new System.Drawing.Point(0, 0); this.buttonDataStatistics.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonDataStatistics.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonDataStatistics.UpImage"))); + this.buttonDataStatistics.Click += new System.EventHandler(this.Control_Click); // // smartLabel1 // @@ -322,7 +251,7 @@ this.smartLabel1.BackPictureBox2 = null; this.smartLabel1.BorderColor = System.Drawing.Color.Black; this.smartLabel1.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel1.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel1.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.smartLabel1.InitVisible = true; this.smartLabel1.LineSpacing = 0F; this.smartLabel1.Location = new System.Drawing.Point(207, 309); @@ -363,6 +292,7 @@ this.buttonFeedbackUse.TextLocation = new System.Drawing.Point(0, 0); this.buttonFeedbackUse.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; this.buttonFeedbackUse.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonFeedbackUse.UpImage"))); + this.buttonFeedbackUse.Click += new System.EventHandler(this.Control_Click); // // smartLabel4 // @@ -371,7 +301,7 @@ this.smartLabel4.BackPictureBox2 = null; this.smartLabel4.BorderColor = System.Drawing.Color.Black; this.smartLabel4.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel4.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel4.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.smartLabel4.InitVisible = true; this.smartLabel4.LineSpacing = 0F; this.smartLabel4.Location = new System.Drawing.Point(207, 278); @@ -383,6 +313,80 @@ this.smartLabel4.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel4.Wordwrap = false; // + // labelBuadrateWarning2 + // + this.labelBuadrateWarning2.BackColor = System.Drawing.Color.Silver; + this.labelBuadrateWarning2.BackPictureBox = this.smartForm1; + this.labelBuadrateWarning2.BackPictureBox1 = null; + this.labelBuadrateWarning2.BackPictureBox2 = null; + this.labelBuadrateWarning2.BorderColor = System.Drawing.Color.Black; + this.labelBuadrateWarning2.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelBuadrateWarning2.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelBuadrateWarning2.ForeColor = System.Drawing.Color.DarkRed; + this.labelBuadrateWarning2.InitVisible = true; + this.labelBuadrateWarning2.LineSpacing = 0F; + this.labelBuadrateWarning2.Location = new System.Drawing.Point(14, 723); + this.labelBuadrateWarning2.Name = "labelBuadrateWarning2"; + this.labelBuadrateWarning2.Size = new System.Drawing.Size(811, 21); + this.labelBuadrateWarning2.TabIndex = 209; + this.labelBuadrateWarning2.Text = "※ 엔지니어 이외에 절대 변경하지 마십시오."; + this.labelBuadrateWarning2.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelBuadrateWarning2.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelBuadrateWarning2.Wordwrap = false; + // + // labelBuadrateWarning + // + this.labelBuadrateWarning.BackColor = System.Drawing.Color.Silver; + this.labelBuadrateWarning.BackPictureBox = this.smartForm1; + this.labelBuadrateWarning.BackPictureBox1 = null; + this.labelBuadrateWarning.BackPictureBox2 = null; + this.labelBuadrateWarning.BorderColor = System.Drawing.Color.Black; + this.labelBuadrateWarning.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelBuadrateWarning.Font = new System.Drawing.Font("New Gulim", 10F, System.Drawing.FontStyle.Bold); + this.labelBuadrateWarning.ForeColor = System.Drawing.Color.DarkRed; + this.labelBuadrateWarning.InitVisible = true; + this.labelBuadrateWarning.LineSpacing = 0F; + this.labelBuadrateWarning.Location = new System.Drawing.Point(14, 694); + this.labelBuadrateWarning.Name = "labelBuadrateWarning"; + this.labelBuadrateWarning.Size = new System.Drawing.Size(811, 23); + this.labelBuadrateWarning.TabIndex = 208; + this.labelBuadrateWarning.Text = "※ 설정 변경 후, 전원을 껐다 켜야 합니다"; + this.labelBuadrateWarning.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelBuadrateWarning.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelBuadrateWarning.Wordwrap = false; + // + // buttonSave + // + this.buttonSave.BackPictureBox = null; + this.buttonSave.BackPictureBox1 = null; + this.buttonSave.BackPictureBox2 = null; + this.buttonSave.ButtonColor = System.Drawing.Color.Gray; + this.buttonSave.ButtonImageAutoSize = true; + this.buttonSave.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonSave.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.DisableImage"))); + this.buttonSave.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.DownImage"))); + this.buttonSave.GroupID = 0; + this.buttonSave.InitVisible = true; + this.buttonSave.Location = new System.Drawing.Point(834, 666); + this.buttonSave.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonSave.Name = "buttonSave"; + this.buttonSave.NestedClickEventPrevent = false; + this.buttonSave.OutlinePixel = 1; + this.buttonSave.RepeatInterval = 200; + this.buttonSave.RepeatIntervalAccelerate = null; + this.buttonSave.SafeInterval = 200; + this.buttonSave.Size = new System.Drawing.Size(84, 87); + this.buttonSave.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonSave.TabIndex = 207; + this.buttonSave.TextColor = System.Drawing.Color.Black; + this.buttonSave.TextDownColor = System.Drawing.Color.White; + this.buttonSave.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonSave.TextLocation = new System.Drawing.Point(0, 0); + this.buttonSave.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonSave.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonSave.UpImage"))); + this.buttonSave.Visible = false; + this.buttonSave.Click += new System.EventHandler(this.buttonSave_Click); + // // FormOptionSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT69DC_7C/Forms/FormOptionSetting.cs b/INT69DC_7C/Forms/FormOptionSetting.cs index c8649fe..35be8c8 100644 --- a/INT69DC_7C/Forms/FormOptionSetting.cs +++ b/INT69DC_7C/Forms/FormOptionSetting.cs @@ -136,6 +136,8 @@ namespace INT69DC_7C.Forms this.buttonPart11.ButtonDown(); else this.buttonPart11.ButtonUp(); + + this.buttonSave.Visible = false; } public void DisplayRefresh() diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 199eeb3..54bdbc7 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,6 +15,16 @@ Ƽ 8,10,12 /ƽ 跮 */ +@ Ver 11.0.2 by LSJ + - 2024.01.04 + - Ver 11.0.1 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ߷ ڵ + Finish -> Success + - ޴ ư + йȣ : MMdd + 0810 + - ɼ ޴ + @ Ver 11.0.1 by CJY - 2023.10.17 - Ver 11.0.0 Modify