diff --git a/INT69DC_7C.suo b/INT69DC_7C.suo new file mode 100644 index 0000000..1cdc03d Binary files /dev/null and b/INT69DC_7C.suo differ diff --git a/INT69DC_7C/Controls/ControlCalibration10.cs b/INT69DC_7C/Controls/ControlCalibration10.cs index d80030a..1548c2b 100644 --- a/INT69DC_7C/Controls/ControlCalibration10.cs +++ b/INT69DC_7C/Controls/ControlCalibration10.cs @@ -21,10 +21,11 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollectionButtonLine; - private Collection CollectionLabelWeight; - private Collection CollectionLabelADC; - private Collection CollectionLabelConstant; + private Collection CollButtonLine; + private Collection CollLabelWeight; + private Collection CollLabelADC; + private Collection CollLabelConstant; + private Collection CollCalStatus; #endregion #region Constructor @@ -52,67 +53,72 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollectionButtonLine = new Collection(); - this.CollectionLabelWeight = new Collection(); - this.CollectionLabelADC = new Collection(); - this.CollectionLabelConstant = new Collection(); + this.CollButtonLine = new Collection(); + this.CollLabelWeight = new Collection(); + this.CollLabelADC = new Collection(); + this.CollLabelConstant = new Collection(); + this.CollCalStatus = new Collection(); - this.CollectionButtonLine.Clear(); - this.CollectionLabelWeight.Clear(); - this.CollectionLabelADC.Clear(); - this.CollectionLabelConstant.Clear(); + this.CollButtonLine.Clear(); + this.CollLabelWeight.Clear(); + this.CollLabelADC.Clear(); + this.CollLabelConstant.Clear(); + this.CollCalStatus.Clear(); - this.CollectionButtonLine.Add(this.buttonLine1); - this.CollectionButtonLine.Add(this.buttonLine2); - this.CollectionButtonLine.Add(this.buttonLine3); - this.CollectionButtonLine.Add(this.buttonLine4); - this.CollectionButtonLine.Add(this.buttonLine5); - this.CollectionButtonLine.Add(this.buttonLine6); - this.CollectionButtonLine.Add(this.buttonLine7); - this.CollectionButtonLine.Add(this.buttonLine8); - this.CollectionButtonLine.Add(this.buttonLine9); - this.CollectionButtonLine.Add(this.buttonLine10); + 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.CollectionLabelWeight.Add(this.labelWeight1); - this.CollectionLabelWeight.Add(this.labelWeight2); - this.CollectionLabelWeight.Add(this.labelWeight3); - this.CollectionLabelWeight.Add(this.labelWeight4); - this.CollectionLabelWeight.Add(this.labelWeight5); - this.CollectionLabelWeight.Add(this.labelWeight6); - this.CollectionLabelWeight.Add(this.labelWeight7); - this.CollectionLabelWeight.Add(this.labelWeight8); - this.CollectionLabelWeight.Add(this.labelWeight9); - this.CollectionLabelWeight.Add(this.labelWeight10); + this.CollLabelWeight.Add(this.labelWeight1); + this.CollLabelWeight.Add(this.labelWeight2); + this.CollLabelWeight.Add(this.labelWeight3); + this.CollLabelWeight.Add(this.labelWeight4); + this.CollLabelWeight.Add(this.labelWeight5); + this.CollLabelWeight.Add(this.labelWeight6); + this.CollLabelWeight.Add(this.labelWeight7); + this.CollLabelWeight.Add(this.labelWeight8); + this.CollLabelWeight.Add(this.labelWeight9); + this.CollLabelWeight.Add(this.labelWeight10); - this.CollectionLabelADC.Add(this.labelADC1); - this.CollectionLabelADC.Add(this.labelADC2); - this.CollectionLabelADC.Add(this.labelADC3); - this.CollectionLabelADC.Add(this.labelADC4); - this.CollectionLabelADC.Add(this.labelADC5); - this.CollectionLabelADC.Add(this.labelADC6); - this.CollectionLabelADC.Add(this.labelADC7); - this.CollectionLabelADC.Add(this.labelADC8); - this.CollectionLabelADC.Add(this.labelADC9); - this.CollectionLabelADC.Add(this.labelADC10); + this.CollLabelADC.Add(this.labelADC1); + this.CollLabelADC.Add(this.labelADC2); + this.CollLabelADC.Add(this.labelADC3); + this.CollLabelADC.Add(this.labelADC4); + this.CollLabelADC.Add(this.labelADC5); + this.CollLabelADC.Add(this.labelADC6); + this.CollLabelADC.Add(this.labelADC7); + this.CollLabelADC.Add(this.labelADC8); + this.CollLabelADC.Add(this.labelADC9); + this.CollLabelADC.Add(this.labelADC10); - this.CollectionLabelConstant.Add(this.labelConstant1); - this.CollectionLabelConstant.Add(this.labelConstant2); - this.CollectionLabelConstant.Add(this.labelConstant3); - this.CollectionLabelConstant.Add(this.labelConstant4); - this.CollectionLabelConstant.Add(this.labelConstant5); - this.CollectionLabelConstant.Add(this.labelConstant6); - this.CollectionLabelConstant.Add(this.labelConstant7); - this.CollectionLabelConstant.Add(this.labelConstant8); - this.CollectionLabelConstant.Add(this.labelConstant9); - this.CollectionLabelConstant.Add(this.labelConstant10); + this.CollLabelConstant.Add(this.labelConstant1); + this.CollLabelConstant.Add(this.labelConstant2); + this.CollLabelConstant.Add(this.labelConstant3); + this.CollLabelConstant.Add(this.labelConstant4); + this.CollLabelConstant.Add(this.labelConstant5); + this.CollLabelConstant.Add(this.labelConstant6); + this.CollLabelConstant.Add(this.labelConstant7); + this.CollLabelConstant.Add(this.labelConstant8); + this.CollLabelConstant.Add(this.labelConstant9); + this.CollLabelConstant.Add(this.labelConstant10); + + for (int i = 0; i < 10; i++) + this.CollCalStatus.Add(new CalibrationStatus()); } private void InitilizeControls() { for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) { - this.CollectionLabelWeight[i].Text = "0.0"; - this.CollectionLabelADC[i].Text = "0.0"; - this.CollectionLabelConstant[i].Text = "0.0"; + this.CollLabelWeight[i].Text = "0.0"; + this.CollLabelADC[i].Text = "0.0"; + this.CollLabelConstant[i].Text = "0.0"; } } private void InitializeDesign() @@ -122,17 +128,20 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollectionButtonLine == null || this.CollectionButtonLine.Count == 0) + if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) return; - for (int i = 0; i < this.CollectionButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - this.CollectionButtonLine[i].ButtonUp(); + this.CollButtonLine[i].ButtonUp(); + this.CollCalStatus[i].Initialize(); } } public void CalibrationBalance() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("분동 계산중 입니다"); @@ -164,16 +173,27 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + detail = string.Format("{0} Lane Balance", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } this.ParentForm.CalibrationButtonEnable(false, false, true); } public void CalibrationStart() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 시작합니다."); @@ -204,18 +224,30 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); - bt.Enabled = false; + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + this.CollCalStatus[i].Initialize(); + detail = string.Format("{0} Lane Start", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } + + this.CollButtonLine[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); } public void CalibrationCancel() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 취소합니다"); @@ -242,12 +274,25 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); - bt.Enabled = true; + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[i].IsCancel == false) + { + this.CollCalStatus[i].IsCancel = true; + detail = string.Format("{0} Lane Cancel", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } + } + + this.CollButtonLine[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -299,23 +344,25 @@ namespace INT69DC_7C.Controls } public void UpdateWeightDisplay(DataStore.EquipmentStatus status, Collection weights) { - if (this.CollectionLabelWeight == null || weights.Count < this.CollectionLabelWeight.Count || status == DataStore.EquipmentStatus.Start) + if (this.CollLabelWeight == null || weights.Count < this.CollLabelWeight.Count || status == DataStore.EquipmentStatus.Start) return; for (int i = 0; i < weights.Count; i++) { - if (this.CollectionButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } - private void UpdateLabelWeight(SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) + private void UpdateLabelWeight(int index, SmartButton buttonLane, SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) { + string detail = ""; + switch (weightData.Status) { case DataStore.WeightStatus.CalNomal: @@ -398,8 +445,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsFinish == false) + { + this.CollCalStatus[index].IsFinish = true; + detail = string.Format("{0}Lane Finish", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.FinishColor; @@ -438,8 +496,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsError == false) + { + this.CollCalStatus[index].IsError = true; + detail = string.Format("{0}Lane Error", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.NormalColor; diff --git a/INT69DC_7C/Controls/ControlCalibration12.cs b/INT69DC_7C/Controls/ControlCalibration12.cs index 8e32f09..ef5a6a7 100644 --- a/INT69DC_7C/Controls/ControlCalibration12.cs +++ b/INT69DC_7C/Controls/ControlCalibration12.cs @@ -21,10 +21,11 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollectionButtonLine; - private Collection CollectionLabelWeight; - private Collection CollectionLabelADC; - private Collection CollectionLabelConstant; + private Collection CollButtonLine; + private Collection CollLabelWeight; + private Collection CollLabelADC; + private Collection CollLabelConstant; + private Collection CollCalStatus; #endregion #region Constructor @@ -52,75 +53,80 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollectionButtonLine = new Collection(); - this.CollectionLabelWeight = new Collection(); - this.CollectionLabelADC = new Collection(); - this.CollectionLabelConstant = new Collection(); + this.CollButtonLine = new Collection(); + this.CollLabelWeight = new Collection(); + this.CollLabelADC = new Collection(); + this.CollLabelConstant = new Collection(); + this.CollCalStatus = new Collection(); - this.CollectionButtonLine.Clear(); - this.CollectionLabelWeight.Clear(); - this.CollectionLabelADC.Clear(); - this.CollectionLabelConstant.Clear(); + this.CollButtonLine.Clear(); + this.CollLabelWeight.Clear(); + this.CollLabelADC.Clear(); + this.CollLabelConstant.Clear(); + this.CollCalStatus.Clear(); - this.CollectionButtonLine.Add(this.buttonLine1); - this.CollectionButtonLine.Add(this.buttonLine2); - this.CollectionButtonLine.Add(this.buttonLine3); - this.CollectionButtonLine.Add(this.buttonLine4); - this.CollectionButtonLine.Add(this.buttonLine5); - this.CollectionButtonLine.Add(this.buttonLine6); - this.CollectionButtonLine.Add(this.buttonLine7); - this.CollectionButtonLine.Add(this.buttonLine8); - this.CollectionButtonLine.Add(this.buttonLine9); - this.CollectionButtonLine.Add(this.buttonLine10); - this.CollectionButtonLine.Add(this.buttonLine11); - this.CollectionButtonLine.Add(this.buttonLine12); + 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.CollectionLabelWeight.Add(this.labelWeight1); - this.CollectionLabelWeight.Add(this.labelWeight2); - this.CollectionLabelWeight.Add(this.labelWeight3); - this.CollectionLabelWeight.Add(this.labelWeight4); - this.CollectionLabelWeight.Add(this.labelWeight5); - this.CollectionLabelWeight.Add(this.labelWeight6); - this.CollectionLabelWeight.Add(this.labelWeight7); - this.CollectionLabelWeight.Add(this.labelWeight8); - this.CollectionLabelWeight.Add(this.labelWeight9); - this.CollectionLabelWeight.Add(this.labelWeight10); - this.CollectionLabelWeight.Add(this.labelWeight11); - this.CollectionLabelWeight.Add(this.labelWeight12); + this.CollLabelWeight.Add(this.labelWeight1); + this.CollLabelWeight.Add(this.labelWeight2); + this.CollLabelWeight.Add(this.labelWeight3); + this.CollLabelWeight.Add(this.labelWeight4); + this.CollLabelWeight.Add(this.labelWeight5); + this.CollLabelWeight.Add(this.labelWeight6); + this.CollLabelWeight.Add(this.labelWeight7); + this.CollLabelWeight.Add(this.labelWeight8); + this.CollLabelWeight.Add(this.labelWeight9); + this.CollLabelWeight.Add(this.labelWeight10); + this.CollLabelWeight.Add(this.labelWeight11); + this.CollLabelWeight.Add(this.labelWeight12); - this.CollectionLabelADC.Add(this.labelADC1); - this.CollectionLabelADC.Add(this.labelADC2); - this.CollectionLabelADC.Add(this.labelADC3); - this.CollectionLabelADC.Add(this.labelADC4); - this.CollectionLabelADC.Add(this.labelADC5); - this.CollectionLabelADC.Add(this.labelADC6); - this.CollectionLabelADC.Add(this.labelADC7); - this.CollectionLabelADC.Add(this.labelADC8); - this.CollectionLabelADC.Add(this.labelADC9); - this.CollectionLabelADC.Add(this.labelADC10); - this.CollectionLabelADC.Add(this.labelADC11); - this.CollectionLabelADC.Add(this.labelADC12); + this.CollLabelADC.Add(this.labelADC1); + this.CollLabelADC.Add(this.labelADC2); + this.CollLabelADC.Add(this.labelADC3); + this.CollLabelADC.Add(this.labelADC4); + this.CollLabelADC.Add(this.labelADC5); + this.CollLabelADC.Add(this.labelADC6); + this.CollLabelADC.Add(this.labelADC7); + this.CollLabelADC.Add(this.labelADC8); + this.CollLabelADC.Add(this.labelADC9); + this.CollLabelADC.Add(this.labelADC10); + this.CollLabelADC.Add(this.labelADC11); + this.CollLabelADC.Add(this.labelADC12); - this.CollectionLabelConstant.Add(this.labelConstant1); - this.CollectionLabelConstant.Add(this.labelConstant2); - this.CollectionLabelConstant.Add(this.labelConstant3); - this.CollectionLabelConstant.Add(this.labelConstant4); - this.CollectionLabelConstant.Add(this.labelConstant5); - this.CollectionLabelConstant.Add(this.labelConstant6); - this.CollectionLabelConstant.Add(this.labelConstant7); - this.CollectionLabelConstant.Add(this.labelConstant8); - this.CollectionLabelConstant.Add(this.labelConstant9); - this.CollectionLabelConstant.Add(this.labelConstant10); - this.CollectionLabelConstant.Add(this.labelConstant11); - this.CollectionLabelConstant.Add(this.labelConstant12); + this.CollLabelConstant.Add(this.labelConstant1); + this.CollLabelConstant.Add(this.labelConstant2); + this.CollLabelConstant.Add(this.labelConstant3); + this.CollLabelConstant.Add(this.labelConstant4); + this.CollLabelConstant.Add(this.labelConstant5); + this.CollLabelConstant.Add(this.labelConstant6); + this.CollLabelConstant.Add(this.labelConstant7); + this.CollLabelConstant.Add(this.labelConstant8); + this.CollLabelConstant.Add(this.labelConstant9); + this.CollLabelConstant.Add(this.labelConstant10); + this.CollLabelConstant.Add(this.labelConstant11); + this.CollLabelConstant.Add(this.labelConstant12); + + for (int i = 0; i < 12; i++) + this.CollCalStatus.Add(new CalibrationStatus()); } private void InitilizeControls() { for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) { - this.CollectionLabelWeight[i].Text = "0.0"; - this.CollectionLabelADC[i].Text = "0.0"; - this.CollectionLabelConstant[i].Text = "0.0"; + this.CollLabelWeight[i].Text = "0.0"; + this.CollLabelADC[i].Text = "0.0"; + this.CollLabelConstant[i].Text = "0.0"; } } private void InitializeDesign() @@ -129,17 +135,20 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollectionButtonLine == null || this.CollectionButtonLine.Count == 0) + if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) return; - for (int i = 0; i < this.CollectionButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - this.CollectionButtonLine[i].ButtonUp(); + this.CollButtonLine[i].ButtonUp(); + this.CollCalStatus[i].Initialize(); } } public void CalibrationBalance() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("분동 계산중 입니다"); @@ -170,16 +179,27 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + detail = string.Format("{0} Lane Balance", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } this.ParentForm.CalibrationButtonEnable(false, false, true); } public void CalibrationStart() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 시작합니다."); @@ -210,18 +230,30 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); - bt.Enabled = false; + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + this.CollCalStatus[i].Initialize(); + detail = string.Format("{0} Lane Start", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } + + this.CollButtonLine[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); } public void CalibrationCancel() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 취소합니다"); @@ -248,12 +280,25 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); - bt.Enabled = true; + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[i].IsCancel == false) + { + this.CollCalStatus[i].IsCancel = true; + detail = string.Format("{0} Lane Cancel", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } + } + + this.CollButtonLine[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -313,23 +358,25 @@ namespace INT69DC_7C.Controls } public void UpdateWeightDisplay(DataStore.EquipmentStatus status, Collection weights) { - if (this.CollectionLabelWeight == null || weights.Count < this.CollectionLabelWeight.Count || status == DataStore.EquipmentStatus.Start) + if (this.CollLabelWeight == null || weights.Count < this.CollLabelWeight.Count || status == DataStore.EquipmentStatus.Start) return; for (int i = 0; i < weights.Count; i++) { - if (this.CollectionButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } - private void UpdateLabelWeight(SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) + private void UpdateLabelWeight(int index, SmartButton buttonLane, SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) { + string detail = ""; + switch (weightData.Status) { case DataStore.WeightStatus.CalNomal: @@ -412,8 +459,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsFinish == false) + { + this.CollCalStatus[index].IsFinish = true; + detail = string.Format("{0}Lane Finish", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.FinishColor; @@ -452,8 +510,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsError == false) + { + this.CollCalStatus[index].IsError = true; + detail = string.Format("{0}Lane Error", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.NormalColor; diff --git a/INT69DC_7C/Controls/ControlCalibration7.Designer.cs b/INT69DC_7C/Controls/ControlCalibration7.Designer.cs index d786886..a654826 100644 --- a/INT69DC_7C/Controls/ControlCalibration7.Designer.cs +++ b/INT69DC_7C/Controls/ControlCalibration7.Designer.cs @@ -57,13 +57,13 @@ this.smartLabel3 = new SmartX.SmartLabel(); this.smartLabel2 = new SmartX.SmartLabel(); this.smartLabel1 = new SmartX.SmartLabel(); - this.buttonLine1 = new SmartX.SmartButton(); - this.buttonLine5 = new SmartX.SmartButton(); - this.buttonLine2 = new SmartX.SmartButton(); - this.buttonLine6 = new SmartX.SmartButton(); - this.buttonLine3 = new SmartX.SmartButton(); - this.buttonLine7 = new SmartX.SmartButton(); - this.buttonLine4 = new SmartX.SmartButton(); + this.buttonLane1 = new SmartX.SmartButton(); + this.buttonLane5 = new SmartX.SmartButton(); + this.buttonLane2 = new SmartX.SmartButton(); + this.buttonLane6 = new SmartX.SmartButton(); + this.buttonLane3 = new SmartX.SmartButton(); + this.buttonLane7 = new SmartX.SmartButton(); + this.buttonLane4 = new SmartX.SmartButton(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); this.smartGroupBox1.SuspendLayout(); this.SuspendLayout(); @@ -621,227 +621,241 @@ this.smartLabel1.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.smartLabel1.Wordwrap = false; // - // buttonLine1 + // buttonLane1 // - this.buttonLine1.BackPictureBox = null; - this.buttonLine1.BackPictureBox1 = null; - this.buttonLine1.BackPictureBox2 = null; - this.buttonLine1.ButtonColor = System.Drawing.Color.Gray; - this.buttonLine1.ButtonImageAutoSize = true; - this.buttonLine1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLine1.DisableImage = null; - this.buttonLine1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine1.DownImage"))); - this.buttonLine1.GroupID = 0; - this.buttonLine1.InitVisible = true; - this.buttonLine1.Location = new System.Drawing.Point(27, 13); - this.buttonLine1.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; - this.buttonLine1.Name = "buttonLine1"; - this.buttonLine1.NestedClickEventPrevent = false; - this.buttonLine1.RepeatInterval = 200; - this.buttonLine1.SafeInterval = 200; - this.buttonLine1.Size = new System.Drawing.Size(238, 120); - this.buttonLine1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonLine1.TabIndex = 1; - this.buttonLine1.Tag = "A"; - this.buttonLine1.TextColor = System.Drawing.Color.Black; - this.buttonLine1.TextDownColor = System.Drawing.Color.White; - this.buttonLine1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonLine1.TextLocation = new System.Drawing.Point(0, 0); - this.buttonLine1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonLine1.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLine1.UpImage"))); - this.buttonLine1.Click += new System.EventHandler(this.buttonLine_Click); + this.buttonLane1.BackPictureBox = null; + this.buttonLane1.BackPictureBox1 = null; + this.buttonLane1.BackPictureBox2 = null; + this.buttonLane1.ButtonColor = System.Drawing.Color.Gray; + this.buttonLane1.ButtonImageAutoSize = true; + this.buttonLane1.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLane1.DisableImage = null; + this.buttonLane1.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLane1.DownImage"))); + this.buttonLane1.GroupID = 0; + this.buttonLane1.InitVisible = true; + this.buttonLane1.Location = new System.Drawing.Point(27, 13); + this.buttonLane1.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; + this.buttonLane1.Name = "buttonLane1"; + this.buttonLane1.NestedClickEventPrevent = false; + this.buttonLane1.OutlinePixel = 1; + this.buttonLane1.RepeatInterval = 200; + this.buttonLane1.RepeatIntervalAccelerate = null; + this.buttonLane1.SafeInterval = 200; + this.buttonLane1.Size = new System.Drawing.Size(238, 120); + this.buttonLane1.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLane1.TabIndex = 1; + this.buttonLane1.Tag = "A"; + this.buttonLane1.TextColor = System.Drawing.Color.Black; + this.buttonLane1.TextDownColor = System.Drawing.Color.White; + this.buttonLane1.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLane1.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLane1.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLane1.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLane1.UpImage"))); + this.buttonLane1.Click += new System.EventHandler(this.buttonLane_Click); // - // buttonLine5 + // buttonLane5 // - this.buttonLine5.BackPictureBox = null; - this.buttonLine5.BackPictureBox1 = null; - this.buttonLine5.BackPictureBox2 = null; - this.buttonLine5.ButtonColor = System.Drawing.Color.Gray; - this.buttonLine5.ButtonImageAutoSize = true; - this.buttonLine5.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLine5.DisableImage = null; - this.buttonLine5.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine5.DownImage"))); - this.buttonLine5.GroupID = 0; - this.buttonLine5.InitVisible = true; - this.buttonLine5.Location = new System.Drawing.Point(27, 248); - this.buttonLine5.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; - this.buttonLine5.Name = "buttonLine5"; - this.buttonLine5.NestedClickEventPrevent = false; - this.buttonLine5.RepeatInterval = 200; - this.buttonLine5.SafeInterval = 200; - this.buttonLine5.Size = new System.Drawing.Size(238, 120); - this.buttonLine5.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonLine5.TabIndex = 1; - this.buttonLine5.Tag = "E"; - this.buttonLine5.TextColor = System.Drawing.Color.Black; - this.buttonLine5.TextDownColor = System.Drawing.Color.White; - this.buttonLine5.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonLine5.TextLocation = new System.Drawing.Point(0, 0); - this.buttonLine5.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonLine5.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLine5.UpImage"))); - this.buttonLine5.Click += new System.EventHandler(this.buttonLine_Click); + this.buttonLane5.BackPictureBox = null; + this.buttonLane5.BackPictureBox1 = null; + this.buttonLane5.BackPictureBox2 = null; + this.buttonLane5.ButtonColor = System.Drawing.Color.Gray; + this.buttonLane5.ButtonImageAutoSize = true; + this.buttonLane5.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLane5.DisableImage = null; + this.buttonLane5.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLane5.DownImage"))); + this.buttonLane5.GroupID = 0; + this.buttonLane5.InitVisible = true; + this.buttonLane5.Location = new System.Drawing.Point(27, 248); + this.buttonLane5.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; + this.buttonLane5.Name = "buttonLane5"; + this.buttonLane5.NestedClickEventPrevent = false; + this.buttonLane5.OutlinePixel = 1; + this.buttonLane5.RepeatInterval = 200; + this.buttonLane5.RepeatIntervalAccelerate = null; + this.buttonLane5.SafeInterval = 200; + this.buttonLane5.Size = new System.Drawing.Size(238, 120); + this.buttonLane5.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLane5.TabIndex = 1; + this.buttonLane5.Tag = "E"; + this.buttonLane5.TextColor = System.Drawing.Color.Black; + this.buttonLane5.TextDownColor = System.Drawing.Color.White; + this.buttonLane5.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLane5.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLane5.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLane5.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLane5.UpImage"))); + this.buttonLane5.Click += new System.EventHandler(this.buttonLane_Click); // - // buttonLine2 + // buttonLane2 // - this.buttonLine2.BackPictureBox = null; - this.buttonLine2.BackPictureBox1 = null; - this.buttonLine2.BackPictureBox2 = null; - this.buttonLine2.ButtonColor = System.Drawing.Color.Gray; - this.buttonLine2.ButtonImageAutoSize = true; - this.buttonLine2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLine2.DisableImage = null; - this.buttonLine2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine2.DownImage"))); - this.buttonLine2.GroupID = 0; - this.buttonLine2.InitVisible = true; - this.buttonLine2.Location = new System.Drawing.Point(271, 13); - this.buttonLine2.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; - this.buttonLine2.Name = "buttonLine2"; - this.buttonLine2.NestedClickEventPrevent = false; - this.buttonLine2.RepeatInterval = 200; - this.buttonLine2.SafeInterval = 200; - this.buttonLine2.Size = new System.Drawing.Size(238, 120); - this.buttonLine2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonLine2.TabIndex = 1; - this.buttonLine2.Tag = "B"; - this.buttonLine2.TextColor = System.Drawing.Color.Black; - this.buttonLine2.TextDownColor = System.Drawing.Color.White; - this.buttonLine2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonLine2.TextLocation = new System.Drawing.Point(0, 0); - this.buttonLine2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonLine2.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLine2.UpImage"))); - this.buttonLine2.Click += new System.EventHandler(this.buttonLine_Click); + this.buttonLane2.BackPictureBox = null; + this.buttonLane2.BackPictureBox1 = null; + this.buttonLane2.BackPictureBox2 = null; + this.buttonLane2.ButtonColor = System.Drawing.Color.Gray; + this.buttonLane2.ButtonImageAutoSize = true; + this.buttonLane2.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLane2.DisableImage = null; + this.buttonLane2.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLane2.DownImage"))); + this.buttonLane2.GroupID = 0; + this.buttonLane2.InitVisible = true; + this.buttonLane2.Location = new System.Drawing.Point(271, 13); + this.buttonLane2.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; + this.buttonLane2.Name = "buttonLane2"; + this.buttonLane2.NestedClickEventPrevent = false; + this.buttonLane2.OutlinePixel = 1; + this.buttonLane2.RepeatInterval = 200; + this.buttonLane2.RepeatIntervalAccelerate = null; + this.buttonLane2.SafeInterval = 200; + this.buttonLane2.Size = new System.Drawing.Size(238, 120); + this.buttonLane2.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLane2.TabIndex = 1; + this.buttonLane2.Tag = "B"; + this.buttonLane2.TextColor = System.Drawing.Color.Black; + this.buttonLane2.TextDownColor = System.Drawing.Color.White; + this.buttonLane2.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLane2.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLane2.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLane2.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLane2.UpImage"))); + this.buttonLane2.Click += new System.EventHandler(this.buttonLane_Click); // - // buttonLine6 + // buttonLane6 // - this.buttonLine6.BackPictureBox = null; - this.buttonLine6.BackPictureBox1 = null; - this.buttonLine6.BackPictureBox2 = null; - this.buttonLine6.ButtonColor = System.Drawing.Color.Gray; - this.buttonLine6.ButtonImageAutoSize = true; - this.buttonLine6.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLine6.DisableImage = null; - this.buttonLine6.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine6.DownImage"))); - this.buttonLine6.GroupID = 0; - this.buttonLine6.InitVisible = true; - this.buttonLine6.Location = new System.Drawing.Point(271, 248); - this.buttonLine6.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; - this.buttonLine6.Name = "buttonLine6"; - this.buttonLine6.NestedClickEventPrevent = false; - this.buttonLine6.RepeatInterval = 200; - this.buttonLine6.SafeInterval = 200; - this.buttonLine6.Size = new System.Drawing.Size(238, 120); - this.buttonLine6.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonLine6.TabIndex = 1; - this.buttonLine6.Tag = "F"; - this.buttonLine6.TextColor = System.Drawing.Color.Black; - this.buttonLine6.TextDownColor = System.Drawing.Color.White; - this.buttonLine6.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonLine6.TextLocation = new System.Drawing.Point(0, 0); - this.buttonLine6.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonLine6.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLine6.UpImage"))); - this.buttonLine6.Click += new System.EventHandler(this.buttonLine_Click); + this.buttonLane6.BackPictureBox = null; + this.buttonLane6.BackPictureBox1 = null; + this.buttonLane6.BackPictureBox2 = null; + this.buttonLane6.ButtonColor = System.Drawing.Color.Gray; + this.buttonLane6.ButtonImageAutoSize = true; + this.buttonLane6.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLane6.DisableImage = null; + this.buttonLane6.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLane6.DownImage"))); + this.buttonLane6.GroupID = 0; + this.buttonLane6.InitVisible = true; + this.buttonLane6.Location = new System.Drawing.Point(271, 248); + this.buttonLane6.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; + this.buttonLane6.Name = "buttonLane6"; + this.buttonLane6.NestedClickEventPrevent = false; + this.buttonLane6.OutlinePixel = 1; + this.buttonLane6.RepeatInterval = 200; + this.buttonLane6.RepeatIntervalAccelerate = null; + this.buttonLane6.SafeInterval = 200; + this.buttonLane6.Size = new System.Drawing.Size(238, 120); + this.buttonLane6.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLane6.TabIndex = 1; + this.buttonLane6.Tag = "F"; + this.buttonLane6.TextColor = System.Drawing.Color.Black; + this.buttonLane6.TextDownColor = System.Drawing.Color.White; + this.buttonLane6.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLane6.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLane6.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLane6.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLane6.UpImage"))); + this.buttonLane6.Click += new System.EventHandler(this.buttonLane_Click); // - // buttonLine3 + // buttonLane3 // - this.buttonLine3.BackPictureBox = null; - this.buttonLine3.BackPictureBox1 = null; - this.buttonLine3.BackPictureBox2 = null; - this.buttonLine3.ButtonColor = System.Drawing.Color.Gray; - this.buttonLine3.ButtonImageAutoSize = true; - this.buttonLine3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLine3.DisableImage = null; - this.buttonLine3.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine3.DownImage"))); - this.buttonLine3.GroupID = 0; - this.buttonLine3.InitVisible = true; - this.buttonLine3.Location = new System.Drawing.Point(515, 13); - this.buttonLine3.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; - this.buttonLine3.Name = "buttonLine3"; - this.buttonLine3.NestedClickEventPrevent = false; - this.buttonLine3.RepeatInterval = 200; - this.buttonLine3.SafeInterval = 200; - this.buttonLine3.Size = new System.Drawing.Size(238, 120); - this.buttonLine3.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonLine3.TabIndex = 1; - this.buttonLine3.Tag = "C"; - this.buttonLine3.TextColor = System.Drawing.Color.Black; - this.buttonLine3.TextDownColor = System.Drawing.Color.White; - this.buttonLine3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonLine3.TextLocation = new System.Drawing.Point(0, 0); - this.buttonLine3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonLine3.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLine3.UpImage"))); - this.buttonLine3.Click += new System.EventHandler(this.buttonLine_Click); + this.buttonLane3.BackPictureBox = null; + this.buttonLane3.BackPictureBox1 = null; + this.buttonLane3.BackPictureBox2 = null; + this.buttonLane3.ButtonColor = System.Drawing.Color.Gray; + this.buttonLane3.ButtonImageAutoSize = true; + this.buttonLane3.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLane3.DisableImage = null; + this.buttonLane3.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLane3.DownImage"))); + this.buttonLane3.GroupID = 0; + this.buttonLane3.InitVisible = true; + this.buttonLane3.Location = new System.Drawing.Point(515, 13); + this.buttonLane3.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; + this.buttonLane3.Name = "buttonLane3"; + this.buttonLane3.NestedClickEventPrevent = false; + this.buttonLane3.OutlinePixel = 1; + this.buttonLane3.RepeatInterval = 200; + this.buttonLane3.RepeatIntervalAccelerate = null; + this.buttonLane3.SafeInterval = 200; + this.buttonLane3.Size = new System.Drawing.Size(238, 120); + this.buttonLane3.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLane3.TabIndex = 1; + this.buttonLane3.Tag = "C"; + this.buttonLane3.TextColor = System.Drawing.Color.Black; + this.buttonLane3.TextDownColor = System.Drawing.Color.White; + this.buttonLane3.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLane3.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLane3.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLane3.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLane3.UpImage"))); + this.buttonLane3.Click += new System.EventHandler(this.buttonLane_Click); // - // buttonLine7 + // buttonLane7 // - this.buttonLine7.BackPictureBox = null; - this.buttonLine7.BackPictureBox1 = null; - this.buttonLine7.BackPictureBox2 = null; - this.buttonLine7.ButtonColor = System.Drawing.Color.Gray; - this.buttonLine7.ButtonImageAutoSize = true; - this.buttonLine7.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLine7.DisableImage = null; - this.buttonLine7.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine7.DownImage"))); - this.buttonLine7.GroupID = 0; - this.buttonLine7.InitVisible = true; - this.buttonLine7.Location = new System.Drawing.Point(515, 248); - this.buttonLine7.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; - this.buttonLine7.Name = "buttonLine7"; - this.buttonLine7.NestedClickEventPrevent = false; - this.buttonLine7.RepeatInterval = 200; - this.buttonLine7.SafeInterval = 200; - this.buttonLine7.Size = new System.Drawing.Size(238, 120); - this.buttonLine7.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonLine7.TabIndex = 1; - this.buttonLine7.Tag = "G"; - this.buttonLine7.TextColor = System.Drawing.Color.Black; - this.buttonLine7.TextDownColor = System.Drawing.Color.White; - this.buttonLine7.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonLine7.TextLocation = new System.Drawing.Point(0, 0); - this.buttonLine7.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonLine7.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLine7.UpImage"))); - this.buttonLine7.Click += new System.EventHandler(this.buttonLine_Click); + this.buttonLane7.BackPictureBox = null; + this.buttonLane7.BackPictureBox1 = null; + this.buttonLane7.BackPictureBox2 = null; + this.buttonLane7.ButtonColor = System.Drawing.Color.Gray; + this.buttonLane7.ButtonImageAutoSize = true; + this.buttonLane7.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLane7.DisableImage = null; + this.buttonLane7.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLane7.DownImage"))); + this.buttonLane7.GroupID = 0; + this.buttonLane7.InitVisible = true; + this.buttonLane7.Location = new System.Drawing.Point(515, 248); + this.buttonLane7.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; + this.buttonLane7.Name = "buttonLane7"; + this.buttonLane7.NestedClickEventPrevent = false; + this.buttonLane7.OutlinePixel = 1; + this.buttonLane7.RepeatInterval = 200; + this.buttonLane7.RepeatIntervalAccelerate = null; + this.buttonLane7.SafeInterval = 200; + this.buttonLane7.Size = new System.Drawing.Size(238, 120); + this.buttonLane7.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLane7.TabIndex = 1; + this.buttonLane7.Tag = "G"; + this.buttonLane7.TextColor = System.Drawing.Color.Black; + this.buttonLane7.TextDownColor = System.Drawing.Color.White; + this.buttonLane7.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLane7.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLane7.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLane7.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLane7.UpImage"))); + this.buttonLane7.Click += new System.EventHandler(this.buttonLane_Click); // - // buttonLine4 + // buttonLane4 // - this.buttonLine4.BackPictureBox = null; - this.buttonLine4.BackPictureBox1 = null; - this.buttonLine4.BackPictureBox2 = null; - this.buttonLine4.ButtonColor = System.Drawing.Color.Gray; - this.buttonLine4.ButtonImageAutoSize = true; - this.buttonLine4.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonLine4.DisableImage = null; - this.buttonLine4.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLine4.DownImage"))); - this.buttonLine4.GroupID = 0; - this.buttonLine4.InitVisible = true; - this.buttonLine4.Location = new System.Drawing.Point(759, 13); - this.buttonLine4.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; - this.buttonLine4.Name = "buttonLine4"; - this.buttonLine4.NestedClickEventPrevent = false; - this.buttonLine4.RepeatInterval = 200; - this.buttonLine4.SafeInterval = 200; - this.buttonLine4.Size = new System.Drawing.Size(238, 120); - this.buttonLine4.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonLine4.TabIndex = 1; - this.buttonLine4.Tag = "D"; - this.buttonLine4.TextColor = System.Drawing.Color.Black; - this.buttonLine4.TextDownColor = System.Drawing.Color.White; - this.buttonLine4.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonLine4.TextLocation = new System.Drawing.Point(0, 0); - this.buttonLine4.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonLine4.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLine4.UpImage"))); - this.buttonLine4.Click += new System.EventHandler(this.buttonLine_Click); + this.buttonLane4.BackPictureBox = null; + this.buttonLane4.BackPictureBox1 = null; + this.buttonLane4.BackPictureBox2 = null; + this.buttonLane4.ButtonColor = System.Drawing.Color.Gray; + this.buttonLane4.ButtonImageAutoSize = true; + this.buttonLane4.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonLane4.DisableImage = null; + this.buttonLane4.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonLane4.DownImage"))); + this.buttonLane4.GroupID = 0; + this.buttonLane4.InitVisible = true; + this.buttonLane4.Location = new System.Drawing.Point(759, 13); + this.buttonLane4.Mode = SmartX.SmartButton.BUTTONMODE.RADIO; + this.buttonLane4.Name = "buttonLane4"; + this.buttonLane4.NestedClickEventPrevent = false; + this.buttonLane4.OutlinePixel = 1; + this.buttonLane4.RepeatInterval = 200; + this.buttonLane4.RepeatIntervalAccelerate = null; + this.buttonLane4.SafeInterval = 200; + this.buttonLane4.Size = new System.Drawing.Size(238, 120); + this.buttonLane4.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonLane4.TabIndex = 1; + this.buttonLane4.Tag = "D"; + this.buttonLane4.TextColor = System.Drawing.Color.Black; + this.buttonLane4.TextDownColor = System.Drawing.Color.White; + this.buttonLane4.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonLane4.TextLocation = new System.Drawing.Point(0, 0); + this.buttonLane4.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonLane4.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonLane4.UpImage"))); + this.buttonLane4.Click += new System.EventHandler(this.buttonLane_Click); // // smartGroupBox1 // this.smartGroupBox1.BackPictureBox = null; this.smartGroupBox1.BackPictureBox1 = null; - this.smartGroupBox1.Controls.Add(this.buttonLine7); - this.smartGroupBox1.Controls.Add(this.buttonLine6); - this.smartGroupBox1.Controls.Add(this.buttonLine5); - this.smartGroupBox1.Controls.Add(this.buttonLine4); - this.smartGroupBox1.Controls.Add(this.buttonLine3); - this.smartGroupBox1.Controls.Add(this.buttonLine2); - this.smartGroupBox1.Controls.Add(this.buttonLine1); + this.smartGroupBox1.Controls.Add(this.buttonLane7); + this.smartGroupBox1.Controls.Add(this.buttonLane6); + this.smartGroupBox1.Controls.Add(this.buttonLane5); + this.smartGroupBox1.Controls.Add(this.buttonLane4); + this.smartGroupBox1.Controls.Add(this.buttonLane3); + this.smartGroupBox1.Controls.Add(this.buttonLane2); + this.smartGroupBox1.Controls.Add(this.buttonLane1); this.smartGroupBox1.Controls.Add(this.labelConstant7); this.smartGroupBox1.Controls.Add(this.labelConstant6); this.smartGroupBox1.Controls.Add(this.labelConstant5); @@ -926,13 +940,13 @@ private SmartX.SmartLabel smartLabel3; private SmartX.SmartLabel smartLabel2; private SmartX.SmartLabel smartLabel1; - private SmartX.SmartButton buttonLine1; - private SmartX.SmartButton buttonLine5; - private SmartX.SmartButton buttonLine2; - private SmartX.SmartButton buttonLine6; - private SmartX.SmartButton buttonLine3; - private SmartX.SmartButton buttonLine7; - private SmartX.SmartButton buttonLine4; + private SmartX.SmartButton buttonLane1; + private SmartX.SmartButton buttonLane5; + private SmartX.SmartButton buttonLane2; + private SmartX.SmartButton buttonLane6; + private SmartX.SmartButton buttonLane3; + private SmartX.SmartButton buttonLane7; + private SmartX.SmartButton buttonLane4; private SmartX.SmartGroupBox smartGroupBox1; } } diff --git a/INT69DC_7C/Controls/ControlCalibration7.cs b/INT69DC_7C/Controls/ControlCalibration7.cs index a23c6af..c61f444 100644 --- a/INT69DC_7C/Controls/ControlCalibration7.cs +++ b/INT69DC_7C/Controls/ControlCalibration7.cs @@ -21,10 +21,11 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollectionButtonLine; - private Collection CollectionLabelWeight; - private Collection CollectionLabelADC; - private Collection CollectionLabelConstant; + private Collection CollButtonLine; + private Collection CollLabelWeight; + private Collection CollLabelADC; + private Collection CollLabelConstant; + private Collection CollCalStatus; #endregion #region Constructor @@ -52,55 +53,60 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollectionButtonLine = new Collection(); - this.CollectionLabelWeight = new Collection(); - this.CollectionLabelADC = new Collection(); - this.CollectionLabelConstant = new Collection(); + this.CollButtonLine = new Collection(); + this.CollLabelWeight = new Collection(); + this.CollLabelADC = new Collection(); + this.CollLabelConstant = new Collection(); + this.CollCalStatus = new Collection(); - this.CollectionButtonLine.Clear(); - this.CollectionLabelWeight.Clear(); - this.CollectionLabelADC.Clear(); - this.CollectionLabelConstant.Clear(); + this.CollButtonLine.Clear(); + this.CollLabelWeight.Clear(); + this.CollLabelADC.Clear(); + this.CollLabelConstant.Clear(); + this.CollCalStatus.Clear(); - this.CollectionButtonLine.Add(this.buttonLine1); - this.CollectionButtonLine.Add(this.buttonLine2); - this.CollectionButtonLine.Add(this.buttonLine3); - this.CollectionButtonLine.Add(this.buttonLine4); - this.CollectionButtonLine.Add(this.buttonLine5); - this.CollectionButtonLine.Add(this.buttonLine6); - this.CollectionButtonLine.Add(this.buttonLine7); + 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.CollectionLabelWeight.Add(this.labelWeight1); - this.CollectionLabelWeight.Add(this.labelWeight2); - this.CollectionLabelWeight.Add(this.labelWeight3); - this.CollectionLabelWeight.Add(this.labelWeight4); - this.CollectionLabelWeight.Add(this.labelWeight5); - this.CollectionLabelWeight.Add(this.labelWeight6); - this.CollectionLabelWeight.Add(this.labelWeight7); + this.CollLabelWeight.Add(this.labelWeight1); + this.CollLabelWeight.Add(this.labelWeight2); + this.CollLabelWeight.Add(this.labelWeight3); + this.CollLabelWeight.Add(this.labelWeight4); + this.CollLabelWeight.Add(this.labelWeight5); + this.CollLabelWeight.Add(this.labelWeight6); + this.CollLabelWeight.Add(this.labelWeight7); - this.CollectionLabelADC.Add(this.labelADC1); - this.CollectionLabelADC.Add(this.labelADC2); - this.CollectionLabelADC.Add(this.labelADC3); - this.CollectionLabelADC.Add(this.labelADC4); - this.CollectionLabelADC.Add(this.labelADC5); - this.CollectionLabelADC.Add(this.labelADC6); - this.CollectionLabelADC.Add(this.labelADC7); + this.CollLabelADC.Add(this.labelADC1); + this.CollLabelADC.Add(this.labelADC2); + this.CollLabelADC.Add(this.labelADC3); + this.CollLabelADC.Add(this.labelADC4); + this.CollLabelADC.Add(this.labelADC5); + this.CollLabelADC.Add(this.labelADC6); + this.CollLabelADC.Add(this.labelADC7); - this.CollectionLabelConstant.Add(this.labelConstant1); - this.CollectionLabelConstant.Add(this.labelConstant2); - this.CollectionLabelConstant.Add(this.labelConstant3); - this.CollectionLabelConstant.Add(this.labelConstant4); - this.CollectionLabelConstant.Add(this.labelConstant5); - this.CollectionLabelConstant.Add(this.labelConstant6); - this.CollectionLabelConstant.Add(this.labelConstant7); + this.CollLabelConstant.Add(this.labelConstant1); + this.CollLabelConstant.Add(this.labelConstant2); + this.CollLabelConstant.Add(this.labelConstant3); + this.CollLabelConstant.Add(this.labelConstant4); + this.CollLabelConstant.Add(this.labelConstant5); + this.CollLabelConstant.Add(this.labelConstant6); + this.CollLabelConstant.Add(this.labelConstant7); + + for (int i = 0; i < 7; i++) + this.CollCalStatus.Add(new CalibrationStatus()); } private void InitilizeControls() { for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) { - this.CollectionLabelWeight[i].Text = "0.0"; - this.CollectionLabelADC[i].Text = "0.0"; - this.CollectionLabelConstant[i].Text = "0.0"; + this.CollLabelWeight[i].Text = "0.0"; + this.CollLabelADC[i].Text = "0.0"; + this.CollLabelConstant[i].Text = "0.0"; } } private void InitializeDesign() @@ -109,17 +115,20 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollectionButtonLine == null || this.CollectionButtonLine.Count == 0) + if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) return; - for (int i = 0; i < this.CollectionButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - this.CollectionButtonLine[i].ButtonUp(); + this.CollButtonLine[i].ButtonUp(); + this.CollCalStatus[i].Initialize(); } } public void CalibrationBalance() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("분동 계산중 입니다"); @@ -150,16 +159,27 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + detail = string.Format("{0} Lane Balance", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } this.ParentForm.CalibrationButtonEnable(false, false, true); } public void CalibrationStart() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 시작합니다."); @@ -190,18 +210,30 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); + + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + this.CollCalStatus[i].Initialize(); + detail = string.Format("{0} Lane Start", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } - bt.Enabled = false; + this.CollButtonLine[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); } public void CalibrationCancel() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 취소합니다"); @@ -228,12 +260,25 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); - bt.Enabled = true; + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[i].IsCancel == false) + { + this.CollCalStatus[i].IsCancel = true; + detail = string.Format("{0} Lane Cancel", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } + } + + this.CollButtonLine[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -273,23 +318,25 @@ namespace INT69DC_7C.Controls } public void UpdateWeightDisplay(DataStore.EquipmentStatus status, Collection weights) { - if (this.CollectionLabelWeight == null || weights.Count < this.CollectionLabelWeight.Count || status == DataStore.EquipmentStatus.Start) + if (this.CollLabelWeight == null || weights.Count < this.CollLabelWeight.Count || status == DataStore.EquipmentStatus.Start) return; for (int i = 0; i < weights.Count; i++) { - if (this.CollectionButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } - private void UpdateLabelWeight(SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) + private void UpdateLabelWeight(int index, SmartButton buttonLane, SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) { + string detail = ""; + switch (weightData.Status) { case DataStore.WeightStatus.CalNomal: @@ -371,8 +418,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsFinish == false) + { + this.CollCalStatus[index].IsFinish = true; + detail = string.Format("{0}Lane Finish", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.FinishColor; @@ -411,8 +469,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsError == false) + { + this.CollCalStatus[index].IsError = true; + detail = string.Format("{0}Lane Error", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.NormalColor; @@ -425,7 +494,7 @@ namespace INT69DC_7C.Controls #endregion #region Event Handler - private void buttonLine_Click(object sender, EventArgs e) + private void buttonLane_Click(object sender, EventArgs e) { SmartButton bt = sender as SmartButton; diff --git a/INT69DC_7C/Controls/ControlCalibration7.resx b/INT69DC_7C/Controls/ControlCalibration7.resx index 8769ffc..a6d2151 100644 --- a/INT69DC_7C/Controls/ControlCalibration7.resx +++ b/INT69DC_7C/Controls/ControlCalibration7.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -367,7 +367,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -1118,7 +1118,7 @@ WO11jZ/8/wO+4r/9WVQDzwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -1367,7 +1367,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -2118,7 +2118,7 @@ WO11jZ/8/wO+4r/9WVQDzwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -2367,7 +2367,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -3118,7 +3118,7 @@ WO11jZ/8/wO+4r/9WVQDzwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -3367,7 +3367,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -4118,7 +4118,7 @@ WO11jZ/8/wO+4r/9WVQDzwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -4367,7 +4367,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -5118,7 +5118,7 @@ WO11jZ/8/wO+4r/9WVQDzwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -5367,7 +5367,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -6118,7 +6118,7 @@ WO11jZ/8/wO+4r/9WVQDzwAAAABJRU5ErkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp @@ -6367,7 +6367,7 @@ rkJggg== - + iVBORw0KGgoAAAANSUhEUgAAAO4AAAB4CAIAAAB6s1krAAAABGdBTUEAALGOfPtRkwAAACBjSFJNAACH DwAAjA8AAP1SAACBQAAAfXkAAOmLAAA85QAAGcxzPIV3AAAKOWlDQ1BQaG90b3Nob3AgSUNDIHByb2Zp diff --git a/INT69DC_7C/Controls/ControlCalibration8.cs b/INT69DC_7C/Controls/ControlCalibration8.cs index 9edbb98..0912df6 100644 --- a/INT69DC_7C/Controls/ControlCalibration8.cs +++ b/INT69DC_7C/Controls/ControlCalibration8.cs @@ -21,10 +21,11 @@ namespace INT69DC_7C.Controls private Color NormalColor = Color.Black; private Color FinishColor = Color.Blue; - private Collection CollectionButtonLine; - private Collection CollectionLabelWeight; - private Collection CollectionLabelADC; - private Collection CollectionLabelConstant; + private Collection CollButtonLine; + private Collection CollLabelWeight; + private Collection CollLabelADC; + private Collection CollLabelConstant; + private Collection CollCalStatus; #endregion #region Constructor @@ -52,59 +53,64 @@ namespace INT69DC_7C.Controls #region Method private void CreateCollection() { - this.CollectionButtonLine = new Collection(); - this.CollectionLabelWeight = new Collection(); - this.CollectionLabelADC = new Collection(); - this.CollectionLabelConstant = new Collection(); + this.CollButtonLine = new Collection(); + this.CollLabelWeight = new Collection(); + this.CollLabelADC = new Collection(); + this.CollLabelConstant = new Collection(); + this.CollCalStatus = new Collection(); - this.CollectionButtonLine.Clear(); - this.CollectionLabelWeight.Clear(); - this.CollectionLabelADC.Clear(); - this.CollectionLabelConstant.Clear(); + this.CollButtonLine.Clear(); + this.CollLabelWeight.Clear(); + this.CollLabelADC.Clear(); + this.CollLabelConstant.Clear(); + this.CollCalStatus.Clear(); - this.CollectionButtonLine.Add(this.buttonLine1); - this.CollectionButtonLine.Add(this.buttonLine2); - this.CollectionButtonLine.Add(this.buttonLine3); - this.CollectionButtonLine.Add(this.buttonLine4); - this.CollectionButtonLine.Add(this.buttonLine5); - this.CollectionButtonLine.Add(this.buttonLine6); - this.CollectionButtonLine.Add(this.buttonLine7); - this.CollectionButtonLine.Add(this.buttonLine8); + 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.CollectionLabelWeight.Add(this.labelWeight1); - this.CollectionLabelWeight.Add(this.labelWeight2); - this.CollectionLabelWeight.Add(this.labelWeight3); - this.CollectionLabelWeight.Add(this.labelWeight4); - this.CollectionLabelWeight.Add(this.labelWeight5); - this.CollectionLabelWeight.Add(this.labelWeight6); - this.CollectionLabelWeight.Add(this.labelWeight7); - this.CollectionLabelWeight.Add(this.labelWeight8); + this.CollLabelWeight.Add(this.labelWeight1); + this.CollLabelWeight.Add(this.labelWeight2); + this.CollLabelWeight.Add(this.labelWeight3); + this.CollLabelWeight.Add(this.labelWeight4); + this.CollLabelWeight.Add(this.labelWeight5); + this.CollLabelWeight.Add(this.labelWeight6); + this.CollLabelWeight.Add(this.labelWeight7); + this.CollLabelWeight.Add(this.labelWeight8); - this.CollectionLabelADC.Add(this.labelADC1); - this.CollectionLabelADC.Add(this.labelADC2); - this.CollectionLabelADC.Add(this.labelADC3); - this.CollectionLabelADC.Add(this.labelADC4); - this.CollectionLabelADC.Add(this.labelADC5); - this.CollectionLabelADC.Add(this.labelADC6); - this.CollectionLabelADC.Add(this.labelADC7); - this.CollectionLabelADC.Add(this.labelADC8); + this.CollLabelADC.Add(this.labelADC1); + this.CollLabelADC.Add(this.labelADC2); + this.CollLabelADC.Add(this.labelADC3); + this.CollLabelADC.Add(this.labelADC4); + this.CollLabelADC.Add(this.labelADC5); + this.CollLabelADC.Add(this.labelADC6); + this.CollLabelADC.Add(this.labelADC7); + this.CollLabelADC.Add(this.labelADC8); - this.CollectionLabelConstant.Add(this.labelConstant1); - this.CollectionLabelConstant.Add(this.labelConstant2); - this.CollectionLabelConstant.Add(this.labelConstant3); - this.CollectionLabelConstant.Add(this.labelConstant4); - this.CollectionLabelConstant.Add(this.labelConstant5); - this.CollectionLabelConstant.Add(this.labelConstant6); - this.CollectionLabelConstant.Add(this.labelConstant7); - this.CollectionLabelConstant.Add(this.labelConstant8); + this.CollLabelConstant.Add(this.labelConstant1); + this.CollLabelConstant.Add(this.labelConstant2); + this.CollLabelConstant.Add(this.labelConstant3); + this.CollLabelConstant.Add(this.labelConstant4); + this.CollLabelConstant.Add(this.labelConstant5); + this.CollLabelConstant.Add(this.labelConstant6); + this.CollLabelConstant.Add(this.labelConstant7); + this.CollLabelConstant.Add(this.labelConstant8); + + for (int i = 0; i < 8; i++) + this.CollCalStatus.Add(new CalibrationStatus()); } private void InitilizeControls() { for (int i = 0; i < this.ParentForm.ParentForm.SystemConfig.EquipmentColumns; i++) { - this.CollectionLabelWeight[i].Text = "0.0"; - this.CollectionLabelADC[i].Text = "0.0"; - this.CollectionLabelConstant[i].Text = "0.0"; + this.CollLabelWeight[i].Text = "0.0"; + this.CollLabelADC[i].Text = "0.0"; + this.CollLabelConstant[i].Text = "0.0"; } } private void InitializeDesign() @@ -113,17 +119,20 @@ namespace INT69DC_7C.Controls public void DisplayRefresh() { - if (this.CollectionButtonLine == null || this.CollectionButtonLine.Count == 0) + if (this.CollButtonLine == null || this.CollButtonLine.Count == 0) return; - for (int i = 0; i < this.CollectionButtonLine.Count; i++) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - this.CollectionButtonLine[i].ButtonUp(); + this.CollButtonLine[i].ButtonUp(); + this.CollCalStatus[i].Initialize(); } } public void CalibrationBalance() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("분동 계산중 입니다"); @@ -154,16 +163,27 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationBalance, this.CollButtonLine[i].Tag.ToString()); + + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + detail = string.Format("{0} Lane Balance", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } this.ParentForm.CalibrationButtonEnable(false, false, true); } public void CalibrationStart() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 시작합니다."); @@ -194,18 +214,30 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationStart, this.CollButtonLine[i].Tag.ToString()); - bt.Enabled = false; + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + this.CollCalStatus[i].Initialize(); + detail = string.Format("{0} Lane Start", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } + + this.CollButtonLine[i].Enabled = false; } this.ParentForm.CalibrationButtonEnable(false, false, false); } public void CalibrationCancel() { + string detail = ""; + if (this.ParentForm.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.ParentForm.listBoxHelp.Items.Add("중량조정을 취소합니다"); @@ -232,12 +264,25 @@ namespace INT69DC_7C.Controls } - foreach (SmartButton bt in this.CollectionButtonLine) + for (int i = 0; i < this.CollButtonLine.Count; i++) { - if (bt.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, bt.Tag.ToString()); + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + this.ParentForm.ParentForm.TransferData(CommunicationCommand.CalibrationCancel, this.CollButtonLine[i].Tag.ToString()); - bt.Enabled = true; + // Part 11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[i].IsCancel == false) + { + this.CollCalStatus[i].IsCancel = true; + detail = string.Format("{0} Lane Cancel", i + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } + } + + this.CollButtonLine[i].Enabled = true; } this.ParentForm.CalibrationButtonEnable(true, false, false); @@ -281,23 +326,25 @@ namespace INT69DC_7C.Controls } public void UpdateWeightDisplay(DataStore.EquipmentStatus status, Collection weights) { - if (this.CollectionLabelWeight == null || weights.Count < this.CollectionLabelWeight.Count || status == DataStore.EquipmentStatus.Start) + if (this.CollLabelWeight == null || weights.Count < this.CollLabelWeight.Count || status == DataStore.EquipmentStatus.Start) return; for (int i = 0; i < weights.Count; i++) { - if (this.CollectionButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + if (this.CollButtonLine[i].ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], true); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], true); } else { - this.UpdateLabelWeight(this.CollectionLabelWeight[i], this.CollectionLabelADC[i], weights[i], false); + this.UpdateLabelWeight(i, this.CollButtonLine[i], this.CollLabelWeight[i], this.CollLabelADC[i], weights[i], false); } } } - private void UpdateLabelWeight(SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) + private void UpdateLabelWeight(int index, SmartButton buttonLane, SmartLabel labelWeight, SmartLabel labelADC, WeightData weightData, bool rbChecked) { + string detail = ""; + switch (weightData.Status) { case DataStore.WeightStatus.CalNomal: @@ -379,8 +426,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsFinish == false) + { + this.CollCalStatus[index].IsFinish = true; + detail = string.Format("{0}Lane Finish", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.FinishColor; @@ -419,8 +477,19 @@ namespace INT69DC_7C.Controls } this.ParentForm.CalibrationButtonEnable(true, false, false); - foreach (SmartX.SmartButton bt in this.CollectionButtonLine) + foreach (SmartX.SmartButton bt in this.CollButtonLine) bt.Enabled = true; + + // Part11 + if (this.ParentForm.ParentForm.SystemConfig.IsPart11 == true) + { + if (this.CollCalStatus[index].IsError == false) + { + this.CollCalStatus[index].IsError = true; + detail = string.Format("{0}Lane Error", index + 1); + this.ParentForm.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Calibration, detail); + } + } } labelWeight.Text = Helper.DoubleToString(weightData.Weight, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); labelWeight.ForeColor = this.NormalColor; diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs index 3671632..8112711 100644 --- a/INT69DC_7C/DataStore.cs +++ b/INT69DC_7C/DataStore.cs @@ -456,28 +456,81 @@ namespace INT69DC_7C Zero, Clear, UserEditor, + Bypass, + Update, + Sampling, + ATPC_Reset, // 정량 알람 카운터 리셋 + Print, + BP_PassOnce, + BP_NgOnce, + BP_PassON, + BP_PassOFF, + BP_NgON, + BP_NgOFF, + MainCut, + ProductCopy, + ProductPaste, + ProductAllPaste, + Initialization, } public enum TrackingParameter { ProductNumber, + ProductName, + ProductLot, WeightOverRange, WeightPassRange, WeightUnderRange, WeightTareRange, + PrintActivate, + + BP_Individual, + BP_All, + BP_Direction, + BP_Mode, + + ACNC_Count, + ACNC_Activate, + ATPC_Count, + ATPC_Activate, + + FB_HightLimit, + FB_LowLimit, + FB_DeadZone, + FB_SampleCNT, + FB_IgnoreCNT, + FB_CorrectionRate, + FB_PulseWidth, JudgmentFilter, JudgmentDelayTime, - JudgmentDamperDelayTime, + JudgmentDoubleDelayTime, JudgmentCount, + JudgmentCVSpeed, SorterDelayTime, SorterRunTime, + RejectCVDelayTime, + RejectCVRunTime, + FeedingCVDelayTime, + FeedingCVRunTime, + ForcedZeroDelayTime, AutoZeroTime, AutoZeroRange, AutoZeroVariance, - Com3Baurate, + Com3Baudrate, Com3Mode, + TCPOpMode, + TCPComMode, + TCPLocalPort, + TCPLocalIPConfig, + TCPLocalIPAddress, + TCPLocalSubnetMask, + TCPLocalGateway, + TCPServerIPAddress, + TCPServerPort, + Mod_StartAddr, CalMaxWeight, CalBalWeight, @@ -1203,7 +1256,7 @@ namespace INT69DC_7C this.ImpellerMotorAnglePass = 3; this.ABFoodTimeoutInterval = 800; this.InputSensorSelect = 5; - this.AlarmContinuousNG = 0; + this.AlarmContinuousNG = 5; this.FeedbackSampleCount = 10; this.FeedbackIgnorePackages = 5; this.FeedbackPulseWidth = 1; @@ -4329,4 +4382,49 @@ namespace INT69DC_7C public DateTime TimeStamp; } #endregion + + #region CalibrationStatus + public class CalibrationStatus + { + #region Field + private bool m_IsFinish; + private bool m_IsError; + private bool m_IsCancel; + #endregion + + #region Constructor + public CalibrationStatus() + { + this.Initialize(); + } + #endregion + + #region Property + public bool IsFinish + { + get { return this.m_IsFinish; } + set { this.m_IsFinish = value; } + } + public bool IsError + { + get { return this.m_IsError; } + set { this.m_IsError = value; } + } + public bool IsCancel + { + get { return this.m_IsCancel; } + set { this.m_IsCancel = value; } + } + #endregion + + #region Method + public void Initialize() + { + this.IsFinish = false; + this.IsError = false; + this.IsCancel = false; + } + #endregion + } + #endregion } diff --git a/INT69DC_7C/Forms/FormCalibration.Designer.cs b/INT69DC_7C/Forms/FormCalibration.Designer.cs index 7cfa7c7..b5321ec 100644 --- a/INT69DC_7C/Forms/FormCalibration.Designer.cs +++ b/INT69DC_7C/Forms/FormCalibration.Designer.cs @@ -75,7 +75,7 @@ this.buttonStart.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonStart.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.DisableImage"))); this.buttonStart.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonStart.DownImage"))); - this.buttonStart.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); + this.buttonStart.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.buttonStart.GroupID = 0; this.buttonStart.InitVisible = true; this.buttonStart.Location = new System.Drawing.Point(45, 578); @@ -91,7 +91,7 @@ this.buttonStart.TabIndex = 1; this.buttonStart.Text = "시작"; this.buttonStart.TextColor = System.Drawing.Color.Black; - this.buttonStart.TextDownColor = System.Drawing.Color.White; + this.buttonStart.TextDownColor = System.Drawing.Color.Black; this.buttonStart.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonStart.TextLocation = new System.Drawing.Point(0, 0); this.buttonStart.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; @@ -108,7 +108,7 @@ this.buttonBalance.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonBalance.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.DisableImage"))); this.buttonBalance.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonBalance.DownImage"))); - this.buttonBalance.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); + this.buttonBalance.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.buttonBalance.GroupID = 0; this.buttonBalance.InitVisible = true; this.buttonBalance.Location = new System.Drawing.Point(45, 634); @@ -124,7 +124,7 @@ this.buttonBalance.TabIndex = 2; this.buttonBalance.Text = "분동"; this.buttonBalance.TextColor = System.Drawing.Color.Black; - this.buttonBalance.TextDownColor = System.Drawing.Color.White; + this.buttonBalance.TextDownColor = System.Drawing.Color.Black; this.buttonBalance.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonBalance.TextLocation = new System.Drawing.Point(0, 0); this.buttonBalance.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; @@ -141,7 +141,7 @@ this.buttonCancel.ColorKeySamplePosition = new System.Drawing.Point(0, 0); this.buttonCancel.DisableImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.DisableImage"))); this.buttonCancel.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonCancel.DownImage"))); - this.buttonCancel.Font = new System.Drawing.Font("새굴림", 20F, System.Drawing.FontStyle.Bold); + this.buttonCancel.Font = new System.Drawing.Font("New Gulim", 20F, System.Drawing.FontStyle.Bold); this.buttonCancel.GroupID = 0; this.buttonCancel.InitVisible = true; this.buttonCancel.Location = new System.Drawing.Point(45, 690); @@ -157,7 +157,7 @@ this.buttonCancel.TabIndex = 3; this.buttonCancel.Text = "취소"; this.buttonCancel.TextColor = System.Drawing.Color.Black; - this.buttonCancel.TextDownColor = System.Drawing.Color.White; + this.buttonCancel.TextDownColor = System.Drawing.Color.Black; this.buttonCancel.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; this.buttonCancel.TextLocation = new System.Drawing.Point(0, 0); this.buttonCancel.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; @@ -205,7 +205,7 @@ this.groupBoxSetting.Controls.Add(this.labelStaticDigit); this.groupBoxSetting.Controls.Add(this.labelStaticMaxWeight); this.groupBoxSetting.Controls.Add(this.labelStaticBalanceWeight); - this.groupBoxSetting.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxSetting.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.groupBoxSetting.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxSetting.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxSetting.FrameLineThickness = 1; @@ -222,7 +222,7 @@ // // comboBoxDigit // - this.comboBoxDigit.Font = new System.Drawing.Font("새굴림", 14F, System.Drawing.FontStyle.Bold); + this.comboBoxDigit.Font = new System.Drawing.Font("New Gulim", 14F, System.Drawing.FontStyle.Bold); this.comboBoxDigit.Location = new System.Drawing.Point(180, 117); this.comboBoxDigit.Name = "comboBoxDigit"; this.comboBoxDigit.Size = new System.Drawing.Size(100, 28); @@ -278,7 +278,7 @@ this.labelStaticDigit.BackPictureBox2 = null; this.labelStaticDigit.BorderColor = System.Drawing.Color.Black; this.labelStaticDigit.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticDigit.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelStaticDigit.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); this.labelStaticDigit.InitVisible = true; this.labelStaticDigit.LineSpacing = 0F; this.labelStaticDigit.Location = new System.Drawing.Point(13, 115); @@ -297,7 +297,7 @@ this.labelStaticMaxWeight.BackPictureBox2 = null; this.labelStaticMaxWeight.BorderColor = System.Drawing.Color.Black; this.labelStaticMaxWeight.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticMaxWeight.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelStaticMaxWeight.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); this.labelStaticMaxWeight.InitVisible = true; this.labelStaticMaxWeight.LineSpacing = 0F; this.labelStaticMaxWeight.Location = new System.Drawing.Point(13, 79); @@ -316,7 +316,7 @@ this.labelStaticBalanceWeight.BackPictureBox2 = null; this.labelStaticBalanceWeight.BorderColor = System.Drawing.Color.Black; this.labelStaticBalanceWeight.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticBalanceWeight.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.labelStaticBalanceWeight.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); this.labelStaticBalanceWeight.InitVisible = true; this.labelStaticBalanceWeight.LineSpacing = 0F; this.labelStaticBalanceWeight.Location = new System.Drawing.Point(13, 43); @@ -330,7 +330,7 @@ // // listBoxHelp // - this.listBoxHelp.Font = new System.Drawing.Font("새굴림", 11F, System.Drawing.FontStyle.Bold); + this.listBoxHelp.Font = new System.Drawing.Font("New Gulim", 11F, System.Drawing.FontStyle.Bold); this.listBoxHelp.Items.Add("Calibration을 시작합니다"); this.listBoxHelp.Items.Add("임펠러를 선택 후 시작을 누르세요"); this.listBoxHelp.Items.Add("중량조정을 취소합니다"); @@ -345,7 +345,7 @@ this.groupBoxHelp.BackPictureBox = this.smartForm1; this.groupBoxHelp.BackPictureBox1 = null; this.groupBoxHelp.Controls.Add(this.listBoxHelp); - this.groupBoxHelp.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.groupBoxHelp.Font = new System.Drawing.Font("New Gulim", 12F, System.Drawing.FontStyle.Bold); this.groupBoxHelp.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxHelp.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxHelp.FrameLineThickness = 1; @@ -371,7 +371,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); diff --git a/INT69DC_7C/Forms/FormCalibration.cs b/INT69DC_7C/Forms/FormCalibration.cs index 6adc916..e7c6c3a 100644 --- a/INT69DC_7C/Forms/FormCalibration.cs +++ b/INT69DC_7C/Forms/FormCalibration.cs @@ -363,16 +363,26 @@ namespace INT69DC_7C.Forms #region Event Handler private void comboBoxDigit_SelectedIndexChanged(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.ParentForm.CurrentCalibrationItem.Digit; value = Helper.StringZeroFillDigits4(this.comboBoxDigit.SelectedItem.ToString()); - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3003_Digit, value); + + after = value; + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalDigit, "", before, after); } private void labelBalanceWeight_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.labelBalanceWeight.Text; + DialogFormNumKeyPad myKeyPad; if (this.ParentForm.SystemConfig.DecimalPlaces == 2) @@ -391,16 +401,24 @@ namespace INT69DC_7C.Forms else { this.labelBalanceWeight.Text = myKeyPad.StringValue; + after = this.labelBalanceWeight.Text; value = Helper.StringZeroFillDigits7(this.labelBalanceWeight.Text.Replace(".", "")); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3002_BalanceWeight, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalBalWeight, "", before, after); } } } private void labelMaxWeight_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.labelMaxWeight.Text; + DialogFormNumKeyPad myKeyPad; if (this.ParentForm.SystemConfig.DecimalPlaces == 2) @@ -419,9 +437,14 @@ namespace INT69DC_7C.Forms else { this.labelMaxWeight.Text = myKeyPad.StringValue; + after = this.labelMaxWeight.Text; value = Helper.StringZeroFillDigits7(this.labelMaxWeight.Text.Replace(".", "")); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._3001_MaxWeight, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.CalMaxWeight, "", before, after); } } } diff --git a/INT69DC_7C/Forms/FormCommunication.cs b/INT69DC_7C/Forms/FormCommunication.cs index e90f455..9af51ae 100644 --- a/INT69DC_7C/Forms/FormCommunication.cs +++ b/INT69DC_7C/Forms/FormCommunication.cs @@ -812,6 +812,15 @@ namespace INT69DC_7C.Forms private void comboBoxOperationMode_SelectedIndexChanged(object sender, EventArgs e) { + string before = "", after = ""; + + if (this.ParentForm.SystemConfig.EthernetOperationMode == 1) + before = "Server"; + else if (this.ParentForm.SystemConfig.EthernetOperationMode == 2) + before = "Client"; + else + before = "None"; + if (this.comboBoxOperationMode.SelectedIndex == 1) { #region Server @@ -851,9 +860,27 @@ namespace INT69DC_7C.Forms this.ParentForm.SystemConfig.EthernetOperationMode = this.comboBoxOperationMode.SelectedIndex; this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + after = this.comboBoxOperationMode.SelectedText; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPOpMode, "", before, after); } private void comboBoxMode_SelectedIndexChanged(object sender, EventArgs e) { + string before = "", after = ""; + + if (this.ParentForm.SystemConfig.EthernetMode == 1) + before = "OPT2"; + else if (this.ParentForm.SystemConfig.EthernetMode == 2) + before = "OPT3"; + else if (this.ParentForm.SystemConfig.EthernetMode == 3) + before = "Modbus"; + else if (this.ParentForm.SystemConfig.EthernetMode == 4) + before = "OPT5"; + else + before = "None"; + if (this.comboBoxMode.SelectedIndex == 3) // Modbus 사용 시 { this.buttonDataSend.Visible = true; @@ -872,10 +899,20 @@ namespace INT69DC_7C.Forms this.UpdateDisplaySettingData(this.ParentForm.SystemConfig.EthernetMode); this.UpdateDisplayFormat(this.ParentForm.SystemConfig.EthernetMode); + + after = this.comboBoxMode.SelectedText; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPComMode, "", before, after); } private void labelStartAddress_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.labelStartAddress.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelStartAddress.Text, 5, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -890,13 +927,25 @@ namespace INT69DC_7C.Forms { this.labelStartAddress.Text = myKeyPad.StringValue; this.ParentForm.SystemConfig.ModbusTcpStartAddress = myKeyPad.IntValue; + after = this.labelStartAddress.Text; this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Mod_StartAddr, "", before, after); } } } private void radioButtonLocalIpDHCP_Click(object sender, EventArgs e) { + string before = "", after = ""; + + if (this.ParentForm.smartConfigs.IPSettings.DHCPEnable == 0) + before = "Static"; + else + before = "DHCP"; + DialogFormYesNo myDlg; if (this.radioButtonLocalIpStatic.Checked == true) @@ -909,21 +958,17 @@ namespace INT69DC_7C.Forms if (this.radioButtonLocalIpDHCP.Checked == true) { this.ParentForm.smartConfigs.IPSettings.DHCPEnable = 1; - - this.ParentForm.smartConfigs.IPSettings.Save(); - this.ParentForm.smartConfigs.IPSettings.SetApply(); - this.LocalIPEnable(false); this.UpdateLocalIPAddressDisplay(); + + after = "DHCP"; } else { this.ParentForm.smartConfigs.IPSettings.DHCPEnable = 0; - - this.ParentForm.smartConfigs.IPSettings.Save(); - this.ParentForm.smartConfigs.IPSettings.SetApply(); - this.LocalIPEnable(true); + + after = "Static"; try { @@ -942,6 +987,10 @@ namespace INT69DC_7C.Forms this.ParentForm.smartConfigs.IPSettings.Save(); this.ParentForm.smartConfigs.IPSettings.SetApply(); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalIPConfig, "", before, after); + DialogFormMessage msg = new DialogFormMessage(18, this.ParentForm.SystemConfig.Language); msg.ShowDialog(); } @@ -1204,6 +1253,13 @@ namespace INT69DC_7C.Forms } private void buttonTcpSave1_Click(object sender, EventArgs e) { + string deviceIP = "", subNetMask = "", gateWay = ""; + string beforeIP = "", beforeSub = "", beforeGete = "", afterIP = "", afterSub = "", afterGate = ""; + + beforeIP = this.ParentForm.smartConfigs.IPSettings.DeviceIP; + beforeSub = this.ParentForm.smartConfigs.IPSettings.SubNetMask; + beforeGete = this.ParentForm.smartConfigs.IPSettings.GateWay; + this.buttonTcpSave1.Enabled = false; if (this.ParentForm.SystemConfig.EthernetOperationMode == 1) @@ -1211,13 +1267,17 @@ namespace INT69DC_7C.Forms else if (this.ParentForm.SystemConfig.EthernetOperationMode == 2) this.ParentForm.EthernetClientDisconnect(); - this.ParentForm.smartConfigs.IPSettings.DeviceIP = string.Format("{0}.{1}.{2}.{3}", + deviceIP = string.Format("{0}.{1}.{2}.{3}", this.labelLocalIP1.Text, this.labelLocalIP2.Text, this.labelLocalIP3.Text, this.labelLocalIP4.Text); - this.ParentForm.smartConfigs.IPSettings.SubNetMask = string.Format("{0}.{1}.{2}.{3}", + subNetMask = string.Format("{0}.{1}.{2}.{3}", this.labelLocalSubnetMask1.Text, this.labelLocalSubnetMask2.Text, this.labelLocalSubnetMask3.Text, this.labelLocalSubnetMask4.Text); - this.ParentForm.smartConfigs.IPSettings.GateWay = string.Format("{0}.{1}.{2}.{3}", + gateWay = string.Format("{0}.{1}.{2}.{3}", this.labelLocalGateway1.Text, this.labelLocalGateway2.Text, this.labelLocalGateway3.Text, this.labelLocalGateway4.Text); + this.ParentForm.smartConfigs.IPSettings.DeviceIP = deviceIP; + this.ParentForm.smartConfigs.IPSettings.SubNetMask = subNetMask; + this.ParentForm.smartConfigs.IPSettings.GateWay = gateWay; + this.ParentForm.smartConfigs.IPSettings.Save(); this.ParentForm.smartConfigs.IPSettings.SetApply(); @@ -1225,10 +1285,26 @@ namespace INT69DC_7C.Forms this.ParentForm.EthernetServerStart(); else if (this.ParentForm.SystemConfig.EthernetOperationMode == 2) this.ParentForm.EthernetClientConnect(); + + afterIP = this.ParentForm.smartConfigs.IPSettings.DeviceIP; + afterSub = this.ParentForm.smartConfigs.IPSettings.SubNetMask; + afterGate = this.ParentForm.smartConfigs.IPSettings.GateWay; + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalIPAddress, "", beforeIP, afterIP); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalSubnetMask, "", beforeSub, afterSub); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalGateway, "", beforeGete, afterGate); + } } private void labelLocalPort_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.labelLocalPort.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelLocalPort.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -1239,6 +1315,11 @@ namespace INT69DC_7C.Forms this.ParentForm.smartTCPMultiServer.Port = myKeyPad.IntValue; this.ParentForm.SystemConfig.EthernetLocalPort = myKeyPad.IntValue; this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + after = this.labelLocalPort.Text; + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPLocalPort, "", before, after); } } private void labelHostIP1_Click(object sender, EventArgs e) @@ -1337,6 +1418,11 @@ namespace INT69DC_7C.Forms } private void buttonTcpSave2_Click(object sender, EventArgs e) { + string beforeIP = "", beforePort = "", afterIP = "", afterPort = ""; + + beforeIP = this.ParentForm.SystemConfig.EthernetServerAddress; + beforePort = this.ParentForm.SystemConfig.EthernetServerPort.ToString(); + this.ParentForm.SystemConfig.EthernetServerPort = int.Parse(this.labelHostPort.Text); this.ParentForm.SystemConfig.EthernetServerAddress = string.Format("{0}.{1}.{2}.{3}", @@ -1345,6 +1431,16 @@ namespace INT69DC_7C.Forms this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); this.ParentForm.EthernetClientDisconnect(); this.buttonTcpSave2.Enabled = false; + + afterIP = this.ParentForm.SystemConfig.EthernetServerAddress; + afterPort = this.ParentForm.SystemConfig.EthernetServerPort.ToString(); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPServerIPAddress, "", beforeIP, afterIP); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.TCPServerPort, "", beforePort, afterPort); + } } private void labelSlaveID_Click(object sender, EventArgs e) @@ -1462,6 +1558,36 @@ namespace INT69DC_7C.Forms } private void buttonSerialSave_Click(object sender, EventArgs e) { + string beforeBr = "", beforeMode = "", afterBr = "", afterMode = ""; + + // before BaudRate + if (this.ParentForm.SystemConfig.Serial3BaudRate == 0) + beforeBr = "9600"; + else if (this.ParentForm.SystemConfig.Serial3BaudRate == 1) + beforeBr = "19200"; + else if (this.ParentForm.SystemConfig.Serial3BaudRate == 2) + beforeBr = "38400"; + else if (this.ParentForm.SystemConfig.Serial3BaudRate == 3) + beforeBr = "115200"; + else + beforeBr = "9600"; + + // before Mode + if (this.ParentForm.SystemConfig.Serial3Mode == 0) + beforeMode = "None"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 1) + beforeMode = "OPT1"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 2) + beforeMode = "OPT2"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 3) + beforeMode = "OPT3"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 4) + beforeMode = "OPT4"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 5) + beforeMode = "Printer"; + else if (this.ParentForm.SystemConfig.Serial3Mode == 6) + beforeMode = "OPT5"; + this.ParentForm.SystemConfig.Serial3BaudRate = this.comboBoxSerial3BaudRate.SelectedIndex; this.ParentForm.SystemConfig.Serial3Mode = this.comboBoxSerial3Mode.SelectedIndex; @@ -1478,25 +1604,55 @@ namespace INT69DC_7C.Forms { case 0: this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; + afterBr = "9600"; break; case 1: this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._19200bps; + afterBr = "19200"; break; case 2: this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._38400bps; + afterBr = "38400"; break; case 3: this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._115200bps; + afterBr = "115200"; break; default: this.ParentForm.smartSerialPortCom3.Baud_Rate = SmartSerialPort.BAUDRATE._9600bps; + afterBr = "9600"; break; } switch (this.ParentForm.SystemConfig.Serial3Mode) { + case 0: + this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; + afterMode = "None"; + break; + case 1: + this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; + afterMode = "OPT1"; + break; + case 2: + this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; + afterMode = "OPT2"; + break; + case 3: + this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; + afterMode = "OPT3"; + break; + case 4: + this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; + afterMode = "OPT4"; + break; case 5: this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.NONEFRAME_READTIMEOUT; + afterMode = "Printer"; + break; + case 6: + this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; + afterMode = "OPT5"; break; default: this.ParentForm.smartSerialPortCom3.FrameSeparationType = SmartSerialPort.FRAMESEPARATIONTYPES.STXANDETX; @@ -1540,6 +1696,13 @@ namespace INT69DC_7C.Forms this.ParentForm.timerOPT1.Enabled = false; } + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Com3Baudrate, "", beforeBr, afterBr); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.Com3Mode, "", beforeMode, afterMode); + } } private void comboBoxSerial3_SelectedIndexChanged(object sender, EventArgs e) { diff --git a/INT69DC_7C/Forms/FormConfiguration.Designer.cs b/INT69DC_7C/Forms/FormConfiguration.Designer.cs index 0264605..2bf7ad4 100644 --- a/INT69DC_7C/Forms/FormConfiguration.Designer.cs +++ b/INT69DC_7C/Forms/FormConfiguration.Designer.cs @@ -1381,7 +1381,7 @@ this.groupBoxCount.FrameLineColor1 = System.Drawing.Color.Black; this.groupBoxCount.FrameLineColor2 = System.Drawing.Color.Black; this.groupBoxCount.FrameLineThickness = 1; - this.groupBoxCount.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.RoundRectangle; + this.groupBoxCount.FrameStyle = SmartX.SmartGroupBox.FRAMESTYLES.Rectangle; this.groupBoxCount.Image = null; this.groupBoxCount.InitVisible = true; this.groupBoxCount.Location = new System.Drawing.Point(521, 496); diff --git a/INT69DC_7C/Forms/FormConfiguration.cs b/INT69DC_7C/Forms/FormConfiguration.cs index e73987d..c8537db 100644 --- a/INT69DC_7C/Forms/FormConfiguration.cs +++ b/INT69DC_7C/Forms/FormConfiguration.cs @@ -521,22 +521,12 @@ namespace INT69DC_7C.Forms this.ChildControl1.Visible = false; } - private void buttonDoubleEnter_Click(object sender, EventArgs e) - { - if (this.buttonDoubleEnter.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) - { - this.ParentForm.CurrentOptionParameterItem.DoubleEnter = "1"; - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6005_DoubleEnter, Helper.StringZeroFillDigits4("1")); - } - else - { - this.ParentForm.CurrentOptionParameterItem.DoubleEnter = "0"; - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6005_DoubleEnter, Helper.StringZeroFillDigits4("0")); - } - } private void labelZeroParameterTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.labelZeroParameterTime.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelZeroParameterTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -550,16 +540,23 @@ namespace INT69DC_7C.Forms else { this.labelZeroParameterTime.Text = myKeyPad.StringValue; + after = this.labelZeroParameterTime.Text; value = Helper.StringZeroFillDigits4(this.labelZeroParameterTime.Text); - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4001_ZeroTime, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroTime, "", before, after); } } } private void labelZeroParameterRange_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.labelZeroParameterRange.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelZeroParameterRange.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -573,16 +570,79 @@ namespace INT69DC_7C.Forms else { this.labelZeroParameterRange.Text = myKeyPad.StringValue; + after = this.labelZeroParameterRange.Text; value = Helper.StringZeroFillDigits4(this.labelZeroParameterRange.Text); - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4002_ZeroRange, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroRange, "", before, after); } } } + private void comboBoxZeroParameterVariate_SelectedIndexChanged(object sender, EventArgs e) + { + string value = "", before = "", after = ""; + + if (this.ParentForm.CurrentZeroParameterItem.Variate == "0") + before = "0.05"; + else if (this.ParentForm.CurrentZeroParameterItem.Variate == "1") + before = "0.1"; + else if (this.ParentForm.CurrentZeroParameterItem.Variate == "2") + before = "0.2"; + else if (this.ParentForm.CurrentZeroParameterItem.Variate == "3") + before = "0.5"; + else if (this.ParentForm.CurrentZeroParameterItem.Variate == "4") + before = "1"; + else if (this.ParentForm.CurrentZeroParameterItem.Variate == "5") + before = "1.2"; + else + before = "0.05"; + + value = Helper.StringZeroFillDigits4(this.comboBoxZeroParameterVariate.SelectedIndex.ToString()); + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4003_ZeroVariate, value); + + after = this.comboBoxZeroParameterVariate.SelectedItem.ToString(); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.AutoZeroVariance, "", before, after); + } + private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void buttonDoubleEnter_Click(object sender, EventArgs e) + { + string before = "", after = ""; + + if (this.buttonDoubleEnter.ButtonStatus == SmartX.SmartButton.BUTSTATUS.DOWN) + { + before = "OFF"; + after = "ON"; + this.ParentForm.CurrentOptionParameterItem.DoubleEnter = "1"; + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6005_DoubleEnter, Helper.StringZeroFillDigits4("1")); + } + else + { + before = "ON"; + after = "OFF"; + this.ParentForm.CurrentOptionParameterItem.DoubleEnter = "0"; + this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6005_DoubleEnter, Helper.StringZeroFillDigits4("0")); + } + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDoubleEntry, "", before, after); + } private void labelChattering_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.labelChattering.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelChattering.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -596,16 +656,23 @@ namespace INT69DC_7C.Forms else { this.labelChattering.Text = myKeyPad.StringValue; + after = this.labelChattering.Text; value = Helper.StringZeroFillDigits4(this.labelChattering.Text); - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6006_Chattering, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcChattering, "", before, after); } } } private void labelBuzzerOnTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.labelBuzzerOnTime.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelBuzzerOnTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -619,16 +686,23 @@ namespace INT69DC_7C.Forms else { this.labelBuzzerOnTime.Text = myKeyPad.StringValue; + after = this.labelBuzzerOnTime.Text; value = Helper.StringZeroFillDigits4(this.labelBuzzerOnTime.Text); - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6001_BuzzerOnTime, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcBuzzerRunTime, "", before, after); } } } private void labelRelayOnTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = ""; + + before = this.labelRelayOnTime.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRelayOnTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -642,16 +716,55 @@ namespace INT69DC_7C.Forms else { this.labelRelayOnTime.Text = myKeyPad.StringValue; + after = this.labelRelayOnTime.Text; value = Helper.StringZeroFillDigits4(this.labelRelayOnTime.Text); - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._6002_RelayOperatingTime, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcRelayRunTime, "", before, after); } } } + private void comboBoxDecimalPlaces_SelectedIndexChanged(object sender, EventArgs e) + { + string before = "", after = ""; + + // Before + if (this.ParentForm.SystemConfig.DecimalPlaces == 0) + before = "0"; + else if (this.ParentForm.SystemConfig.DecimalPlaces == 1) + before = "0.0"; + else if (this.ParentForm.SystemConfig.DecimalPlaces == 2) + before = "0.00"; + else + before = "0"; + + // After + if (this.comboBoxDecimalPlaces.SelectedIndex == 0) + after = "0"; + else if (this.comboBoxDecimalPlaces.SelectedIndex == 1) + after = "0.0"; + else if (this.comboBoxDecimalPlaces.SelectedIndex == 2) + after = "0.00"; + else + after = "0"; + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.EtcDecimalpoint, "", before, after); + + this.ParentForm.SystemConfig.DecimalPlaces = this.comboBoxDecimalPlaces.SelectedIndex; + this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + } private void labelAlarmContinuousNG_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.labelAlarmContinuousNG.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelAlarmContinuousNG.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -665,24 +778,47 @@ namespace INT69DC_7C.Forms else { this.labelAlarmContinuousNG.Text = myKeyPad.StringValue; + after = this.labelAlarmContinuousNG.Text; this.ParentForm.SystemConfig.AlarmContinuousNG = myKeyPad.IntValue; this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ACNC_Count, "", before, after); } } } private void buttonAlarmContinuousNG_Click(object sender, EventArgs e) { + string before = "", after = ""; + if (this.buttonAlarmContinuousNG.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + before = "OFF"; + after = "ON"; this.ParentForm.SystemConfig.IsAlarmContinuousNGEnable = true; + } else + { + before = "ON"; + after = "OFF"; this.ParentForm.SystemConfig.IsAlarmContinuousNGEnable = false; + } this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ACNC_Activate, "", before, after); } private void labelAlarmTotalCount_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.labelAlarmTotalPassCount.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelAlarmTotalPassCount.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -696,38 +832,39 @@ namespace INT69DC_7C.Forms else { this.labelAlarmTotalPassCount.Text = myKeyPad.StringValue; + after = this.labelAlarmTotalPassCount.Text; this.ParentForm.SystemConfig.AlarmTotalPassCnt = myKeyPad.IntValue; this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ATPC_Count, "", before, after); } } } private void buttonAlarmTotalCount_Click(object sender, EventArgs e) { + string before = "", after = ""; + if (this.buttonAlarmTotalPassCount.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + before = "OFF"; + after = "ON"; this.ParentForm.SystemConfig.IsAlarmTotalPassCntEnable = true; + } else + { + before = "ON"; + after = "OFF"; this.ParentForm.SystemConfig.IsAlarmTotalPassCntEnable = false; + } this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); - } - private void comboBoxZeroParameterVariate_SelectedIndexChanged(object sender, EventArgs e) - { - string value = ""; - - value = Helper.StringZeroFillDigits4(this.comboBoxZeroParameterVariate.SelectedIndex.ToString()); - - this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._4003_ZeroVariate, value); - } - private void comboBoxZeroParameterMode_SelectedIndexChanged(object sender, EventArgs e) - { - - } - private void comboBoxDecimalPlaces_SelectedIndexChanged(object sender, EventArgs e) - { - this.ParentForm.SystemConfig.DecimalPlaces = this.comboBoxDecimalPlaces.SelectedIndex; - this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ATPC_Activate, "", before, after); } private void timerInterval_Tick(object sender, EventArgs e) @@ -757,6 +894,7 @@ namespace INT69DC_7C.Forms } private void buttonSaveBypass_Click(object sender, EventArgs e) { + string before = "", after = "",lane = ""; StringBuilder sb = new StringBuilder(); if (this.ParentForm.SystemConfig.IsWeightViewForward == true) @@ -780,91 +918,511 @@ namespace INT69DC_7C.Forms } } + // Lane 1 if (this.buttonBypassLane1.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[0].IsBypassMode = true; + { + if (this.ParentForm.CollectionWeightData[0].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[0].IsBypassMode = true; + + before = "OFF"; + after = "ON"; + lane = "1"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } else - this.ParentForm.CollectionWeightData[0].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[0].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[0].IsBypassMode = false; + before = "ON"; + after = "OFF"; + lane = "1"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 2 if (this.buttonBypassLane2.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[1].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[1].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[1].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[1].IsBypassMode = true; + + before = "OFF"; + after = "ON"; + lane = "2"; + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[1].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[1].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "2"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 3 if (this.buttonBypassLane3.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[2].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[2].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[2].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[2].IsBypassMode = true; + + before = "OFF"; + after = "ON"; + lane = "3"; + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[2].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[2].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "3"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 4 if (this.buttonBypassLane4.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[3].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[3].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[3].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[3].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "4"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[3].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[3].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "4"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 5 if (this.buttonBypassLane5.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[4].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[4].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[4].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[4].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "5"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[4].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[4].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "5"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 6 if (this.buttonBypassLane6.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[5].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[5].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[5].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[5].IsBypassMode = true; - if (this.buttonBypassLane7.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[6].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "6"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } else - this.ParentForm.CollectionWeightData[6].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[5].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[5].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "6"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 7 + if (this.buttonBypassLane7.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + if (this.ParentForm.CollectionWeightData[6].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[6].IsBypassMode = true; + + before = "OFF"; + after = "ON"; + lane = "7"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[6].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[6].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "7"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } if (this.ParentForm.SystemConfig.EquipmentColumns == 8) { + // Lane 8 if (this.buttonBypassLane8.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[7].IsBypassMode = true; + { + if (this.ParentForm.CollectionWeightData[7].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[7].IsBypassMode = true; + + before = "OFF"; + after = "ON"; + lane = "8"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } else - this.ParentForm.CollectionWeightData[7].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[7].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[7].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "8"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } } else if (this.ParentForm.SystemConfig.EquipmentColumns == 10) { + // Lane 8 if (this.buttonBypassLane8.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[7].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[7].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[7].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[7].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "8"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[7].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[7].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "8"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 9 if (this.buttonBypassLane9.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[8].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[8].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[8].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[8].IsBypassMode = true; - if (this.buttonBypassLane10.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[9].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "9"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } else - this.ParentForm.CollectionWeightData[9].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[8].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[8].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "9"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 10 + if (this.buttonBypassLane10.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + if (this.ParentForm.CollectionWeightData[9].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[9].IsBypassMode = true; + + before = "OFF"; + after = "ON"; + lane = "10"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[9].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[9].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "10"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } } else if (this.ParentForm.SystemConfig.EquipmentColumns == 12) { + // Lane 8 if (this.buttonBypassLane8.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[7].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[7].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[7].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[7].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "8"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[7].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[7].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "8"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 9 if (this.buttonBypassLane9.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[8].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[8].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[8].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[8].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "9"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[8].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[8].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "9"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 10 if (this.buttonBypassLane10.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[9].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[9].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[9].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[9].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "10"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[9].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[9].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "10"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 11 if (this.buttonBypassLane11.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[10].IsBypassMode = true; - else - this.ParentForm.CollectionWeightData[10].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[10].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[10].IsBypassMode = true; - if (this.buttonBypassLane12.ButtonStatus == SmartButton.BUTSTATUS.DOWN) - this.ParentForm.CollectionWeightData[11].IsBypassMode = true; + before = "OFF"; + after = "ON"; + lane = "11"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } else - this.ParentForm.CollectionWeightData[11].IsBypassMode = false; + { + if (this.ParentForm.CollectionWeightData[10].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[10].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "11"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + // Lane 12 + if (this.buttonBypassLane12.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { + if (this.ParentForm.CollectionWeightData[11].IsBypassMode != true) + { + this.ParentForm.CollectionWeightData[11].IsBypassMode = true; + + before = "OFF"; + after = "ON"; + lane = "12"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } + else + { + if (this.ParentForm.CollectionWeightData[11].IsBypassMode != false) + { + this.ParentForm.CollectionWeightData[11].IsBypassMode = false; + + before = "ON"; + after = "OFF"; + lane = "12"; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Individual, lane, before, after); + } + } } this.ParentForm.SystemConfig.IsBypassMode = false; @@ -882,6 +1440,8 @@ namespace INT69DC_7C.Forms } private void buttonBypassMode_Click(object sender, EventArgs e) { + string before = "", after = ""; + StringBuilder sb = new StringBuilder(); if (this.buttonBypassMode.ButtonStatus == SmartButton.BUTSTATUS.DOWN) @@ -897,6 +1457,9 @@ namespace INT69DC_7C.Forms this.ParentForm.CollectionWeightData[i].IsBypassMode = true; this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._1201_Bypass, sb.ToString()); + + before = "OFF"; + after = "ON"; } else { @@ -911,7 +1474,14 @@ namespace INT69DC_7C.Forms this.ParentForm.CollectionWeightData[i].IsBypassMode = false; this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._1201_Bypass, sb.ToString()); + + before = "ON"; + after = "OFF"; } + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_All, "", before, after); } #endregion } diff --git a/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs b/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs index 98bd2c1..e55f107 100644 --- a/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormEquipmentSetting.Designer.cs @@ -31,6 +31,8 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormEquipmentSetting)); this.smartForm1 = new SmartX.SmartForm(); this.groupBoxSpecialMenu = new SmartX.SmartGroupBox(); + this.buttonPart11 = new SmartX.SmartButton(); + this.smartLabel5 = new SmartX.SmartLabel(); this.smartLabel4 = new SmartX.SmartLabel(); this.buttonIntegratedTransmission = new SmartX.SmartButton(); this.labelStaticIntegratedTransmission = new SmartX.SmartLabel(); @@ -98,8 +100,6 @@ this.labelStaticLine = new SmartX.SmartLabel(); this.labelStaticEquipmentID = new SmartX.SmartLabel(); this.labelTitle = new SmartX.SmartLabel(); - this.buttonPart11 = new SmartX.SmartButton(); - this.smartLabel5 = new SmartX.SmartLabel(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.groupBoxSpecialMenu.SuspendLayout(); this.panel7.SuspendLayout(); @@ -191,6 +191,56 @@ this.groupBoxSpecialMenu.Text = "EquipmentSetting"; this.groupBoxSpecialMenu.TextColor = System.Drawing.Color.Black; // + // buttonPart11 + // + this.buttonPart11.BackPictureBox = null; + this.buttonPart11.BackPictureBox1 = null; + this.buttonPart11.BackPictureBox2 = null; + this.buttonPart11.ButtonColor = System.Drawing.Color.Gray; + this.buttonPart11.ButtonImageAutoSize = true; + this.buttonPart11.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonPart11.DisableImage = null; + this.buttonPart11.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.DownImage"))); + this.buttonPart11.GroupID = 0; + this.buttonPart11.InitVisible = true; + this.buttonPart11.Location = new System.Drawing.Point(614, 532); + this.buttonPart11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; + this.buttonPart11.Name = "buttonPart11"; + this.buttonPart11.NestedClickEventPrevent = false; + this.buttonPart11.OutlinePixel = 1; + this.buttonPart11.RepeatInterval = 200; + this.buttonPart11.RepeatIntervalAccelerate = null; + this.buttonPart11.SafeInterval = 200; + this.buttonPart11.Size = new System.Drawing.Size(84, 25); + this.buttonPart11.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonPart11.TabIndex = 220; + this.buttonPart11.TextColor = System.Drawing.Color.Black; + this.buttonPart11.TextDownColor = System.Drawing.Color.White; + this.buttonPart11.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + 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.buttonPart11_Click); + // + // smartLabel5 + // + this.smartLabel5.BackPictureBox = this.smartForm1; + this.smartLabel5.BackPictureBox1 = null; + 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("New Gulim", 12F, System.Drawing.FontStyle.Bold); + this.smartLabel5.InitVisible = true; + this.smartLabel5.LineSpacing = 0F; + this.smartLabel5.Location = new System.Drawing.Point(508, 532); + this.smartLabel5.Name = "smartLabel5"; + this.smartLabel5.Size = new System.Drawing.Size(100, 25); + this.smartLabel5.TabIndex = 219; + this.smartLabel5.Text = "Part11"; + this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; + this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.smartLabel5.Wordwrap = false; + // // smartLabel4 // this.smartLabel4.BackColor = System.Drawing.Color.Silver; @@ -1314,56 +1364,6 @@ this.labelTitle.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTitle.Wordwrap = false; // - // buttonPart11 - // - this.buttonPart11.BackPictureBox = null; - this.buttonPart11.BackPictureBox1 = null; - this.buttonPart11.BackPictureBox2 = null; - this.buttonPart11.ButtonColor = System.Drawing.Color.Gray; - this.buttonPart11.ButtonImageAutoSize = true; - this.buttonPart11.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonPart11.DisableImage = null; - this.buttonPart11.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonPart11.DownImage"))); - this.buttonPart11.GroupID = 0; - this.buttonPart11.InitVisible = true; - this.buttonPart11.Location = new System.Drawing.Point(614, 532); - this.buttonPart11.Mode = SmartX.SmartButton.BUTTONMODE.PUSH; - this.buttonPart11.Name = "buttonPart11"; - this.buttonPart11.NestedClickEventPrevent = false; - this.buttonPart11.OutlinePixel = 1; - this.buttonPart11.RepeatInterval = 200; - this.buttonPart11.RepeatIntervalAccelerate = null; - this.buttonPart11.SafeInterval = 200; - this.buttonPart11.Size = new System.Drawing.Size(84, 25); - this.buttonPart11.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonPart11.TabIndex = 220; - this.buttonPart11.TextColor = System.Drawing.Color.Black; - this.buttonPart11.TextDownColor = System.Drawing.Color.White; - this.buttonPart11.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - 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 - // - this.smartLabel5.BackPictureBox = this.smartForm1; - this.smartLabel5.BackPictureBox1 = null; - 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("New Gulim", 12F, System.Drawing.FontStyle.Bold); - this.smartLabel5.InitVisible = true; - this.smartLabel5.LineSpacing = 0F; - this.smartLabel5.Location = new System.Drawing.Point(508, 532); - this.smartLabel5.Name = "smartLabel5"; - this.smartLabel5.Size = new System.Drawing.Size(100, 25); - this.smartLabel5.TabIndex = 219; - this.smartLabel5.Text = "Part11"; - this.smartLabel5.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.smartLabel5.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel5.Wordwrap = false; - // // FormEquipmentSetting // this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); diff --git a/INT69DC_7C/Forms/FormEquipmentSetting.cs b/INT69DC_7C/Forms/FormEquipmentSetting.cs index ff7e31f..26a1c7b 100644 --- a/INT69DC_7C/Forms/FormEquipmentSetting.cs +++ b/INT69DC_7C/Forms/FormEquipmentSetting.cs @@ -419,6 +419,16 @@ namespace INT69DC_7C.Forms if (this.buttonSave.Visible != true) this.buttonSave.Visible = true; } + private void buttonPart11_Click(object sender, EventArgs e) + { + if (this.buttonSave.Visible != true) + this.buttonSave.Visible = true; + + if (this.buttonPart11.ButtonStatus == SmartX.SmartButton.BUTSTATUS.UP) + this.buttonLogin.ButtonUp(); + else + this.buttonLogin.ButtonDown(); + } private void labelEquipmentID_Click(object sender, EventArgs e) { diff --git a/INT69DC_7C/Forms/FormMain.cs b/INT69DC_7C/Forms/FormMain.cs index 14f63dd..9218f26 100644 --- a/INT69DC_7C/Forms/FormMain.cs +++ b/INT69DC_7C/Forms/FormMain.cs @@ -1023,6 +1023,10 @@ namespace INT69DC_7C.Forms // 연속NG 메시지박스 this.ChildFormMainDisplay.UpdateAlarmMessage3Display(false); + // Part 11 + if (this.SystemConfig.IsPart11 == true) + this.SetTrackingHistoryData(DataStore.TrackingOperation.EquipmentStart, ""); + this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.EquipmentStatus); this.ChildFormEquipmentTest.UpdateEquipmentStatusDisplay(this.EquipmentStatus); this.ChildFormSystemSetting.UpdateEquipmentStatusDisplay(this.EquipmentStatus); @@ -1062,6 +1066,10 @@ namespace INT69DC_7C.Forms if (this.SystemConfig.EthernetOperationMode == 2) this.EthernetClientDisconnect(); + // Part 11 + if (this.SystemConfig.IsPart11 == true) + this.SetTrackingHistoryData(DataStore.TrackingOperation.EquipmentStop, ""); + this.ChildFormMainDisplay.UpdateEquipmentStatusDisplay(this.EquipmentStatus); this.ChildFormEquipmentTest.UpdateEquipmentStatusDisplay(this.EquipmentStatus); this.ChildFormSystemSetting.UpdateEquipmentStatusDisplay(this.EquipmentStatus); @@ -1970,9 +1978,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(1, this.CollectionWeightData[0]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(1, this.CollectionWeightData[0]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count, this.CollectionWeightData[this.CollectionWeightData.Count - 1]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count, this.CollectionWeightData[this.CollectionWeightData.Count - 1]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -2288,9 +2302,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(2, this.CollectionWeightData[1]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(2, this.CollectionWeightData[1]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 1, this.CollectionWeightData[this.CollectionWeightData.Count - 2]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 1, this.CollectionWeightData[this.CollectionWeightData.Count - 2]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -2606,9 +2626,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(3, this.CollectionWeightData[2]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(3, this.CollectionWeightData[2]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 2, this.CollectionWeightData[this.CollectionWeightData.Count - 3]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 2, this.CollectionWeightData[this.CollectionWeightData.Count - 3]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -2924,9 +2950,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(4, this.CollectionWeightData[3]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(4, this.CollectionWeightData[3]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 3, this.CollectionWeightData[this.CollectionWeightData.Count - 4]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 3, this.CollectionWeightData[this.CollectionWeightData.Count - 4]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -3242,9 +3274,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(5, this.CollectionWeightData[4]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(5, this.CollectionWeightData[4]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 4, this.CollectionWeightData[this.CollectionWeightData.Count - 5]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 4, this.CollectionWeightData[this.CollectionWeightData.Count - 5]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -3560,9 +3598,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(6, this.CollectionWeightData[5]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(6, this.CollectionWeightData[5]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 5, this.CollectionWeightData[this.CollectionWeightData.Count - 6]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 5, this.CollectionWeightData[this.CollectionWeightData.Count - 6]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -3878,9 +3922,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(7, this.CollectionWeightData[6]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(7, this.CollectionWeightData[6]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 6, this.CollectionWeightData[this.CollectionWeightData.Count - 7]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 6, this.CollectionWeightData[this.CollectionWeightData.Count - 7]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -4193,9 +4243,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(8, this.CollectionWeightData[7]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(8, this.CollectionWeightData[7]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 7, this.CollectionWeightData[this.CollectionWeightData.Count - 8]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 7, this.CollectionWeightData[this.CollectionWeightData.Count - 8]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -4504,9 +4560,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(9, this.CollectionWeightData[8]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(9, this.CollectionWeightData[8]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 8, this.CollectionWeightData[this.CollectionWeightData.Count - 9]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 8, this.CollectionWeightData[this.CollectionWeightData.Count - 9]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -4814,9 +4876,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(10, this.CollectionWeightData[9]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(10, this.CollectionWeightData[9]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 9, this.CollectionWeightData[this.CollectionWeightData.Count - 10]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 9, this.CollectionWeightData[this.CollectionWeightData.Count - 10]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -5121,9 +5189,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(11, this.CollectionWeightData[10]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(11, this.CollectionWeightData[10]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 10, this.CollectionWeightData[this.CollectionWeightData.Count - 11]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 10, this.CollectionWeightData[this.CollectionWeightData.Count - 11]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 (중량설정값 포함) @@ -5427,9 +5501,15 @@ namespace INT69DC_7C.Forms { #region Serial3 Mode5 if (this.SystemConfig.IsWeightViewForward == true) - this.SerialCH3Printer(12, this.CollectionWeightData[11]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(12, this.CollectionWeightData[11]); + } else - this.SerialCH3Printer(this.CollectionWeightData.Count - 11, this.CollectionWeightData[this.CollectionWeightData.Count - 12]); + { + if (this.SystemConfig.IsPrintPerProductEnable == true) + this.SerialCH3Printer(this.CollectionWeightData.Count - 11, this.CollectionWeightData[this.CollectionWeightData.Count - 12]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 @@ -5700,8 +5780,11 @@ namespace INT69DC_7C.Forms else if (this.SystemConfig.Serial3Mode == 5) // Printer - 산업용 프린터 { #region Serial3 Mode5 - for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) - this.SerialCH3Printer(i + 1, this.CollectionWeightData[i]); + if (this.SystemConfig.IsPrintPerProductEnable == true) + { + for (int i = 0; i < this.SystemConfig.EquipmentColumns; i++) + this.SerialCH3Printer(i + 1, this.CollectionWeightData[i]); + } #endregion } else if (this.SystemConfig.Serial3Mode == 6) // OPT5 - 중량 데이터 피드백 @@ -6327,7 +6410,10 @@ namespace INT69DC_7C.Forms this.SystemConfig.IsAlarmTotalPassCntEnable = structItem2.IsAlarmTotalPassCntEnable; if (structItem2.AlarmTotalPassCnt < 20) + { + save = true; this.SystemConfig.AlarmTotalPassCnt = 20; + } else this.SystemConfig.AlarmTotalPassCnt = structItem2.AlarmTotalPassCnt; diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 849be31..093b846 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -612,26 +612,6 @@ namespace INT69DC_7C.Forms this.panelAlarmMessageBox3.Visible = false; this.panelAlarmMessageBox3.BringToFront(); - if (this.ParentForm.SystemConfig.IsDischargeConveyor == false) - { - this.labelRejectConveyorDelayTime.Enabled = false; - this.labelRejectConveyorRunTime.Enabled = false; - this.labelStaticRejectConveyorDelayTime.ForeColor = Color.Gray; - this.labelStaticRejectConveyorRunTime.ForeColor = Color.Gray; - this.labelRejectConveyorDelayTime.ForeColor = Color.Gray; - this.labelRejectConveyorRunTime.ForeColor = Color.Gray; - } - - if (this.ParentForm.SystemConfig.IsFeedingConveyor == false) - { - this.labelFeedingConveyorDelayTime.Enabled = false; - this.labelFeedingConveyorRunTime.Enabled = false; - this.labelStaticFeedingDelayTime.ForeColor = Color.Gray; - this.labelStaticFeedingRunTime.ForeColor = Color.Gray; - this.labelFeedingConveyorDelayTime.ForeColor = Color.Gray; - this.labelFeedingConveyorRunTime.ForeColor = Color.Gray; - } - if (this.ParentForm.SystemConfig.IsLogin == true) this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser); else @@ -2396,10 +2376,14 @@ namespace INT69DC_7C.Forms } private void buttonProductNo_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.buttonProductNo.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonProductNo.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2413,18 +2397,27 @@ namespace INT69DC_7C.Forms else { this.ProductChange(myKeyPad.IntValue); + + after = myKeyPad.StringValue; + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", before, after); } } } private void buttonUnder_Click(object sender, EventArgs e) { int underRange = 0, passRange = 0, lowLimit = 0, deadZone = 0, deadZoneLow = 0; - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.buttonUnder.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonUnder.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2439,6 +2432,7 @@ namespace INT69DC_7C.Forms { this.ParentForm.CurrentProductItem.UnderRange = myKeyPad.StringValue.Replace(".", ""); this.buttonUnder.Text = myKeyPad.StringValue; + after = this.buttonUnder.Text; this.RescaleControl(); @@ -2450,6 +2444,10 @@ namespace INT69DC_7C.Forms value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.UnderRange); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2002_UnderRange, value); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, number, before, after); + // Feedback Setting underRange = int.Parse(this.ParentForm.CurrentProductItem.UnderRange); passRange = int.Parse(this.ParentForm.CurrentProductItem.PassRange); @@ -2471,11 +2469,19 @@ namespace INT69DC_7C.Forms if (underRange > deadZoneLow) { + before = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + after = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -2494,12 +2500,15 @@ namespace INT69DC_7C.Forms private void buttonPass_Click(object sender, EventArgs e) { int passRange = 0, lowLimit = 0, highLimit = 0, deadZone = 0, deadZoneLow = 0, deadZoneHigh = 0; - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.buttonPass.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonPass.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2515,6 +2524,7 @@ namespace INT69DC_7C.Forms { this.ParentForm.CurrentProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); this.buttonPass.Text = myKeyPad.StringValue; + after = this.buttonPass.Text; this.RescaleControl(); @@ -2526,6 +2536,10 @@ namespace INT69DC_7C.Forms value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.PassRange); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2003_PassRange, value); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, number, before, after); + // Feedback Setting passRange = int.Parse(this.ParentForm.CurrentProductItem.PassRange); lowLimit = int.Parse(this.ParentForm.CurrentFeedbackItem.LowLimit); @@ -2536,11 +2550,19 @@ namespace INT69DC_7C.Forms if (deadZoneLow < lowLimit) { + before = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + after = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -2550,11 +2572,19 @@ namespace INT69DC_7C.Forms if (passRange < lowLimit) { + before = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.LowLimit, this.ParentForm.SystemConfig.DecimalPlaces); + this.ParentForm.CurrentFeedbackItem.LowLimit = this.ParentForm.CurrentProductItem.UnderRange; this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + after = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.LowLimit, this.ParentForm.SystemConfig.DecimalPlaces); + if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_LowLimit, number, before, after); + // 피드백 설정 확인하세요! // Low Limit Range DialogFormMessage myMsg = new DialogFormMessage(15, this.ParentForm.SystemConfig.Language); @@ -2564,11 +2594,19 @@ namespace INT69DC_7C.Forms if (deadZoneHigh > highLimit) { + before = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + after = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -2578,11 +2616,19 @@ namespace INT69DC_7C.Forms if (passRange > highLimit) { + before = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.HighLimit, this.ParentForm.SystemConfig.DecimalPlaces); + this.ParentForm.CurrentFeedbackItem.HighLimit = this.ParentForm.CurrentProductItem.OverRange; this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + after = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.HighLimit, this.ParentForm.SystemConfig.DecimalPlaces); + if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_HightLimit, number, before, after); + // 피드백 설정 확인하세요! // High Limit Range DialogFormMessage myMsg = new DialogFormMessage(14, this.ParentForm.SystemConfig.Language); @@ -2601,12 +2647,15 @@ namespace INT69DC_7C.Forms private void buttonOver_Click(object sender, EventArgs e) { int overRange = 0, passRange = 0, highLimit = 0, deadZone = 0, deadZoneHigh = 0; - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.buttonOver.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonOver.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2622,6 +2671,7 @@ namespace INT69DC_7C.Forms { this.ParentForm.CurrentProductItem.OverRange = myKeyPad.StringValue.Replace(".", ""); this.buttonOver.Text = myKeyPad.StringValue; + after = this.buttonOver.Text; this.RescaleControl(); @@ -2633,6 +2683,10 @@ namespace INT69DC_7C.Forms value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.OverRange); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2004_OverRange, value); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, number, before, after); + // Feedback Setting overRange = int.Parse(this.ParentForm.CurrentProductItem.OverRange); passRange = int.Parse(this.ParentForm.CurrentProductItem.PassRange); @@ -2655,11 +2709,19 @@ namespace INT69DC_7C.Forms if (overRange < deadZoneHigh) { + before = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + after = Helper.StringToDecimalPlaces(this.ParentForm.CurrentFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -2677,12 +2739,15 @@ namespace INT69DC_7C.Forms } private void buttonTare_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.buttonTare.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonTare.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2697,6 +2762,7 @@ namespace INT69DC_7C.Forms { this.ParentForm.CurrentProductItem.TareRange = myKeyPad.StringValue.Replace(".", ""); this.buttonTare.Text = myKeyPad.StringValue; + after = this.buttonTare.Text; this.ParentForm.SaveProductFile(this.ParentForm.CurrentProductItem, this.ParentForm.SystemConfig.ProductNumber - 1); @@ -2705,6 +2771,11 @@ namespace INT69DC_7C.Forms value = Helper.StringZeroFillDigits7(this.ParentForm.CurrentProductItem.TareRange); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.MainBoard, CommunicationAddress._2005_TareRange, value); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, number, before, after); + } } } @@ -2718,6 +2789,10 @@ namespace INT69DC_7C.Forms if (myDlg.ShowDialog() == DialogResult.Yes) { this.Clear(); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Clear, ""); } } private void buttonMenu_Click(object sender, EventArgs e) @@ -2772,6 +2847,10 @@ namespace INT69DC_7C.Forms this.Part11AutomaticLogoutReset(); this.ParentForm.TransferData(CommunicationCommand.Zero, CommunicationID.SubBoardAll); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Zero, ""); } private void buttonUser_Click(object sender, EventArgs e) { @@ -2794,17 +2873,33 @@ namespace INT69DC_7C.Forms } private void buttonBypassDirection_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); if (this.buttonBypassDirection.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { this.ParentForm.SystemConfig.IsBypassDirectionPass = false; + before = "PASS"; + after = "NG"; + } else + { this.ParentForm.SystemConfig.IsBypassDirectionPass = true; + before = "NG"; + after = "PASS"; + } + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Direction, "", before, after); } private void buttonBypassOnce_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); @@ -2813,12 +2908,22 @@ namespace INT69DC_7C.Forms { this.ParentForm.SystemConfig.IsBypassOnce = false; this.buttonBypassRun.Mode = SmartButton.BUTTONMODE.PUSH; + + before = "Once"; + after = "Cotinue"; } else { this.ParentForm.SystemConfig.IsBypassOnce = true; this.buttonBypassRun.Mode = SmartButton.BUTTONMODE.NORMAL; + + before = "Cotinue"; + after = "Once"; } + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.BP_Mode, "", before, after); } private void buttonBypassRun_Click(object sender, EventArgs e) { @@ -2829,9 +2934,21 @@ namespace INT69DC_7C.Forms if (this.ParentForm.SystemConfig.IsBypassOnce == true) { if (this.ParentForm.SystemConfig.IsBypassDirectionPass == true) + { this.ParentForm.TransferData(CommunicationCommand.BypassOnce, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.BP_PassOnce, ""); + } else + { this.ParentForm.TransferData(CommunicationCommand.ByNGOnce, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.BP_NgOnce, ""); + } } else { @@ -2841,9 +2958,21 @@ namespace INT69DC_7C.Forms this.buttonBypassOnce.Enabled = false; if (this.ParentForm.SystemConfig.IsBypassDirectionPass == true) + { this.ParentForm.TransferData(CommunicationCommand.BypassON, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.BP_PassON, ""); + } else + { this.ParentForm.TransferData(CommunicationCommand.ByNGON, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.BP_NgON, ""); + } } else { @@ -2851,9 +2980,21 @@ namespace INT69DC_7C.Forms this.buttonBypassOnce.Enabled = true; if (this.ParentForm.SystemConfig.IsBypassDirectionPass == true) + { this.ParentForm.TransferData(CommunicationCommand.BypassOFF, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.BP_PassOFF, ""); + } else + { this.ParentForm.TransferData(CommunicationCommand.ByNGOFF, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.BP_NgOFF, ""); + } } } } @@ -2891,12 +3032,15 @@ namespace INT69DC_7C.Forms private void labelSorterDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelSorterDelayTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSorterDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2911,22 +3055,29 @@ namespace INT69DC_7C.Forms { this.labelSorterDelayTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.Sorter1DelayTime = myKeyPad.IntValue; + after = this.labelSorterDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelSorterDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5102_Sorter1DelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if(this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterDelayTime, number, before, after); } } } private void labelSorterRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelSorterRunTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSorterRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2941,23 +3092,30 @@ namespace INT69DC_7C.Forms { this.labelSorterRunTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.Sorter1RunTime = myKeyPad.IntValue; + after = this.labelSorterRunTime.Text; value = Helper.StringZeroFillDigits4(this.labelSorterRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5103_Sorter1RunTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterRunTime, number, before, after); } } } private void labelRejectConveyorDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelRejectConveyorDelayTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -2972,22 +3130,29 @@ namespace INT69DC_7C.Forms { this.labelRejectConveyorDelayTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.RejectConveyorDelayTime = myKeyPad.IntValue; + after = this.labelRejectConveyorDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelRejectConveyorDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5009_DischargeConveyorDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, number, before, after); } } } private void labelRejectConveyorRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelRejectConveyorRunTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3002,22 +3167,29 @@ namespace INT69DC_7C.Forms { this.labelRejectConveyorRunTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.RejectConveyorRunTime = myKeyPad.IntValue; + after = this.labelRejectConveyorRunTime.Text; value = Helper.StringZeroFillDigits4(this.labelRejectConveyorRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5010_DischargeConveyorRunTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, number, before, after); } } } private void labelFeedingConveyorDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelFeedingConveyorDelayTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3032,22 +3204,29 @@ namespace INT69DC_7C.Forms { this.labelFeedingConveyorDelayTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.FeedingConveyorDelayTime = myKeyPad.IntValue; + after = this.labelFeedingConveyorDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5007_FeedingConveyorDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, number, before, after); } } } private void labelFeedingConveyorRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelFeedingConveyorRunTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3062,23 +3241,30 @@ namespace INT69DC_7C.Forms { this.labelFeedingConveyorRunTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.FeedingConveyorRunTime = myKeyPad.IntValue; + after = this.labelFeedingConveyorRunTime.Text; value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5008_FeedingConveyorRunTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVRunTime, number, before, after); } } } private void labelFilter_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelFilter.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFilter.Text, 2, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3093,22 +3279,29 @@ namespace INT69DC_7C.Forms { this.labelFilter.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.Filter = myKeyPad.IntValue; + after = this.labelFilter.Text; value = Helper.StringZeroFillDigits4(this.labelFilter.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5001_Filter, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentFilter, number, before, after); } } } private void labelJudgmentDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelJudgmentDelayTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3123,23 +3316,29 @@ namespace INT69DC_7C.Forms { this.labelJudgmentDelayTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.JudgmentDelayTime = myKeyPad.IntValue; - + after = this.labelJudgmentDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelJudgmentDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5002_JudgmentDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDelayTime, number, before, after); } } } private void labelDoubleDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelDoubleDelayTime.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDoubleDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3154,22 +3353,29 @@ namespace INT69DC_7C.Forms { this.labelDoubleDelayTime.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.DoubleDelayTime = myKeyPad.IntValue; + after = this.labelDoubleDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelDoubleDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5003_DoubleDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDoubleDelayTime, number, before, after); } } } private void labelJudgmentCount_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelJudgmentCount.Text; + number = this.ParentForm.SystemConfig.ProductNumber.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentCount.Text, 2, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3184,21 +3390,29 @@ namespace INT69DC_7C.Forms { this.labelJudgmentCount.Text = myKeyPad.StringValue; this.ParentForm.CurrentJudgmentSetItem.JudgmentCount = myKeyPad.IntValue; + after = this.labelJudgmentCount.Text; value = Helper.StringZeroFillDigits4(this.labelJudgmentCount.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5004_JudgmentCount, value); - this.ParentForm.SaveJudgmentSetFile(this.ParentForm.CurrentJudgmentSetItem, this.ParentForm.SystemConfig.ProductNumber - 1); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentCount, number, before, after); } } } private void labelAlarmContinuousNG_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelAlarmContinuousNG.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelAlarmContinuousNG.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3212,6 +3426,7 @@ namespace INT69DC_7C.Forms else { this.labelAlarmContinuousNG.Text = myKeyPad.StringValue; + after = this.labelAlarmContinuousNG.Text; // 연속 NG 수량 Clear for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) @@ -3222,6 +3437,10 @@ namespace INT69DC_7C.Forms this.ParentForm.SystemConfig.AlarmContinuousNG = myKeyPad.IntValue; this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ACNC_Count, "", before, after); } } } @@ -3265,10 +3484,14 @@ namespace INT69DC_7C.Forms private void labelATPC_SetCNT_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + before = this.labelATPC_SetCNT.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelATPC_SetCNT.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -3283,27 +3506,47 @@ namespace INT69DC_7C.Forms { this.labelATPC_SetCNT.Text = myKeyPad.StringValue; this.ParentForm.CurrentAlarmTotalPassCnt.SettingCount = myKeyPad.IntValue; + after = this.labelATPC_SetCNT.Text; this.ParentForm.SystemConfig.AlarmTotalPassCnt = myKeyPad.IntValue; this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); - this.ClearAlarmTotalPassCount(); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ATPC_Count, "", before, after); } } } private void buttonAlarmTotalCount_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); if (this.buttonATPC_Enable.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { this.ParentForm.SystemConfig.IsAlarmTotalPassCntEnable = true; + + before = "OFF"; + after = "ON"; + } else + { this.ParentForm.SystemConfig.IsAlarmTotalPassCntEnable = false; + before = "ON"; + after = "OFF"; + } + this.ClearAlarmTotalPassCount(); this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ATPC_Activate, "", before, after); } private void labelATPC_counting_Click(object sender, EventArgs e) { @@ -3311,8 +3554,12 @@ namespace INT69DC_7C.Forms if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); - // Alarm Total Pass Count + // Clear Alarm Total Pass Count this.ClearAlarmTotalPassCount(); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ATPC_Reset, ""); } private void buttonATPC_Reset_Click(object sender, EventArgs e) { @@ -3320,7 +3567,12 @@ namespace INT69DC_7C.Forms if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); + // Clear Alarm Total Pass Count this.ClearAlarmTotalPassCount(); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ATPC_Reset, ""); } private void buttonClose_Click(object sender, EventArgs e) @@ -3374,9 +3626,15 @@ namespace INT69DC_7C.Forms this.Part11AutomaticLogoutReset(); this.ParentForm.TransferData(CommunicationCommand.CutInput, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.MainCut, ""); } private void buttonPrint_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); @@ -3385,25 +3643,49 @@ namespace INT69DC_7C.Forms { this.ParentForm.SystemConfig.IsPrintPerProductEnable = true; this.ParentForm.SerialCH3PrinterHeadLine(); + + before = "OFF"; + after = "ON"; } else { this.ParentForm.SystemConfig.IsPrintPerProductEnable = false; this.ParentForm.smartSerialPortCom3.WriteNoneFrame("\n\n\n\n", SmartSerialPort.CODETYPES.ASCIICODE); + + before = "OFF"; + after = "ON"; } + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.PrintActivate, "", before, after); } private void buttonAlarmContinuousNG_Click(object sender, EventArgs e) { + string before = "", after = ""; + // Automatic Logout Reset if (this.ParentForm.SystemConfig.IsLogin == true) this.Part11AutomaticLogoutReset(); if (this.buttonAlarmContinuousNG.ButtonStatus == SmartButton.BUTSTATUS.DOWN) + { this.ParentForm.SystemConfig.IsAlarmContinuousNGEnable = true; + before = "OFF"; + after = "ON"; + } else + { this.ParentForm.SystemConfig.IsAlarmContinuousNGEnable = false; + before = "ON"; + after = "OFF"; + } this.ParentForm.SaveSystemConfigurationFile(this.ParentForm.SystemConfig); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ACNC_Activate, "", before, after); } private void timerTimeout_Tick(object sender, EventArgs e) @@ -3436,6 +3718,10 @@ namespace INT69DC_7C.Forms this.Part11AutomaticLogoutReset(); this.ParentForm.TransferData(CommunicationCommand.SamplingSignal, CommunicationID.MainBoard); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Sampling, ""); } #endregion diff --git a/INT69DC_7C/Forms/FormMenu.Designer.cs b/INT69DC_7C/Forms/FormMenu.Designer.cs index 9a01082..337ba9a 100644 --- a/INT69DC_7C/Forms/FormMenu.Designer.cs +++ b/INT69DC_7C/Forms/FormMenu.Designer.cs @@ -83,7 +83,7 @@ this.buttonTimeSetting.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonTimeSetting.DownImage"))); this.buttonTimeSetting.GroupID = 0; this.buttonTimeSetting.InitVisible = true; - this.buttonTimeSetting.Location = new System.Drawing.Point(114, 435); + this.buttonTimeSetting.Location = new System.Drawing.Point(270, 435); this.buttonTimeSetting.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonTimeSetting.Name = "buttonTimeSetting"; this.buttonTimeSetting.NestedClickEventPrevent = false; @@ -176,7 +176,7 @@ this.buttonDataBackup.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonDataBackup.DownImage"))); this.buttonDataBackup.GroupID = 0; this.buttonDataBackup.InitVisible = true; - this.buttonDataBackup.Location = new System.Drawing.Point(426, 435); + this.buttonDataBackup.Location = new System.Drawing.Point(114, 435); this.buttonDataBackup.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonDataBackup.Name = "buttonDataBackup"; this.buttonDataBackup.NestedClickEventPrevent = false; @@ -269,7 +269,7 @@ this.buttonFactoryInitialize.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonFactoryInitialize.DownImage"))); this.buttonFactoryInitialize.GroupID = 0; this.buttonFactoryInitialize.InitVisible = true; - this.buttonFactoryInitialize.Location = new System.Drawing.Point(738, 279); + this.buttonFactoryInitialize.Location = new System.Drawing.Point(582, 279); this.buttonFactoryInitialize.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonFactoryInitialize.Name = "buttonFactoryInitialize"; this.buttonFactoryInitialize.NestedClickEventPrevent = false; @@ -331,7 +331,7 @@ this.buttonUpdate.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonUpdate.DownImage"))); this.buttonUpdate.GroupID = 0; this.buttonUpdate.InitVisible = true; - this.buttonUpdate.Location = new System.Drawing.Point(582, 279); + this.buttonUpdate.Location = new System.Drawing.Point(426, 279); this.buttonUpdate.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonUpdate.Name = "buttonUpdate"; this.buttonUpdate.NestedClickEventPrevent = false; @@ -362,7 +362,7 @@ this.buttonEquipmentSetting.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonEquipmentSetting.DownImage"))); this.buttonEquipmentSetting.GroupID = 0; this.buttonEquipmentSetting.InitVisible = true; - this.buttonEquipmentSetting.Location = new System.Drawing.Point(426, 279); + this.buttonEquipmentSetting.Location = new System.Drawing.Point(738, 279); this.buttonEquipmentSetting.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonEquipmentSetting.Name = "buttonEquipmentSetting"; this.buttonEquipmentSetting.NestedClickEventPrevent = false; @@ -482,7 +482,7 @@ this.labelUserLevel.BackPictureBox2 = null; this.labelUserLevel.BorderColor = System.Drawing.Color.Black; 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.InitVisible = true; this.labelUserLevel.LineSpacing = 0F; this.labelUserLevel.Location = new System.Drawing.Point(888, 50); @@ -506,7 +506,7 @@ this.buttonUser.DownImage = ((System.Drawing.Image)(resources.GetObject("buttonUser.DownImage"))); this.buttonUser.GroupID = 0; this.buttonUser.InitVisible = true; - this.buttonUser.Location = new System.Drawing.Point(270, 435); + this.buttonUser.Location = new System.Drawing.Point(426, 435); this.buttonUser.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonUser.Name = "buttonUser"; this.buttonUser.NestedClickEventPrevent = false; @@ -533,7 +533,7 @@ this.labelUserID.BackPictureBox2 = null; this.labelUserID.BorderColor = System.Drawing.Color.Black; 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(888, 24); diff --git a/INT69DC_7C/Forms/FormMenu.cs b/INT69DC_7C/Forms/FormMenu.cs index c7a9bfc..ec9f7c9 100644 --- a/INT69DC_7C/Forms/FormMenu.cs +++ b/INT69DC_7C/Forms/FormMenu.cs @@ -567,6 +567,10 @@ namespace INT69DC_7C.Forms DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 5); if (myDlg.ShowDialog() == DialogResult.Yes) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Initialization, ""); + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormFactory); this.ParentForm.ChildFormFactoryInitialize.timer1.Enabled = true; } @@ -577,7 +581,13 @@ namespace INT69DC_7C.Forms #region 업데이트 DialogFormYesNo myDlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 3); if (myDlg.ShowDialog() == DialogResult.Yes) + { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Update, ""); + this.ParentForm.ChildFormProgramUpdate.DisplayRefresh(); + } #endregion } else if (button == this.buttonEquipmentSetting) diff --git a/INT69DC_7C/Forms/FormSystemSetting.Designer.cs b/INT69DC_7C/Forms/FormSystemSetting.Designer.cs index e3c6797..7ed2fe4 100644 --- a/INT69DC_7C/Forms/FormSystemSetting.Designer.cs +++ b/INT69DC_7C/Forms/FormSystemSetting.Designer.cs @@ -384,7 +384,7 @@ this.labelRejectConveyorDelayTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelRejectConveyorDelayTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelRejectConveyorDelayTime.Wordwrap = false; - this.labelRejectConveyorDelayTime.Click += new System.EventHandler(this.labelRejectDelayTime_Click); + this.labelRejectConveyorDelayTime.Click += new System.EventHandler(this.labelRejectConveyorDelayTime_Click); // // labelRejectConveyorRunTime // @@ -405,7 +405,7 @@ this.labelRejectConveyorRunTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelRejectConveyorRunTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelRejectConveyorRunTime.Wordwrap = false; - this.labelRejectConveyorRunTime.Click += new System.EventHandler(this.labelRejectRunTime_Click); + this.labelRejectConveyorRunTime.Click += new System.EventHandler(this.labelRejectConveyorRunTime_Click); // // labelStaticRejectConveyorDelayTime // @@ -895,7 +895,7 @@ this.labelSorterRunTime.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelSorterRunTime.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelSorterRunTime.Wordwrap = false; - this.labelSorterRunTime.Click += new System.EventHandler(this.labelSorterOperatingTime_Click); + this.labelSorterRunTime.Click += new System.EventHandler(this.labelSorterRunTime_Click); // // labelFeedSpeed // diff --git a/INT69DC_7C/Forms/FormSystemSetting.cs b/INT69DC_7C/Forms/FormSystemSetting.cs index 5d9b4a7..bb4fd4c 100644 --- a/INT69DC_7C/Forms/FormSystemSetting.cs +++ b/INT69DC_7C/Forms/FormSystemSetting.cs @@ -23,6 +23,8 @@ namespace INT69DC_7C.Forms private bool IsHanyoung; public int SelectedProductNo; + private string BeforeName; + private string BeforeLot; private ProductItem SelectedProductItem; public JudgmentSetItem SelectedJudgmentSetItem; @@ -280,34 +282,13 @@ namespace INT69DC_7C.Forms private void DefaultSetting() { this.IsHanyoung = false; + this.BeforeName = ""; + this.BeforeLot = ""; this.comboBoxLine.Items.Clear(); for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) this.comboBoxLine.Items.Add(i + 1); - if (this.ParentForm.SystemConfig.EquipmentMode != 0) - { - if (this.ParentForm.SystemConfig.IsDischargeConveyor == false) - { - this.labelRejectConveyorDelayTime.Enabled = false; - this.labelRejectConveyorRunTime.Enabled = false; - this.labelStaticRejectConveyorDelayTime.ForeColor = Color.Gray; - this.labelStaticRejectConveyorRunTime.ForeColor = Color.Gray; - this.labelRejectConveyorDelayTime.ForeColor = Color.Gray; - this.labelRejectConveyorRunTime.ForeColor = Color.Gray; - } - - if (this.ParentForm.SystemConfig.IsFeedingConveyor == false) - { - this.labelFeedingConveyorDelayTime.Enabled = false; - this.labelFeedingConveyorRunTime.Enabled = false; - this.labelStaticFeedingDelayTime.ForeColor = Color.Gray; - this.labelStaticFeedingRunTime.ForeColor = Color.Gray; - this.labelFeedingConveyorDelayTime.ForeColor = Color.Gray; - this.labelFeedingConveyorRunTime.ForeColor = Color.Gray; - } - } - // V1.0.7 임시 추가 // 다음 버전에서 업데이트 할것 if (this.ParentForm.SystemConfig.EquipmentMode == 2) @@ -773,6 +754,10 @@ namespace INT69DC_7C.Forms private void labelItemNo_Click(object sender, EventArgs e) { + string before = "", after = ""; + + before = this.labelItemNo.Text; + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelItemNo.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -787,6 +772,7 @@ namespace INT69DC_7C.Forms { this.labelItemNo.Text = this.labelItemNo.Text = myKeyPad.StringValue; this.SelectedProductNo = myKeyPad.IntValue; + after = this.labelItemNo.Text; this.listBoxProductList.SelectedIndexChanged -= new EventHandler(this.listBoxProductList_SelectedIndexChanged); this.listBoxProductList.SelectedIndex = this.SelectedProductNo - 1; @@ -798,6 +784,10 @@ namespace INT69DC_7C.Forms this.labelItemNo.Text = "**"; this.ParentForm.TransferProductParameter(this.SelectedProductNo); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", before, after); } } } @@ -805,11 +795,16 @@ namespace INT69DC_7C.Forms #region 품목설정 private void listBoxProductList_SelectedIndexChanged(object sender, EventArgs e) { + string before = "", after = ""; + if (this.listBoxProductList.SelectedItem == null) return; + before = this.SelectedProductNo.ToString(); + this.SelectedProductNo = this.listBoxProductList.SelectedIndex + 1; this.labelItemNo.Text = this.SelectedProductNo.ToString(); + after = this.SelectedProductNo.ToString(); this.ParentForm.LoadProductFile(ref this.SelectedProductItem, this.SelectedProductNo - 1); this.ParentForm.LoadJudgmentSetFile(ref this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); @@ -817,6 +812,10 @@ namespace INT69DC_7C.Forms this.labelItemNo.Text = "**"; this.ParentForm.TransferProductParameter(this.SelectedProductNo); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductNumber, "", before, after); } private void smartKeyboard_OnXKeyClick(object sender, EventArgs e) @@ -839,6 +838,8 @@ namespace INT69DC_7C.Forms private void textBoxProductName_KeyPress(object sender, KeyPressEventArgs e) { + string after = "", number = ""; + if (e.KeyChar == '\r') { this.SelectedProductItem.Name = this.textBoxProductName.Text; @@ -864,6 +865,15 @@ namespace INT69DC_7C.Forms this.smartKeyboard.HanYoungKeyToggle(); this.IsHanyoung = false; } + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + after = this.textBoxProductName.Text; + number = this.SelectedProductItem.Number.ToString(); + + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductName, number, this.BeforeName, after); + } } else if (e.KeyChar == 27) { @@ -884,6 +894,8 @@ namespace INT69DC_7C.Forms } private void textBoxLotNo_KeyPress(object sender, KeyPressEventArgs e) { + string after = "", number = ""; + if (e.KeyChar == '\r') { this.SelectedProductItem.LotNo = this.textBoxLotNo.Text; @@ -902,6 +914,15 @@ namespace INT69DC_7C.Forms this.smartKeyboard.HanYoungKeyToggle(); this.IsHanyoung = false; } + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + after = this.textBoxLotNo.Text; + number = this.SelectedProductItem.Number.ToString(); + + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.ProductLot, number, this.BeforeLot, after); + } } else if (e.KeyChar == 27) { @@ -936,6 +957,8 @@ namespace INT69DC_7C.Forms this.buttonNameEdit.Enabled = false; this.buttonLotEdit.Enabled = false; this.textBoxLotNo.Enabled = false; + + this.BeforeName = this.textBoxProductName.Text; } private void buttonLotEdit_Click(object sender, EventArgs e) { @@ -952,10 +975,16 @@ namespace INT69DC_7C.Forms this.buttonNameEdit.Enabled = false; this.buttonLotEdit.Enabled = false; this.textBoxProductName.Enabled = false; + + this.BeforeLot = this.textBoxLotNo.Text; } private void buttonUnder_Click(object sender, EventArgs e) { int underRange = 0, passRange = 0, lowLimit = 0, deadZone = 0, deadZoneLow = 0; + string before = "", after = "", number = ""; + + before = this.buttonUnder.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonUnder.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); @@ -971,9 +1000,14 @@ namespace INT69DC_7C.Forms { this.buttonUnder.Text = myKeyPad.StringValue; this.SelectedProductItem.UnderRange = myKeyPad.StringValue.Replace(".", ""); + after = this.buttonUnder.Text; this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightUnderRange, number, before, after); + // Feedback Setting underRange = int.Parse(this.SelectedProductItem.UnderRange); passRange = int.Parse(this.SelectedProductItem.PassRange); @@ -996,11 +1030,19 @@ namespace INT69DC_7C.Forms if (underRange > deadZoneLow) { - this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; - this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + before = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + + this.SelectedFeedbackItem.DeadZone = "0"; + this.ParentForm.SaveFeedbackItemFile(this.SelectedFeedbackItem, this.SelectedProductItem.Number - 1); + + after = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -1013,6 +1055,10 @@ namespace INT69DC_7C.Forms private void buttonPass_Click(object sender, EventArgs e) { int passRange = 0, lowLimit = 0, highLimit = 0, deadZone = 0, deadZoneLow = 0, deadZoneHigh = 0; + string before = "", after = "", number = ""; + + before = this.buttonPass.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonPass.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); @@ -1029,9 +1075,14 @@ namespace INT69DC_7C.Forms { this.buttonPass.Text = myKeyPad.StringValue; this.SelectedProductItem.PassRange = myKeyPad.StringValue.Replace(".", ""); + after = this.buttonPass.Text; this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightPassRange, number, before, after); + // Feedback Setting passRange = int.Parse(this.SelectedProductItem.PassRange); lowLimit = int.Parse(this.SelectedFeedbackItem.LowLimit); @@ -1042,11 +1093,19 @@ namespace INT69DC_7C.Forms if (deadZoneLow < lowLimit) { - this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; - this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + before = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + + this.SelectedFeedbackItem.DeadZone = "0"; + this.ParentForm.SaveFeedbackItemFile(this.SelectedFeedbackItem, this.SelectedProductItem.Number - 1); + + after = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -1056,11 +1115,19 @@ namespace INT69DC_7C.Forms if (passRange < lowLimit) { - this.ParentForm.CurrentFeedbackItem.LowLimit = this.ParentForm.CurrentProductItem.UnderRange; - this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + before = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.LowLimit, this.ParentForm.SystemConfig.DecimalPlaces); + + this.SelectedFeedbackItem.LowLimit = this.SelectedProductItem.UnderRange; + this.ParentForm.SaveFeedbackItemFile(this.SelectedFeedbackItem, this.SelectedProductItem.Number - 1); + + after = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.LowLimit, this.ParentForm.SystemConfig.DecimalPlaces); if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_LowLimit, number, before, after); + // 피드백 설정 확인하세요! // Low Limit Range DialogFormMessage myMsg = new DialogFormMessage(15, this.ParentForm.SystemConfig.Language); @@ -1070,11 +1137,19 @@ namespace INT69DC_7C.Forms if (deadZoneHigh > highLimit) { - this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; - this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + before = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + + this.SelectedFeedbackItem.DeadZone = "0"; + this.ParentForm.SaveFeedbackItemFile(this.SelectedFeedbackItem, this.SelectedProductItem.Number - 1); + + after = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -1084,11 +1159,19 @@ namespace INT69DC_7C.Forms if (passRange > highLimit) { - this.ParentForm.CurrentFeedbackItem.HighLimit = this.ParentForm.CurrentProductItem.OverRange; - this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + before = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.HighLimit, this.ParentForm.SystemConfig.DecimalPlaces); + + this.SelectedFeedbackItem.HighLimit = this.SelectedProductItem.OverRange; + this.ParentForm.SaveFeedbackItemFile(this.SelectedFeedbackItem, this.SelectedProductItem.Number - 1); + + after = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.HighLimit, this.ParentForm.SystemConfig.DecimalPlaces); if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_HightLimit, number, before, after); + // 피드백 설정 확인하세요! // High Limit Range DialogFormMessage myMsg = new DialogFormMessage(14, this.ParentForm.SystemConfig.Language); @@ -1101,6 +1184,10 @@ namespace INT69DC_7C.Forms private void buttonOver_Click(object sender, EventArgs e) { int overRange = 0, passRange = 0, highLimit = 0, deadZone = 0, deadZoneHigh = 0; + string before = "", after = "", number = ""; + + before = this.buttonOver.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonOver.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); @@ -1116,9 +1203,14 @@ namespace INT69DC_7C.Forms { this.buttonOver.Text = myKeyPad.StringValue; this.SelectedProductItem.OverRange = myKeyPad.StringValue.Replace(".", ""); + after = this.buttonOver.Text; this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightOverRange, number, before, after); + // Feedback Setting overRange = int.Parse(this.SelectedProductItem.OverRange); passRange = int.Parse(this.SelectedProductItem.PassRange); @@ -1141,11 +1233,19 @@ namespace INT69DC_7C.Forms if (overRange < deadZoneHigh) { - this.ParentForm.CurrentFeedbackItem.DeadZone = "0"; - this.ParentForm.SaveFeedbackItemFile(this.ParentForm.CurrentFeedbackItem, this.ParentForm.SystemConfig.ProductNumber - 1); + before = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); + + this.SelectedFeedbackItem.DeadZone = "0"; + this.ParentForm.SaveFeedbackItemFile(this.SelectedFeedbackItem, this.SelectedProductItem.Number - 1); + + after = Helper.StringToDecimalPlaces(this.SelectedFeedbackItem.DeadZone, this.ParentForm.SystemConfig.DecimalPlaces); if (this.ParentForm.SystemConfig.Serial3Mode == 4) { + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FB_DeadZone, number, before, after); + // 피드백 설정 확인하세요! // DeadZone Range DialogFormMessage myMsg = new DialogFormMessage(12, this.ParentForm.SystemConfig.Language); @@ -1157,6 +1257,11 @@ namespace INT69DC_7C.Forms } private void buttonTare_Click(object sender, EventArgs e) { + string before = "", after = "", number = ""; + + before = this.buttonTare.Text; + number = this.SelectedProductNo.ToString(); + DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.buttonTare.Text, 5, this.ParentForm.SystemConfig.DecimalPlaces, false, this.ParentForm.SystemConfig.Language); if (myKeyPad.ShowDialog() == DialogResult.OK) @@ -1171,8 +1276,13 @@ namespace INT69DC_7C.Forms { this.buttonTare.Text = myKeyPad.StringValue; this.SelectedProductItem.TareRange = myKeyPad.StringValue.Replace(".", ""); + after = this.buttonTare.Text; this.ParentForm.SaveProductFile(this.SelectedProductItem, this.SelectedProductItem.Number - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.WeightTareRange, number, before, after); } } } @@ -1181,7 +1291,10 @@ namespace INT69DC_7C.Forms #region 판정설정 private void labelFilter_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelFilter.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFilter.Text, 2, 0, false, this.ParentForm.SystemConfig.Language); @@ -1197,17 +1310,24 @@ namespace INT69DC_7C.Forms { this.labelFilter.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.Filter = myKeyPad.IntValue; + after = this.labelFilter.Text; value = Helper.StringZeroFillDigits4(this.labelFilter.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5001_Filter, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentFilter, number, before, after); } } } private void labelJudgmentDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelJudgmentDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1223,18 +1343,24 @@ namespace INT69DC_7C.Forms { this.labelJudgmentDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.JudgmentDelayTime = myKeyPad.IntValue; - + after = this.labelJudgmentDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelJudgmentDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5002_JudgmentDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDelayTime, number, before, after); } } } private void labelDoubleDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelDoubleDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelDoubleDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1250,17 +1376,24 @@ namespace INT69DC_7C.Forms { this.labelDoubleDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.DoubleDelayTime = myKeyPad.IntValue; + after = this.labelDoubleDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelDoubleDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5003_DoubleDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentDoubleDelayTime, number, before, after); } } } private void labelJudgmentCount_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelJudgmentCount.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelJudgmentCount.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1276,13 +1409,17 @@ namespace INT69DC_7C.Forms { this.labelJudgmentCount.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.JudgmentCount = myKeyPad.IntValue; + after = this.labelJudgmentCount.Text; this.GraphBackRedraw(); value = Helper.StringZeroFillDigits4(this.labelJudgmentCount.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5004_JudgmentCount, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentCount, number, before, after); } } } @@ -1316,7 +1453,10 @@ namespace INT69DC_7C.Forms } private void labelFeedSpeed_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelFeedSpeed.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedSpeed.Text, 1, 0, false, this.ParentForm.SystemConfig.Language); @@ -1332,17 +1472,24 @@ namespace INT69DC_7C.Forms { this.labelFeedSpeed.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.FeedSpeed = myKeyPad.IntValue; + after = this.labelFeedSpeed.Text; value = Helper.StringZeroFillDigits4(this.labelFeedSpeed.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5005_FeedSpeed, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.JudgmentCVSpeed, number, before, after); } } } private void labelSorterDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelSorterDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSorterDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1358,17 +1505,24 @@ namespace INT69DC_7C.Forms { this.labelSorterDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.Sorter1DelayTime = myKeyPad.IntValue; + after = this.labelSorterDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelSorterDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5102_Sorter1DelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterDelayTime, number, before, after); } } } - private void labelSorterOperatingTime_Click(object sender, EventArgs e) + private void labelSorterRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelSorterRunTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelSorterRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1384,17 +1538,24 @@ namespace INT69DC_7C.Forms { this.labelSorterRunTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.Sorter1RunTime = myKeyPad.IntValue; + after = this.labelSorterRunTime.Text; value = Helper.StringZeroFillDigits4(this.labelSorterRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5103_Sorter1RunTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.SorterRunTime, number, before, after); } } } - private void labelRejectDelayTime_Click(object sender, EventArgs e) + private void labelRejectConveyorDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelRejectConveyorDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1410,17 +1571,24 @@ namespace INT69DC_7C.Forms { this.labelRejectConveyorDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.RejectConveyorDelayTime = myKeyPad.IntValue; + after = this.labelRejectConveyorDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelRejectConveyorDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5009_DischargeConveyorDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVDelayTime, number, before, after); } } } - private void labelRejectRunTime_Click(object sender, EventArgs e) + private void labelRejectConveyorRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelRejectConveyorRunTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelRejectConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1436,17 +1604,24 @@ namespace INT69DC_7C.Forms { this.labelRejectConveyorRunTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.RejectConveyorRunTime = myKeyPad.IntValue; + after = this.labelRejectConveyorRunTime.Text; value = Helper.StringZeroFillDigits4(this.labelRejectConveyorRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5010_DischargeConveyorRunTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.RejectCVRunTime, number, before, after); } } } private void labelFeedingConveyorDelayTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelFeedingConveyorDelayTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorDelayTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1462,17 +1637,24 @@ namespace INT69DC_7C.Forms { this.labelFeedingConveyorDelayTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.FeedingConveyorDelayTime = myKeyPad.IntValue; + after = this.labelFeedingConveyorDelayTime.Text; value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorDelayTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5007_FeedingConveyorDelayTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, number, before, after); } } } private void labelFeedingConveyorRunTime_Click(object sender, EventArgs e) { - string value = ""; + string value = "", before = "", after = "", number = ""; + + before = this.labelFeedingConveyorRunTime.Text; + number = this.SelectedProductNo.ToString(); DialogFormNumKeyPad myKeyPad = new DialogFormNumKeyPad(this.labelFeedingConveyorRunTime.Text, 4, 0, false, this.ParentForm.SystemConfig.Language); @@ -1488,11 +1670,15 @@ namespace INT69DC_7C.Forms { this.labelFeedingConveyorRunTime.Text = myKeyPad.StringValue; this.SelectedJudgmentSetItem.FeedingConveyorRunTime = myKeyPad.IntValue; + after = this.labelFeedingConveyorRunTime.Text; value = Helper.StringZeroFillDigits4(this.labelFeedingConveyorRunTime.Text); this.ParentForm.TransferDataStream(CommunicationCommand.Write, CommunicationID.SubBoardAll, CommunicationAddress._5008_FeedingConveyorRunTime, value); - this.ParentForm.SaveJudgmentSetFile(this.SelectedJudgmentSetItem, this.SelectedProductNo - 1); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingParameter.FeedingCVDelayTime, number, before, after); } } } @@ -1555,6 +1741,10 @@ namespace INT69DC_7C.Forms this.CaptureJudgmentSetItem.Sorter4Mode = this.SelectedJudgmentSetItem.Sorter4Mode; this.CaptureJudgmentSetItem.Sorter4DelayTime = this.SelectedJudgmentSetItem.Sorter4DelayTime; this.CaptureJudgmentSetItem.Sorter4RunTime = this.SelectedJudgmentSetItem.Sorter4RunTime; + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductCopy, this.buttonCopy.Text); } private void buttonPaste_Click(object sender, EventArgs e) { @@ -1591,6 +1781,10 @@ namespace INT69DC_7C.Forms this.labelItemNo.Text = "**"; this.ParentForm.TransferProductParameter(this.SelectedProductNo); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductPaste, this.SelectedProductNo.ToString()); } private void buttonPasteAll_Click(object sender, EventArgs e) { @@ -1694,6 +1888,10 @@ namespace INT69DC_7C.Forms this.buttonPasteAll.Enabled = true; splash.Finish(); + + // Part11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.ProductAllPaste, ""); } private void comboBoxLine_SelectedIndexChanged(object sender, EventArgs e) diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index 588a46b..80cf38c 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -120,7 +120,7 @@ namespace INT69DC_7C.Forms private void SaveUserDll() { - string code = "", message1 = "", message2 = ""; + string code = "", message1 = "", message2 = "", detail = ""; bool isNewReg = false; if (this.listBoxUserList.SelectItemIndex == -1) @@ -272,12 +272,26 @@ namespace INT69DC_7C.Forms { #region 신규 등록 UserManager.UserManager_UserNew(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + detail = string.Format("Add : {0}", item.ID); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.UserEditor, detail); + } #endregion } else { #region 유저 수정 UserManager.UserManager_UserModify(item.ID, item.Password, item.IsAdmin == false ? 0 : 1, item.ExpirePassword, item.ExpireAccount, item.ActiveLevel, menuId); + + // Part 11 + if (this.ParentForm.SystemConfig.IsPart11 == true) + { + detail = string.Format("Modify : {0}", item.ID); + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.UserEditor, detail); + } #endregion } diff --git a/INT69DC_7C/Helper.cs b/INT69DC_7C/Helper.cs index 74dde78..f663bd3 100644 --- a/INT69DC_7C/Helper.cs +++ b/INT69DC_7C/Helper.cs @@ -408,8 +408,26 @@ namespace INT69DC_7C return reminder.ToString(); } - } + /// + /// A -> 1 로 변환 후 리턴 + /// 1자리만 입력할것 + /// + /// + /// + public static int ConvertTextToNumber(string value) + { + int ret = 0; + + if (value.Length != 1) + return 0; + + foreach (char c in value) + ret = ret * 26 + c - 'A' + 1; + + return ret; + } + } public static class FindByNameUtil { diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 7796ce7..896bdf6 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -22,6 +22,12 @@ - Part 11 INT99DC_7C V3.0.2 +@ Ver 10.13.0 by LSJ + - 2023.08.07 + - Ver 10.12.1 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - , ̼ ϵ + : ON ؾ @ Ver 10.12.1 by LSJ - 2023.06.27