diff --git a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph10.cs b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph10.cs index 17c57f1..fbb5a39 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph10.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph10.cs @@ -224,6 +224,7 @@ namespace INT69DC_7C.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph12.cs b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph12.cs index 93a30bf..a07bfea 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph12.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph12.cs @@ -253,6 +253,7 @@ namespace INT69DC_7C.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph7.cs b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph7.cs index aaede75..2624bf8 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph7.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph7.cs @@ -181,6 +181,7 @@ namespace INT69DC_7C.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph8.cs b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph8.cs index 48a01dc..40760c4 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph8.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayEachBarGraph8.cs @@ -195,6 +195,7 @@ namespace INT69DC_7C.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs index 8bf8316..00e8b81 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable10.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable10.cs @@ -21,6 +21,7 @@ namespace INT69DC_7C.Controls private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; + private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -281,18 +282,20 @@ namespace INT69DC_7C.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT) + private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { string sValue = ""; Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - labelColor = this.WeightUnderColor; - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + if (judge == DataStore.JudgmentStatus.Over) labelColor = this.WeightOverColor; + else if (judge == DataStore.JudgmentStatus.Under) + labelColor = this.WeightUnderColor; + else if (judge == DataStore.JudgmentStatus.EXNg) + labelColor = this.WeightExNGColor; else labelColor = this.WeightStandardColor; - + if (labelTotalCNT == true) { if (this.IsTotalAverageView == false) @@ -318,163 +321,163 @@ namespace INT69DC_7C.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false); - this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false); - this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false); - this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false); - this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false); - this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false); - this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false); - this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false); - this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false); - this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false); - this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true); + this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false, this.CollectionWeightStorageItem[8].Grade1); + this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false, this.CollectionWeightStorageItem[8].Grade2); + this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false, this.CollectionWeightStorageItem[8].Grade3); + this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false, this.CollectionWeightStorageItem[8].Grade4); + this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false, this.CollectionWeightStorageItem[8].Grade5); + this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false, this.CollectionWeightStorageItem[8].Grade6); + this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false, this.CollectionWeightStorageItem[8].Grade7); + this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false, this.CollectionWeightStorageItem[8].Grade8); + this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false, this.CollectionWeightStorageItem[8].Grade9); + this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false, this.CollectionWeightStorageItem[8].Grade10); + this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false); - this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false); - this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false); - this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false); - this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false); - this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false); - this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false); - this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false); - this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false); - this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false); - this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true); + this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false, this.CollectionWeightStorageItem[9].Grade1); + this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false, this.CollectionWeightStorageItem[9].Grade2); + this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false, this.CollectionWeightStorageItem[9].Grade3); + this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false, this.CollectionWeightStorageItem[9].Grade4); + this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false, this.CollectionWeightStorageItem[9].Grade5); + this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false, this.CollectionWeightStorageItem[9].Grade6); + this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false, this.CollectionWeightStorageItem[9].Grade7); + this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false, this.CollectionWeightStorageItem[9].Grade8); + this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false, this.CollectionWeightStorageItem[9].Grade9); + this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false, this.CollectionWeightStorageItem[9].Grade10); + this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } private void UpdateTotalAverage(bool totalAverageView) { if (totalAverageView == true) { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } else { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } } @@ -545,22 +548,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -569,22 +572,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -593,22 +596,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -617,22 +620,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -641,22 +644,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -665,22 +668,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -689,22 +692,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[6].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { @@ -713,22 +716,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[7].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay9(DataStore.EquipmentStatus status, WeightData weightData) { @@ -737,22 +740,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[8].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false); - this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false); - this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false); - this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false); - this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false); - this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false); - this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false); - this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false); - this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false); - this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false); - this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false); + this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false, this.CollectionWeightStorageItem[8].Grade1); + this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false, this.CollectionWeightStorageItem[8].Grade2); + this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false, this.CollectionWeightStorageItem[8].Grade3); + this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false, this.CollectionWeightStorageItem[8].Grade4); + this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false, this.CollectionWeightStorageItem[8].Grade5); + this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false, this.CollectionWeightStorageItem[8].Grade6); + this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false, this.CollectionWeightStorageItem[8].Grade7); + this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false, this.CollectionWeightStorageItem[8].Grade8); + this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false, this.CollectionWeightStorageItem[8].Grade9); + this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false, this.CollectionWeightStorageItem[8].Grade10); + this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay10(DataStore.EquipmentStatus status, WeightData weightData) { @@ -761,22 +764,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[9].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false); - this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false); - this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false); - this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false); - this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false); - this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false); - this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false); - this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false); - this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false); - this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false); - this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false); + this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false, this.CollectionWeightStorageItem[9].Grade1); + this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false, this.CollectionWeightStorageItem[9].Grade2); + this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false, this.CollectionWeightStorageItem[9].Grade3); + this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false, this.CollectionWeightStorageItem[9].Grade4); + this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false, this.CollectionWeightStorageItem[9].Grade5); + this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false, this.CollectionWeightStorageItem[9].Grade6); + this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false, this.CollectionWeightStorageItem[9].Grade7); + this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false, this.CollectionWeightStorageItem[9].Grade8); + this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false, this.CollectionWeightStorageItem[9].Grade9); + this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false, this.CollectionWeightStorageItem[9].Grade10); + this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } #endregion diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable12.cs b/INT69DC_7C/Controls/ControlMainDisplayTable12.cs index 4fe8a38..2c5b514 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable12.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable12.cs @@ -22,6 +22,7 @@ namespace INT69DC_7C.Controls private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; + private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -321,15 +322,24 @@ namespace INT69DC_7C.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT) + private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { string sValue = ""; Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - labelColor = this.WeightUnderColor; - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + // labelColor = this.WeightUnderColor; + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + // labelColor = this.WeightOverColor; + //else + // labelColor = this.WeightStandardColor; + + if (judge == DataStore.JudgmentStatus.Over) labelColor = this.WeightOverColor; + else if (judge == DataStore.JudgmentStatus.Under) + labelColor = this.WeightUnderColor; + else if (judge == DataStore.JudgmentStatus.EXNg) + labelColor = this.WeightExNGColor; else labelColor = this.WeightStandardColor; @@ -358,193 +368,193 @@ namespace INT69DC_7C.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false); - this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false); - this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false); - this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false); - this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false); - this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false); - this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false); - this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false); - this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false); - this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false); - this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true); + this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false, this.CollectionWeightStorageItem[8].Grade1); + this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false, this.CollectionWeightStorageItem[8].Grade2); + this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false, this.CollectionWeightStorageItem[8].Grade3); + this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false, this.CollectionWeightStorageItem[8].Grade4); + this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false, this.CollectionWeightStorageItem[8].Grade5); + this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false, this.CollectionWeightStorageItem[8].Grade6); + this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false, this.CollectionWeightStorageItem[8].Grade7); + this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false, this.CollectionWeightStorageItem[8].Grade8); + this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false, this.CollectionWeightStorageItem[8].Grade9); + this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false, this.CollectionWeightStorageItem[8].Grade10); + this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false); - this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false); - this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false); - this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false); - this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false); - this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false); - this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false); - this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false); - this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false); - this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false); - this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true); + this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false, this.CollectionWeightStorageItem[9].Grade1); + this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false, this.CollectionWeightStorageItem[9].Grade2); + this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false, this.CollectionWeightStorageItem[9].Grade3); + this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false, this.CollectionWeightStorageItem[9].Grade4); + this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false, this.CollectionWeightStorageItem[9].Grade5); + this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false, this.CollectionWeightStorageItem[9].Grade6); + this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false, this.CollectionWeightStorageItem[9].Grade7); + this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false, this.CollectionWeightStorageItem[9].Grade8); + this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false, this.CollectionWeightStorageItem[9].Grade9); + this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false, this.CollectionWeightStorageItem[9].Grade10); + this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label11Col1Row, this.CollectionWeightStorageItem[10].Weight1, false); - this.SetLabelText(this.label11Col2Row, this.CollectionWeightStorageItem[10].Weight2, false); - this.SetLabelText(this.label11Col3Row, this.CollectionWeightStorageItem[10].Weight3, false); - this.SetLabelText(this.label11Col4Row, this.CollectionWeightStorageItem[10].Weight4, false); - this.SetLabelText(this.label11Col5Row, this.CollectionWeightStorageItem[10].Weight5, false); - this.SetLabelText(this.label11Col6Row, this.CollectionWeightStorageItem[10].Weight6, false); - this.SetLabelText(this.label11Col7Row, this.CollectionWeightStorageItem[10].Weight7, false); - this.SetLabelText(this.label11Col8Row, this.CollectionWeightStorageItem[10].Weight8, false); - this.SetLabelText(this.label11Col9Row, this.CollectionWeightStorageItem[10].Weight9, false); - this.SetLabelText(this.label11Col10Row, this.CollectionWeightStorageItem[10].Weight10, false); - this.SetLabelText(this.label11Col5Avg, this.CollectionWeightStorageItem[10].GetWeightTenAverage(), false); - this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalAverage(), true); + this.SetLabelText(this.label11Col1Row, this.CollectionWeightStorageItem[10].Weight1, false, this.CollectionWeightStorageItem[10].Grade1); + this.SetLabelText(this.label11Col2Row, this.CollectionWeightStorageItem[10].Weight2, false, this.CollectionWeightStorageItem[10].Grade2); + this.SetLabelText(this.label11Col3Row, this.CollectionWeightStorageItem[10].Weight3, false, this.CollectionWeightStorageItem[10].Grade3); + this.SetLabelText(this.label11Col4Row, this.CollectionWeightStorageItem[10].Weight4, false, this.CollectionWeightStorageItem[10].Grade4); + this.SetLabelText(this.label11Col5Row, this.CollectionWeightStorageItem[10].Weight5, false, this.CollectionWeightStorageItem[10].Grade5); + this.SetLabelText(this.label11Col6Row, this.CollectionWeightStorageItem[10].Weight6, false, this.CollectionWeightStorageItem[10].Grade6); + this.SetLabelText(this.label11Col7Row, this.CollectionWeightStorageItem[10].Weight7, false, this.CollectionWeightStorageItem[10].Grade7); + this.SetLabelText(this.label11Col8Row, this.CollectionWeightStorageItem[10].Weight8, false, this.CollectionWeightStorageItem[10].Grade8); + this.SetLabelText(this.label11Col9Row, this.CollectionWeightStorageItem[10].Weight9, false, this.CollectionWeightStorageItem[10].Grade9); + this.SetLabelText(this.label11Col10Row, this.CollectionWeightStorageItem[10].Weight10, false, this.CollectionWeightStorageItem[10].Grade10); + this.SetLabelText(this.label11Col5Avg, this.CollectionWeightStorageItem[10].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label12Col1Row, this.CollectionWeightStorageItem[11].Weight1, false); - this.SetLabelText(this.label12Col2Row, this.CollectionWeightStorageItem[11].Weight2, false); - this.SetLabelText(this.label12Col3Row, this.CollectionWeightStorageItem[11].Weight3, false); - this.SetLabelText(this.label12Col4Row, this.CollectionWeightStorageItem[11].Weight4, false); - this.SetLabelText(this.label12Col5Row, this.CollectionWeightStorageItem[11].Weight5, false); - this.SetLabelText(this.label12Col6Row, this.CollectionWeightStorageItem[11].Weight6, false); - this.SetLabelText(this.label12Col7Row, this.CollectionWeightStorageItem[11].Weight7, false); - this.SetLabelText(this.label12Col8Row, this.CollectionWeightStorageItem[11].Weight8, false); - this.SetLabelText(this.label12Col9Row, this.CollectionWeightStorageItem[11].Weight9, false); - this.SetLabelText(this.label12Col10Row, this.CollectionWeightStorageItem[11].Weight10, false); - this.SetLabelText(this.label12Col5Avg, this.CollectionWeightStorageItem[11].GetWeightTenAverage(), false); - this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalAverage(), true); + this.SetLabelText(this.label12Col1Row, this.CollectionWeightStorageItem[11].Weight1, false, this.CollectionWeightStorageItem[11].Grade1); + this.SetLabelText(this.label12Col2Row, this.CollectionWeightStorageItem[11].Weight2, false, this.CollectionWeightStorageItem[11].Grade2); + this.SetLabelText(this.label12Col3Row, this.CollectionWeightStorageItem[11].Weight3, false, this.CollectionWeightStorageItem[11].Grade3); + this.SetLabelText(this.label12Col4Row, this.CollectionWeightStorageItem[11].Weight4, false, this.CollectionWeightStorageItem[11].Grade4); + this.SetLabelText(this.label12Col5Row, this.CollectionWeightStorageItem[11].Weight5, false, this.CollectionWeightStorageItem[11].Grade5); + this.SetLabelText(this.label12Col6Row, this.CollectionWeightStorageItem[11].Weight6, false, this.CollectionWeightStorageItem[11].Grade6); + this.SetLabelText(this.label12Col7Row, this.CollectionWeightStorageItem[11].Weight7, false, this.CollectionWeightStorageItem[11].Grade7); + this.SetLabelText(this.label12Col8Row, this.CollectionWeightStorageItem[11].Weight8, false, this.CollectionWeightStorageItem[11].Grade8); + this.SetLabelText(this.label12Col9Row, this.CollectionWeightStorageItem[11].Weight9, false, this.CollectionWeightStorageItem[11].Grade9); + this.SetLabelText(this.label12Col10Row, this.CollectionWeightStorageItem[11].Weight10, false, this.CollectionWeightStorageItem[11].Grade10); + this.SetLabelText(this.label12Col5Avg, this.CollectionWeightStorageItem[11].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } private void UpdateTotalAverage(bool totalAverageView) { if (totalAverageView == true) { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true); - this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalAverage(), true); - this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } else { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } } @@ -617,22 +627,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -641,22 +651,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -665,22 +675,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -689,22 +699,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -713,22 +723,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -737,22 +747,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -761,22 +771,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[6].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { @@ -785,22 +795,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[7].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay9(DataStore.EquipmentStatus status, WeightData weightData) { @@ -809,22 +819,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[8].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false); - this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false); - this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false); - this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false); - this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false); - this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false); - this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false); - this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false); - this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false); - this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false); - this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false); + this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, false, this.CollectionWeightStorageItem[8].Grade1); + this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, false, this.CollectionWeightStorageItem[8].Grade2); + this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, false, this.CollectionWeightStorageItem[8].Grade3); + this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, false, this.CollectionWeightStorageItem[8].Grade4); + this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, false, this.CollectionWeightStorageItem[8].Grade5); + this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, false, this.CollectionWeightStorageItem[8].Grade6); + this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, false, this.CollectionWeightStorageItem[8].Grade7); + this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, false, this.CollectionWeightStorageItem[8].Grade8); + this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, false, this.CollectionWeightStorageItem[8].Grade9); + this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, false, this.CollectionWeightStorageItem[8].Grade10); + this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay10(DataStore.EquipmentStatus status, WeightData weightData) { @@ -833,22 +843,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[9].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false); - this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false); - this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false); - this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false); - this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false); - this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false); - this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false); - this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false); - this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false); - this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false); - this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false); + this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, false, this.CollectionWeightStorageItem[9].Grade1); + this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, false, this.CollectionWeightStorageItem[9].Grade2); + this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, false, this.CollectionWeightStorageItem[9].Grade3); + this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, false, this.CollectionWeightStorageItem[9].Grade4); + this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, false, this.CollectionWeightStorageItem[9].Grade5); + this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, false, this.CollectionWeightStorageItem[9].Grade6); + this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, false, this.CollectionWeightStorageItem[9].Grade7); + this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, false, this.CollectionWeightStorageItem[9].Grade8); + this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, false, this.CollectionWeightStorageItem[9].Grade9); + this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, false, this.CollectionWeightStorageItem[9].Grade10); + this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay11(DataStore.EquipmentStatus status, WeightData weightData) { @@ -857,22 +867,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[10].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label11Col1Row, this.CollectionWeightStorageItem[10].Weight1, false); - this.SetLabelText(this.label11Col2Row, this.CollectionWeightStorageItem[10].Weight2, false); - this.SetLabelText(this.label11Col3Row, this.CollectionWeightStorageItem[10].Weight3, false); - this.SetLabelText(this.label11Col4Row, this.CollectionWeightStorageItem[10].Weight4, false); - this.SetLabelText(this.label11Col5Row, this.CollectionWeightStorageItem[10].Weight5, false); - this.SetLabelText(this.label11Col6Row, this.CollectionWeightStorageItem[10].Weight6, false); - this.SetLabelText(this.label11Col7Row, this.CollectionWeightStorageItem[10].Weight7, false); - this.SetLabelText(this.label11Col8Row, this.CollectionWeightStorageItem[10].Weight8, false); - this.SetLabelText(this.label11Col9Row, this.CollectionWeightStorageItem[10].Weight9, false); - this.SetLabelText(this.label11Col10Row, this.CollectionWeightStorageItem[10].Weight10, false); - this.SetLabelText(this.label11Col5Avg, this.CollectionWeightStorageItem[10].GetWeightTenAverage(), false); + this.SetLabelText(this.label11Col1Row, this.CollectionWeightStorageItem[10].Weight1, false, this.CollectionWeightStorageItem[10].Grade1); + this.SetLabelText(this.label11Col2Row, this.CollectionWeightStorageItem[10].Weight2, false, this.CollectionWeightStorageItem[10].Grade2); + this.SetLabelText(this.label11Col3Row, this.CollectionWeightStorageItem[10].Weight3, false, this.CollectionWeightStorageItem[10].Grade3); + this.SetLabelText(this.label11Col4Row, this.CollectionWeightStorageItem[10].Weight4, false, this.CollectionWeightStorageItem[10].Grade4); + this.SetLabelText(this.label11Col5Row, this.CollectionWeightStorageItem[10].Weight5, false, this.CollectionWeightStorageItem[10].Grade5); + this.SetLabelText(this.label11Col6Row, this.CollectionWeightStorageItem[10].Weight6, false, this.CollectionWeightStorageItem[10].Grade6); + this.SetLabelText(this.label11Col7Row, this.CollectionWeightStorageItem[10].Weight7, false, this.CollectionWeightStorageItem[10].Grade7); + this.SetLabelText(this.label11Col8Row, this.CollectionWeightStorageItem[10].Weight8, false, this.CollectionWeightStorageItem[10].Grade8); + this.SetLabelText(this.label11Col9Row, this.CollectionWeightStorageItem[10].Weight9, false, this.CollectionWeightStorageItem[10].Grade9); + this.SetLabelText(this.label11Col10Row, this.CollectionWeightStorageItem[10].Weight10, false, this.CollectionWeightStorageItem[10].Grade10); + this.SetLabelText(this.label11Col5Avg, this.CollectionWeightStorageItem[10].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalAverage(), true); + this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label11AllAvg, this.CollectionWeightStorageItem[10].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay12(DataStore.EquipmentStatus status, WeightData weightData) { @@ -881,22 +891,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[11].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label12Col1Row, this.CollectionWeightStorageItem[11].Weight1, false); - this.SetLabelText(this.label12Col2Row, this.CollectionWeightStorageItem[11].Weight2, false); - this.SetLabelText(this.label12Col3Row, this.CollectionWeightStorageItem[11].Weight3, false); - this.SetLabelText(this.label12Col4Row, this.CollectionWeightStorageItem[11].Weight4, false); - this.SetLabelText(this.label12Col5Row, this.CollectionWeightStorageItem[11].Weight5, false); - this.SetLabelText(this.label12Col6Row, this.CollectionWeightStorageItem[11].Weight6, false); - this.SetLabelText(this.label12Col7Row, this.CollectionWeightStorageItem[11].Weight7, false); - this.SetLabelText(this.label12Col8Row, this.CollectionWeightStorageItem[11].Weight8, false); - this.SetLabelText(this.label12Col9Row, this.CollectionWeightStorageItem[11].Weight9, false); - this.SetLabelText(this.label12Col10Row, this.CollectionWeightStorageItem[11].Weight10, false); - this.SetLabelText(this.label12Col5Avg, this.CollectionWeightStorageItem[11].GetWeightTenAverage(), false); + this.SetLabelText(this.label12Col1Row, this.CollectionWeightStorageItem[11].Weight1, false, this.CollectionWeightStorageItem[11].Grade1); + this.SetLabelText(this.label12Col2Row, this.CollectionWeightStorageItem[11].Weight2, false, this.CollectionWeightStorageItem[11].Grade2); + this.SetLabelText(this.label12Col3Row, this.CollectionWeightStorageItem[11].Weight3, false, this.CollectionWeightStorageItem[11].Grade3); + this.SetLabelText(this.label12Col4Row, this.CollectionWeightStorageItem[11].Weight4, false, this.CollectionWeightStorageItem[11].Grade4); + this.SetLabelText(this.label12Col5Row, this.CollectionWeightStorageItem[11].Weight5, false, this.CollectionWeightStorageItem[11].Grade5); + this.SetLabelText(this.label12Col6Row, this.CollectionWeightStorageItem[11].Weight6, false, this.CollectionWeightStorageItem[11].Grade6); + this.SetLabelText(this.label12Col7Row, this.CollectionWeightStorageItem[11].Weight7, false, this.CollectionWeightStorageItem[11].Grade7); + this.SetLabelText(this.label12Col8Row, this.CollectionWeightStorageItem[11].Weight8, false, this.CollectionWeightStorageItem[11].Grade8); + this.SetLabelText(this.label12Col9Row, this.CollectionWeightStorageItem[11].Weight9, false, this.CollectionWeightStorageItem[11].Grade9); + this.SetLabelText(this.label12Col10Row, this.CollectionWeightStorageItem[11].Weight10, false, this.CollectionWeightStorageItem[11].Grade10); + this.SetLabelText(this.label12Col5Avg, this.CollectionWeightStorageItem[11].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalAverage(), true); + this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label12AllAvg, this.CollectionWeightStorageItem[11].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } #endregion diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable7.cs b/INT69DC_7C/Controls/ControlMainDisplayTable7.cs index 8989a56..f62cfbd 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable7.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable7.cs @@ -22,6 +22,7 @@ namespace INT69DC_7C.Controls private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; + private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -225,15 +226,24 @@ namespace INT69DC_7C.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT) + private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { string sValue = ""; Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - labelColor = this.WeightUnderColor; - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + // labelColor = this.WeightUnderColor; + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + // labelColor = this.WeightOverColor; + //else + // labelColor = this.WeightStandardColor; + + if (judge == DataStore.JudgmentStatus.Over) labelColor = this.WeightOverColor; + else if (judge == DataStore.JudgmentStatus.Under) + labelColor = this.WeightUnderColor; + else if (judge == DataStore.JudgmentStatus.EXNg) + labelColor = this.WeightExNGColor; else labelColor = this.WeightStandardColor; @@ -262,118 +272,118 @@ namespace INT69DC_7C.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } private void UpdateTotalAverage(bool totalAverageView) { if (totalAverageView == true) { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } else { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } } @@ -441,22 +451,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -465,22 +475,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -489,22 +499,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -513,22 +523,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -537,22 +547,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -561,22 +571,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -585,22 +595,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[6].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } #endregion diff --git a/INT69DC_7C/Controls/ControlMainDisplayTable8.cs b/INT69DC_7C/Controls/ControlMainDisplayTable8.cs index 62323f0..e396a4e 100644 --- a/INT69DC_7C/Controls/ControlMainDisplayTable8.cs +++ b/INT69DC_7C/Controls/ControlMainDisplayTable8.cs @@ -22,6 +22,7 @@ namespace INT69DC_7C.Controls private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; private Color WeightPassColor = Color.Green; + private Color WeightExNGColor = Color.Blue; /// /// true : total average @@ -244,15 +245,24 @@ namespace INT69DC_7C.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT) + private void SetLabelText(SmartLabel label, double value, bool labelTotalCNT, DataStore.JudgmentStatus judge) { string sValue = ""; Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - labelColor = this.WeightUnderColor; - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + // labelColor = this.WeightUnderColor; + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + // labelColor = this.WeightOverColor; + //else + // labelColor = this.WeightStandardColor; + + if (judge == DataStore.JudgmentStatus.Over) labelColor = this.WeightOverColor; + else if (judge == DataStore.JudgmentStatus.Under) + labelColor = this.WeightUnderColor; + else if (judge == DataStore.JudgmentStatus.EXNg) + labelColor = this.WeightExNGColor; else labelColor = this.WeightStandardColor; @@ -281,133 +291,133 @@ namespace INT69DC_7C.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } private void UpdateTotalAverage(bool totalAverageView) { if (totalAverageView == true) { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); } else { - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } } @@ -476,22 +486,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, false, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, false, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, false, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, false, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, false, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, false, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, false, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, false, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, false, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, false, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -500,22 +510,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, false, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, false, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, false, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, false, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, false, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, false, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, false, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, false, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, false, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, false, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -524,22 +534,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, false, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, false, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, false, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, false, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, false, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, false, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, false, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, false, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, false, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, false, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -548,22 +558,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, false, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, false, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, false, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, false, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, false, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, false, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, false, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, false, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, false, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, false, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -572,22 +582,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, false, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, false, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, false, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, false, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, false, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, false, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, false, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, false, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, false, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, false, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -596,22 +606,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, false, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, false, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, false, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, false, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, false, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, false, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, false, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, false, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, false, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, false, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -620,22 +630,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[6].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, false, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, false, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, false, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, false, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, false, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, false, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, false, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, false, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, false, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, false, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { @@ -644,22 +654,22 @@ namespace INT69DC_7C.Controls this.CollectionWeightStorageItem[7].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, false, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, false, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, false, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, false, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, false, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, false, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, false, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, false, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, false, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, false, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), false, DataStore.JudgmentStatus.Empty); if (this.IsTotalAverageView == true) - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), true, DataStore.JudgmentStatus.Empty); else - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalPassAverage(), true, DataStore.JudgmentStatus.Empty); } #endregion diff --git a/INT69DC_7C/DataStore.cs b/INT69DC_7C/DataStore.cs index b6bd23b..e0c6fa0 100644 --- a/INT69DC_7C/DataStore.cs +++ b/INT69DC_7C/DataStore.cs @@ -3059,7 +3059,7 @@ namespace INT69DC_7C #region Field private double m_Weight1; private double m_Weight2; - private double m_weight3; + private double m_Weight3; private double m_Weight4; private double m_Weight5; private double m_Weight6; @@ -3069,6 +3069,17 @@ namespace INT69DC_7C private double m_Weight10; private double m_TotalSum; private int m_TotalCount; + + private DataStore.JudgmentStatus m_Grade1; + private DataStore.JudgmentStatus m_Grade2; + private DataStore.JudgmentStatus m_Grade3; + private DataStore.JudgmentStatus m_Grade4; + private DataStore.JudgmentStatus m_Grade5; + private DataStore.JudgmentStatus m_Grade6; + private DataStore.JudgmentStatus m_Grade7; + private DataStore.JudgmentStatus m_Grade8; + private DataStore.JudgmentStatus m_Grade9; + private DataStore.JudgmentStatus m_Grade10; private double m_TotalPassSum; private int m_TotalPassCount; @@ -3109,8 +3120,8 @@ namespace INT69DC_7C } public double Weight3 { - get { return this.m_weight3; } - set { this.m_weight3 = value; } + get { return this.m_Weight3; } + set { this.m_Weight3 = value; } } public double Weight4 { @@ -3153,6 +3164,57 @@ namespace INT69DC_7C private set { this.m_TotalSum = value; } } + public DataStore.JudgmentStatus Grade1 + { + get { return this.m_Grade1; } + set { this.m_Grade1 = value; } + } + public DataStore.JudgmentStatus Grade2 + { + get { return this.m_Grade2; } + set { this.m_Grade2 = value; } + } + public DataStore.JudgmentStatus Grade3 + { + get { return this.m_Grade3; } + set { this.m_Grade3 = value; } + } + public DataStore.JudgmentStatus Grade4 + { + get { return this.m_Grade4; } + set { this.m_Grade4 = value; } + } + public DataStore.JudgmentStatus Grade5 + { + get { return this.m_Grade5; } + set { this.m_Grade5 = value; } + } + public DataStore.JudgmentStatus Grade6 + { + get { return this.m_Grade6; } + set { this.m_Grade6 = value; } + } + public DataStore.JudgmentStatus Grade7 + { + get { return this.m_Grade7; } + set { this.m_Grade7 = value; } + } + public DataStore.JudgmentStatus Grade8 + { + get { return this.m_Grade8; } + set { this.m_Grade8 = value; } + } + public DataStore.JudgmentStatus Grade9 + { + get { return this.m_Grade9; } + set { this.m_Grade9 = value; } + } + public DataStore.JudgmentStatus Grade10 + { + get { return this.m_Grade10; } + set { this.m_Grade10 = value; } + } + public int TotalCount { get { return this.m_TotalCount; } @@ -3201,6 +3263,17 @@ namespace INT69DC_7C public void SetValue(double value,DataStore.JudgmentStatus status) { + this.Grade10 = this.Grade9; + this.Grade9 = this.Grade8; + this.Grade8 = this.Grade7; + this.Grade7 = this.Grade6; + this.Grade6 = this.Grade5; + this.Grade5 = this.Grade4; + this.Grade4 = this.Grade3; + this.Grade3 = this.Grade2; + this.Grade2 = this.Grade1; + this.Grade1 = status; + this.Weight10 = this.Weight9; this.Weight9 = this.Weight8; this.Weight8 = this.Weight7; @@ -3238,6 +3311,17 @@ namespace INT69DC_7C this.TotalSum = 0.0; this.TotalCount = 0; + this.Grade1 = DataStore.JudgmentStatus.Empty; + this.Grade2 = DataStore.JudgmentStatus.Empty; + this.Grade3 = DataStore.JudgmentStatus.Empty; + this.Grade4 = DataStore.JudgmentStatus.Empty; + this.Grade5 = DataStore.JudgmentStatus.Empty; + this.Grade6 = DataStore.JudgmentStatus.Empty; + this.Grade7 = DataStore.JudgmentStatus.Empty; + this.Grade8 = DataStore.JudgmentStatus.Empty; + this.Grade9 = DataStore.JudgmentStatus.Empty; + this.Grade10 = DataStore.JudgmentStatus.Empty; + this.TotalPassSum = 0.0; this.TotalPassCount = 0; } diff --git a/INT69DC_7C/DialogForms/DialogFormLogOn.cs b/INT69DC_7C/DialogForms/DialogFormLogOn.cs index f19c080..adf7a14 100644 --- a/INT69DC_7C/DialogForms/DialogFormLogOn.cs +++ b/INT69DC_7C/DialogForms/DialogFormLogOn.cs @@ -45,6 +45,74 @@ namespace INT69DC_7C.DialogForms #endregion #region Method + private string ReturnUserStatus(int num) + { + string ret = ""; + + switch (num) + { + case 1: + ret = "ID_Not found"; + break; + case 2: + ret = "ID_Duplication"; + break; + case 3: + ret = "ID_Too short"; + break; + case 4: + ret = "ID_Too long"; + break; + case 5: + ret = "ID_Consecutive or duplicate char"; + break; + case 6: + ret = "ID_Invalid char"; + break; + case 7: + ret = "ID_Lock"; + break; + case 8: + ret = "PW_Duplicate prev PW"; + break; + case 9: + ret = "PW_Too short"; + break; + case 10: + ret = "PW_Too long"; + break; + case 11: + ret = "PW_Consecutive or duplicate char"; + break; + case 12: + ret = "PW_Invalid char"; + break; + case 13: + ret = "PW_Not include char"; + break; + case 14: + ret = "PW_Incorrect"; + break; + case 15: + ret = "PW_Lock"; + break; + case 16: + ret = "PW_Over expire period"; + break; + case 17: + ret = "ID_Over expire period"; + break; + case 18: + ret = "Auto logout"; + break; + default: + ret = ""; + break; + } + + return ret; + } + private void InitializeDesign() { ImageDll images = new ImageDll(); @@ -156,6 +224,9 @@ namespace INT69DC_7C.DialogForms if (this.textBoxID.Text == "") { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Fail : ID blank"); + // ID : 6~20자 입력 하세요 DialogFormMessage myMsg = new DialogFormMessage(null, 3, this.ParentForm.SystemConfig.Language); myMsg.ShowDialog(); @@ -164,6 +235,9 @@ namespace INT69DC_7C.DialogForms } if (this.textBoxPassword.Text == "") { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Fail : PW blank"); + // PASSWORD : 6~20자 입력 하세요 DialogFormMessage myMsg = new DialogFormMessage(null, 9, this.ParentForm.SystemConfig.Language); myMsg.ShowDialog(); @@ -171,6 +245,18 @@ namespace INT69DC_7C.DialogForms return; } + if (this.textBoxID.Text == "admin00" && this.textBoxPassword.Text == "admin20090810") + { + DialogFormYesNo dlg = new DialogFormYesNo(this.ParentForm.SystemConfig.Language, 17); + if (dlg.ShowDialog() == DialogResult.Yes) + { + this.ParentForm.ChildFormMainDisplay.ChangeID = this.textBoxID.Text; + this.DialogResult = DialogResult.Abort; + this.Close(); + } + return; + } + UserManager.UserManager_UserLoginDirect(this.textBoxID.Text, this.textBoxPassword.Text, ref userInfo); if (userInfo.status == 0 && userInfo.fFirstPW == 0) @@ -216,11 +302,17 @@ namespace INT69DC_7C.DialogForms this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW; #endregion + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Success"); + this.DialogResult = DialogResult.OK; this.Close(); } else if (userInfo.fFirstPW == 1) { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "First login"); + // 최초 로그인 시 비밀번호 변경 this.ParentForm.ChildFormMainDisplay.ChangeID = this.textBoxID.Text; this.DialogResult = DialogResult.Abort; @@ -234,10 +326,18 @@ namespace INT69DC_7C.DialogForms // 비밀번호 만료 시 if (userInfo.status == 15) { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Password expiration"); + this.ParentForm.ChildFormMainDisplay.ChangeID = this.textBoxID.Text; this.DialogResult = DialogResult.Abort; this.Close(); } + else + { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Fail : " + this.ReturnUserStatus(userInfo.status)); + } } } private void ChangePassword() @@ -248,6 +348,9 @@ namespace INT69DC_7C.DialogForms if (this.textBoxID.Text == "") { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Fail : TextBox1 blank"); + // New Password : 6~20자 입력 하세요 DialogFormMessage myMsg = new DialogFormMessage(null, 9, this.ParentForm.SystemConfig.Language); myMsg.ShowDialog(); @@ -256,6 +359,9 @@ namespace INT69DC_7C.DialogForms } if (this.textBoxPassword.Text == "") { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Fail : TextBox2 blank"); + // New Password Confirmation : 6~20자 입력 하세요 DialogFormMessage myMsg = new DialogFormMessage(null, 9, this.ParentForm.SystemConfig.Language); myMsg.ShowDialog(); @@ -263,7 +369,10 @@ namespace INT69DC_7C.DialogForms return; } if (this.textBoxID.Text.Equals(this.textBoxPassword.Text) == false) - { + { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Fail : Diffrent char"); + // 비밀번호를 확인하세요 DialogFormMessage myMsg = new DialogFormMessage(null, 14, this.ParentForm.SystemConfig.Language); myMsg.ShowDialog(); @@ -331,17 +440,26 @@ namespace INT69DC_7C.DialogForms this.ParentForm.SystemConfig.CurrentUser.IsFirstPassword = userInfo.fFirstPW; #endregion + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Success"); + this.DialogResult = DialogResult.OK; this.Close(); } else { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Fail : " + this.ReturnUserStatus(ret)); + DialogFormMessage myMsg = new DialogFormMessage(null, ret, this.ParentForm.SystemConfig.Language); myMsg.ShowDialog(); } } else - { + { + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, "Failure change password"); + // 비밀번호 변경 실패 시 메시지?? //Console.WriteLine(ret.ToString()); DialogFormMessage myMsg = new DialogFormMessage(null, ret, this.ParentForm.SystemConfig.Language); diff --git a/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs b/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs index 460be75..b6c7b2c 100644 --- a/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs +++ b/INT69DC_7C/DialogForms/DialogFormPasswordKeyPad1.cs @@ -13,7 +13,9 @@ namespace INT69DC_7C.DialogForms { #region Field private string m_InputKey; - private string m_PassKey; + private string m_PassKey; + private string m_PasswordHiddenMenu; + private int m_Digit; #endregion #region Constructor @@ -23,6 +25,15 @@ namespace INT69DC_7C.DialogForms this.InitializeDesign(language); } + public DialogFormPasswordKeyPad1(int digit, DataStore.LanguageID language) + { + InitializeComponent(); + + this.Digit = digit; + this.PasswordHiddenMenu = DateTime.Now.ToString("MMdd") + "0810"; + + this.InitializeDesign(language); + } #endregion #region Property @@ -36,6 +47,16 @@ namespace INT69DC_7C.DialogForms get { return this.m_PassKey; } set { this.m_PassKey = value; } } + private int Digit + { + get { return this.m_Digit; } + set { this.m_Digit = value; } + } + public string PasswordHiddenMenu + { + get { return this.m_PasswordHiddenMenu; } + set { this.m_PasswordHiddenMenu = value; } + } #endregion #region Method @@ -44,12 +65,12 @@ namespace INT69DC_7C.DialogForms if (this.InputKey.Length >= 4) { this.InputKey = key; - this.labelScreen.Text = this.InputKey; + this.labelScreen.Text = "*"; } else { this.InputKey += key; - this.labelScreen.Text = this.InputKey; + this.labelScreen.Text += "*"; } } @@ -113,6 +134,14 @@ namespace INT69DC_7C.DialogForms { this.DialogResult = DialogResult.OK; } + else if (this.labelScreen.Text.Length == 8) + { + if (this.Digit == 8) + { + if (this.InputKey == this.PasswordHiddenMenu) + this.DialogResult = DialogResult.OK; + } + } } private void buttonNumber_Click(object sender, EventArgs e) diff --git a/INT69DC_7C/Forms/FormInformation.cs b/INT69DC_7C/Forms/FormInformation.cs index 4cfc5da..d68cca1 100644 --- a/INT69DC_7C/Forms/FormInformation.cs +++ b/INT69DC_7C/Forms/FormInformation.cs @@ -140,7 +140,7 @@ namespace INT69DC_7C.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "11.0.0"; + this.labelDisplayVer.Text = "11.0.1"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs index 157822b..021e4dd 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.Designer.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.Designer.cs @@ -101,7 +101,7 @@ this.labelUserLevel = new SmartX.SmartLabel(); this.labelUserID = new SmartX.SmartLabel(); this.labelTitleTotalCount = new SmartX.SmartLabel(); - this.labelTitleNG = new SmartX.SmartLabel(); + this.labelTitleNGCount = new SmartX.SmartLabel(); this.labelTitleScreen = new SmartX.SmartLabel(); this.buttonFeedback = new SmartX.SmartButton(); this.panelSubMenu1 = new System.Windows.Forms.Panel(); @@ -430,14 +430,14 @@ this.labelTotalCount.BackPictureBox2 = null; this.labelTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); + this.labelTotalCount.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular); this.labelTotalCount.InitVisible = true; this.labelTotalCount.LineSpacing = 0F; - this.labelTotalCount.Location = new System.Drawing.Point(130, 704); + this.labelTotalCount.Location = new System.Drawing.Point(108, 703); this.labelTotalCount.Name = "labelTotalCount"; - this.labelTotalCount.Size = new System.Drawing.Size(142, 41); + this.labelTotalCount.Size = new System.Drawing.Size(135, 41); this.labelTotalCount.TabIndex = 444; - this.labelTotalCount.Text = "12345678"; + this.labelTotalCount.Text = "999999999"; this.labelTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelTotalCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelTotalCount.Wordwrap = false; @@ -450,7 +450,7 @@ this.labelProductionSpeed.BackPictureBox2 = null; this.labelProductionSpeed.BorderColor = System.Drawing.Color.Black; this.labelProductionSpeed.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); + this.labelProductionSpeed.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular); this.labelProductionSpeed.InitVisible = true; this.labelProductionSpeed.LineSpacing = 0F; this.labelProductionSpeed.Location = new System.Drawing.Point(524, 704); @@ -488,17 +488,18 @@ this.labelNGCount.BackPictureBox2 = null; this.labelNGCount.BorderColor = System.Drawing.Color.Black; this.labelNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 22F, System.Drawing.FontStyle.Regular); + this.labelNGCount.Font = new System.Drawing.Font("Tahoma", 18F, System.Drawing.FontStyle.Regular); this.labelNGCount.InitVisible = true; this.labelNGCount.LineSpacing = 0F; - this.labelNGCount.Location = new System.Drawing.Point(371, 704); + this.labelNGCount.Location = new System.Drawing.Point(362, 703); this.labelNGCount.Name = "labelNGCount"; - this.labelNGCount.Size = new System.Drawing.Size(124, 41); + this.labelNGCount.Size = new System.Drawing.Size(125, 41); this.labelNGCount.TabIndex = 442; this.labelNGCount.Text = "1234567"; this.labelNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; this.labelNGCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; this.labelNGCount.Wordwrap = false; + this.labelNGCount.Click += new System.EventHandler(this.labelTitleNGCount_Click); // // buttonTableForm // @@ -1571,7 +1572,7 @@ this.buttonCut.ForeColor = System.Drawing.Color.White; this.buttonCut.GroupID = 0; this.buttonCut.InitVisible = true; - this.buttonCut.Location = new System.Drawing.Point(509, 694); + this.buttonCut.Location = new System.Drawing.Point(508, 694); this.buttonCut.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; this.buttonCut.Name = "buttonCut"; this.buttonCut.NestedClickEventPrevent = false; @@ -1671,12 +1672,12 @@ this.labelTitleTotalCount.BackPictureBox2 = null; this.labelTitleTotalCount.BorderColor = System.Drawing.Color.Black; this.labelTitleTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleTotalCount.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); this.labelTitleTotalCount.InitVisible = true; this.labelTitleTotalCount.LineSpacing = 0F; - this.labelTitleTotalCount.Location = new System.Drawing.Point(25, 704); + this.labelTitleTotalCount.Location = new System.Drawing.Point(23, 703); this.labelTitleTotalCount.Name = "labelTitleTotalCount"; - this.labelTitleTotalCount.Size = new System.Drawing.Size(99, 41); + this.labelTitleTotalCount.Size = new System.Drawing.Size(80, 41); this.labelTitleTotalCount.TabIndex = 521; this.labelTitleTotalCount.Text = "Total"; this.labelTitleTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; @@ -1684,24 +1685,25 @@ this.labelTitleTotalCount.Wordwrap = false; this.labelTitleTotalCount.Click += new System.EventHandler(this.labelTotalCount_Click); // - // labelTitleNG + // labelTitleNGCount // - this.labelTitleNG.BackPictureBox = this.smartForm1; - this.labelTitleNG.BackPictureBox1 = null; - this.labelTitleNG.BackPictureBox2 = null; - this.labelTitleNG.BorderColor = System.Drawing.Color.Black; - this.labelTitleNG.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelTitleNG.Font = new System.Drawing.Font("새굴림", 18F, System.Drawing.FontStyle.Bold); - this.labelTitleNG.InitVisible = true; - this.labelTitleNG.LineSpacing = 0F; - this.labelTitleNG.Location = new System.Drawing.Point(310, 704); - this.labelTitleNG.Name = "labelTitleNG"; - this.labelTitleNG.Size = new System.Drawing.Size(55, 41); - this.labelTitleNG.TabIndex = 522; - this.labelTitleNG.Text = "NG"; - this.labelTitleNG.TextHAlign = SmartX.SmartLabel.TextHorAlign.Right; - this.labelTitleNG.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelTitleNG.Wordwrap = false; + this.labelTitleNGCount.BackPictureBox = this.smartForm1; + this.labelTitleNGCount.BackPictureBox1 = null; + this.labelTitleNGCount.BackPictureBox2 = null; + this.labelTitleNGCount.BorderColor = System.Drawing.Color.Black; + this.labelTitleNGCount.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.labelTitleNGCount.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); + this.labelTitleNGCount.InitVisible = true; + this.labelTitleNGCount.LineSpacing = 0F; + this.labelTitleNGCount.Location = new System.Drawing.Point(274, 703); + this.labelTitleNGCount.Name = "labelTitleNGCount"; + this.labelTitleNGCount.Size = new System.Drawing.Size(82, 41); + this.labelTitleNGCount.TabIndex = 522; + this.labelTitleNGCount.Text = "NG"; + this.labelTitleNGCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleNGCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleNGCount.Wordwrap = false; + this.labelTitleNGCount.Click += new System.EventHandler(this.labelTitleNGCount_Click); // // labelTitleScreen // @@ -2479,7 +2481,7 @@ this.Controls.Add(this.buttonFeedback); this.Controls.Add(this.buttonCut); this.Controls.Add(this.labelTitleScreen); - this.Controls.Add(this.labelTitleNG); + this.Controls.Add(this.labelTitleNGCount); this.Controls.Add(this.labelTitleTotalCount); this.Controls.Add(this.labelUserID); this.Controls.Add(this.labelUserLevel); @@ -2595,7 +2597,7 @@ private SmartX.SmartLabel labelUserLevel; private SmartX.SmartLabel labelUserID; private SmartX.SmartLabel labelTitleTotalCount; - private SmartX.SmartLabel labelTitleNG; + private SmartX.SmartLabel labelTitleNGCount; private SmartX.SmartLabel labelTitleScreen; private SmartX.SmartButton buttonFeedback; private System.Windows.Forms.Panel panelSubMenu1; diff --git a/INT69DC_7C/Forms/FormMainDisplay.cs b/INT69DC_7C/Forms/FormMainDisplay.cs index 16b5f01..94b145c 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.cs +++ b/INT69DC_7C/Forms/FormMainDisplay.cs @@ -231,7 +231,7 @@ namespace INT69DC_7C.Forms this.labelMessage1.Text = "报警 - 双倍"; this.labelTitleTotalCount.Text = "计数"; - this.labelTitleNG.Text = "不良"; + this.labelTitleNGCount.Text = "不良"; this.labelTitleBypass.Text = "旁路"; this.labelTitleScreen.Text = "屏幕"; @@ -312,7 +312,7 @@ namespace INT69DC_7C.Forms this.labelMessage1.Text = "poplach - Zdvojení"; this.labelTitleTotalCount.Text = "Celkem"; - this.labelTitleNG.Text = "Vadný"; + this.labelTitleNGCount.Text = "Vadný"; this.labelTitleBypass.Text = "Bypass"; this.labelTitleScreen.Text = "Zobrazení"; this.labelTitleScreen.Font = new Font("New Gulim", 10F, FontStyle.Bold); @@ -396,7 +396,7 @@ namespace INT69DC_7C.Forms this.labelMessage1.Text = "Alarm - doppelte Eingabe"; this.labelTitleTotalCount.Text = "Insgesamt"; - this.labelTitleNG.Text = "Schlecht"; + this.labelTitleNGCount.Text = "Schlecht"; this.labelTitleBypass.Text = "Bypass"; this.labelTitleScreen.Text = "Bildschirm"; this.labelTitleScreen.Font = new Font("New Gulim", 10F, FontStyle.Bold); @@ -1008,10 +1008,6 @@ namespace INT69DC_7C.Forms this.buttonUser.ButtonDown(); this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser); - - // Part 11 - if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, ""); } else if (result == DialogResult.Abort) { @@ -1021,10 +1017,6 @@ namespace INT69DC_7C.Forms { this.buttonUser.ButtonDown(); this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser); - - // Part 11 - if (this.ParentForm.SystemConfig.IsPart11 == true) - this.ParentForm.SetTrackingHistoryData(DataStore.TrackingOperation.Login, ""); } else this.buttonUser.ButtonUp(); @@ -1576,6 +1568,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1627,6 +1620,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1672,6 +1666,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1717,6 +1712,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1762,6 +1758,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1807,6 +1804,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1852,6 +1850,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1897,6 +1896,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1936,6 +1936,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay9(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1967,6 +1968,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay10(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1998,6 +2000,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay11(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2023,6 +2026,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay12(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2048,6 +2052,7 @@ namespace INT69DC_7C.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateFeedbackDataDisplay1(DataStore.EquipmentStatus status, FeedBackSystem1 feedbackData) { @@ -2266,13 +2271,12 @@ namespace INT69DC_7C.Forms } public void SetTotalCount() { - int toTalAll = 0, toTalPass = 0, toTalNG = 0; + int toTalAll = 0, toTalPass = 0; for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) { toTalAll += this.ParentForm.CollectionWeightData[i].TotalCount; toTalPass += this.ParentForm.CollectionWeightData[i].PassCount; - toTalNG += this.ParentForm.CollectionWeightData[i].TotalNGCount; } // Total All Count @@ -2288,10 +2292,29 @@ namespace INT69DC_7C.Forms if (this.labelTotalCount.Text != toTalAll.ToString()) this.labelTotalCount.Text = toTalAll.ToString(); } + } + public void SetNGCount() + { + int toTalNG = 0, toTalExNG = 0; + + for (int i = 0; i < this.ParentForm.SystemConfig.EquipmentColumns; i++) + { + toTalNG += this.ParentForm.CollectionWeightData[i].TotalNGCount; + toTalExNG += this.ParentForm.CollectionWeightData[i].ExNGCount; + } // Total NG Count - if (this.labelNGCount.Text != toTalNG.ToString()) - this.labelNGCount.Text = toTalNG.ToString(); + if (this.labelTitleNGCount.Text == "NG" || this.labelTitleNGCount.Text == "不良" || this.labelTitleNGCount.Text == "Vadný" + || this.labelTitleNGCount.Text == "Schlecht") + { + if (this.labelNGCount.Text != toTalNG.ToString()) + this.labelNGCount.Text = toTalNG.ToString(); + } + else + { + if (this.labelNGCount.Text != toTalExNG.ToString()) + this.labelNGCount.Text = toTalExNG.ToString(); + } } public void ProductChange(int productNumber) { @@ -3730,6 +3753,46 @@ namespace INT69DC_7C.Forms this.SetTotalCount(); } + private void labelTitleNGCount_Click(object sender, EventArgs e) + { + // Automatic Logout Reset + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.Part11AutomaticLogoutReset(); + + lock (this) + { + if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Chinese) + { + if (this.labelTitleNGCount.Text != "不良") + this.labelTitleNGCount.Text = "不良"; + else + this.labelTitleNGCount.Text = "其他不良"; + } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Czech) + { + if (this.labelTitleNGCount.Text != "Vadný") + this.labelTitleNGCount.Text = "Vadný"; + else + this.labelTitleNGCount.Text = "Jiné vadné"; + } + else if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.German) + { + if (this.labelTitleNGCount.Text != "Schlecht") + this.labelTitleNGCount.Text = "Schlecht"; + else + this.labelTitleNGCount.Text = "Andere Schlecht"; + } + else + { + if (this.labelTitleNGCount.Text != "NG") + this.labelTitleNGCount.Text = "NG"; + else + this.labelTitleNGCount.Text = "ExNG"; + } + + this.SetNGCount(); + } + } private void labelATPC_SetCNT_Click(object sender, EventArgs e) { diff --git a/INT69DC_7C/Forms/FormMainDisplay.resx b/INT69DC_7C/Forms/FormMainDisplay.resx index 674cb79..be592fb 100644 --- a/INT69DC_7C/Forms/FormMainDisplay.resx +++ b/INT69DC_7C/Forms/FormMainDisplay.resx @@ -165,151 +165,149 @@ XTesb3QPLh88M+QwdP6m681Lt7xuXbu94vbgcOjwnZHokdE77DtTd1PuvriXeW/h/sYH6AdFD6UeVjxS fNTws+7PbaOWo6fHXMf6Hwc/vj/OGn/2S8Yv7ycKnpCfVEyqTDZPmU2dmnafvvF05dOJZ+nPFmYKf5X+ tfa5zvMffnP8rX82YnbiBf/Fp99LXsq/PPRq2aueuYC5R69TXy/MF72Rf3P4LeNt37vwd5MLWe+x7ys/ - 6H7o/ujz8cGn1E+f/gUDmPP8usTo0wAAAAlwSFlzAAAOxAAADsQBlSsOGwAAIahJREFUeF7t3XdzFWee - 9+Hn/b+AtUSQwCCMCAaRg5DJEogkIZFxeWa96/FslQ3zCvanbZfKTxulww2j1vdSXeU/ugWm6g6nPyf0 - +X/f/Mc3AABACAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABB - BAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEA - AABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABA - EAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQA - AABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAA - EEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQR - AAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABB - BAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEA - AABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABA - EAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQA - AABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAA - EEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQR - AAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABB - BAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEA - AABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABA - EAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQA - AABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAA - EEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQR - AAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABB - BAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEA - AABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABA - EAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQA - AABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAA - EEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQR - AAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABB - BAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEA - AABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABA - EAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQA - AABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAA - EEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQR - AAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABB - BAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEA - AABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABA - EAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQA - AABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAA - EEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQR - AAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABB - BAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEA - AABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABA - EAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQA - AABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAA - EEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQR - AAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAAAAQRAAAAEEQAAABAEAEAAABBBAAA - AAQRAAAAEEQAAABAEAEAAABBBAAADNX42Pili5eeP3/+y3//8uHDh4//+sjQ/fbbbz///HONaY1sjW9v - xKEJAQAAg3ThwoX/+u//+vDxw6+//vq3v//t3bt3r9+8fvX6FYP2+vXrN2/fvP/x/X/+/J8//fRTjXJv - 3OHzCQAAGJixb8YWFhY+/uvjr//89e27ty9evlh9scqeUQNaKgaqBH7620/37t2rEe/NAfgcAgAABmbt - 6v/jx59//rm79F9ZXXm+8pw9owa0dCXw+s3rd+/f3blzpzcH4HMIAAAYkosXL3781x9X/y7997Ya364B - 3v/4/tzMud5MgJEJAAAYjPGx8X/8+o9f//mrq/8QXQO8efvm5auXPhNMKwIAAAbjyuUrHz5+ePvu7eqL - 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 + vYfM//fZf3wGAACEEAAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBE + AAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAA + ABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAE + EQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQA + AAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAA + QQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBAB + AAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAA + QBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBE + AAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAA + ABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAE + EQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQA + AAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAA + QQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBAB + AAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAA + QBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBE + AAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAA + ABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAE + EQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQA + AAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAA + QQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBAB + AAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAA + QBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBE + AAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAA + ABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAE + EQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQA + AAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAA + QQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBAB + AAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAA + QBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBE + AAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAA + ABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAE + EQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQA + AAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAA + QQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBAB + AAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAA + QBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBE + AAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAA + ABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAE + EQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQA + AAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAA + QQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBAB + AAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAA + QBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBE + AAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAA + ABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAEEQAAABBEAAAAQBABAAAAQQQAAAAE + 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 diff --git a/INT69DC_7C/Forms/FormMenu.cs b/INT69DC_7C/Forms/FormMenu.cs index 511f69e..8b41193 100644 --- a/INT69DC_7C/Forms/FormMenu.cs +++ b/INT69DC_7C/Forms/FormMenu.cs @@ -751,7 +751,7 @@ namespace INT69DC_7C.Forms { #region 유저설정 ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormUserEditor); - this.ParentForm.ChildFormUserEditor.DisplayRefresh(); + this.ParentForm.ChildFormUserEditor.DisplayRefresh(); #endregion } else if (button == this.buttonDataStatistics) @@ -763,9 +763,25 @@ namespace INT69DC_7C.Forms } else if (button == this.buttonOptionSetting) { - #region 옵션설정 - ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOptionSetting); - this.ParentForm.ChildFormOptionSetting.DisplayRefresh(); + #region 옵션설정 + if (this.ParentForm.SystemConfig.IsPart11 == true && this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer) + { + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOptionSetting); + this.ParentForm.ChildFormOptionSetting.DisplayRefresh(); + } + else + { + DialogFormPasswordKeyPad1 password = new DialogFormPasswordKeyPad1(8, this.ParentForm.SystemConfig.Language); + DialogResult dialogResult = password.ShowDialog(); + if (dialogResult == DialogResult.OK) + { + if (this.ParentForm.ChildFormOptionSetting != null) + { + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOptionSetting); + this.ParentForm.ChildFormOptionSetting.DisplayRefresh(); + } + } + } #endregion } else if (button == this.buttonCommunication) @@ -803,11 +819,6 @@ namespace INT69DC_7C.Forms this.buttonEquipmentTest.Visible = true; if (this.buttonOptionSetting.Visible != true) this.buttonOptionSetting.Visible = true; - - if (this.buttonEquipmentTest.Enabled != true) - this.buttonEquipmentTest.Enabled = true; - if (this.buttonOptionSetting.Enabled != true) - this.buttonOptionSetting.Enabled = true; } } } diff --git a/INT69DC_7C/Forms/FormUserEditor.cs b/INT69DC_7C/Forms/FormUserEditor.cs index 934cee0..2e8b1fa 100644 --- a/INT69DC_7C/Forms/FormUserEditor.cs +++ b/INT69DC_7C/Forms/FormUserEditor.cs @@ -152,7 +152,7 @@ namespace INT69DC_7C.Forms } private void SetEnablePassword(bool value) { - value = false; + //value = false; this.labelPassword.Enabled = value; @@ -346,7 +346,6 @@ namespace INT69DC_7C.Forms this.buttonSave.Visible = false; this.comboBoxAccessRight.Enabled = true; this.SetEnableID(true); - this.SetEnablePassword(true); } private Color ReturnColor(bool bValue) { @@ -503,7 +502,7 @@ namespace INT69DC_7C.Forms this.buttonSave.Visible = false; this.labelStatusExpiryAccount.Visible = false; this.labelStatusExpiryPassword.Visible = false; - this.SetEnablePassword(true); + this.SetEnablePassword(false); this.SetEnableID(true); this.SetEnableExpireAccount(true); this.SetEnableExpirePassword(true); @@ -665,13 +664,11 @@ namespace INT69DC_7C.Forms else if (this.ParentForm.SystemConfig.CurrentUser.ActiveLevel == item.ActiveLevel) { this.buttonDelete.Visible = false; - this.SetEnablePassword(true); this.comboBoxAccessRight.Enabled = false; } else { this.buttonDelete.Visible = true; - this.SetEnablePassword(true); this.comboBoxAccessRight.Enabled = true; } } @@ -1047,7 +1044,6 @@ namespace INT69DC_7C.Forms { string value = ""; DialogFormUserEditorKeyboard keyboard = new DialogFormUserEditorKeyboard(this.labelPassword.Text); - if (keyboard.ShowDialog() == DialogResult.OK) { value = keyboard.RetStringValue; @@ -1242,8 +1238,16 @@ namespace INT69DC_7C.Forms { int index = this.listBoxUserList.SelectedIndex; - if (index != -1) + if (index == 0) { + this.SetEnablePassword(true); + + UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString()); + } + else if (index > 0) + { + this.SetEnablePassword(false); + if (this.ParentForm.SystemConfig.CurrentUser.ID == this.listBoxUserList.Items[index].ToString()) this.buttonDelete.Visible = false; else diff --git a/INT69DC_7C/Forms/FormUserEditor.designer.cs b/INT69DC_7C/Forms/FormUserEditor.designer.cs index 3c05414..0dd8676 100644 --- a/INT69DC_7C/Forms/FormUserEditor.designer.cs +++ b/INT69DC_7C/Forms/FormUserEditor.designer.cs @@ -1242,6 +1242,7 @@ this.listBoxUserList.Name = "listBoxUserList"; this.listBoxUserList.Size = new System.Drawing.Size(357, 560); this.listBoxUserList.TabIndex = 211; + this.listBoxUserList.SelectedIndexChanged += new System.EventHandler(this.listBoxUserList_SelectedIndexChanged); // // FormUserEditor // diff --git a/INT69DC_7C/Version.txt b/INT69DC_7C/Version.txt index 91fbee2..199eeb3 100644 --- a/INT69DC_7C/Version.txt +++ b/INT69DC_7C/Version.txt @@ -15,6 +15,18 @@ Ƽ 8,10,12 /ƽ 跮 */ +@ Ver 11.0.1 by CJY + - 2023.10.17 + - Ver 11.0.0 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ȭ ũNG ǥ + 1. ExNG Table ǥ ߰(Ķ) + 2. ȭ ϴ NG <-> ExNG ǥ + - ɼǼ йȣ Է - MMdd0810(Intech Է ԰) + - α α + - admin00 α , admin20090810 Էϸ admin ʱȭ + - admin00 / ̿ܿ Ұϰ йȣ Reset + @ Ver 11.0.0 by LSJ - 2023.07.06 - Ver 10.12.1 Modify