diff --git a/INT69DB_2A/Controls/ControlMainDisplay2.cs b/INT69DB_2A/Controls/ControlMainDisplay2.cs index 51cb377..3a69e9b 100644 --- a/INT69DB_2A/Controls/ControlMainDisplay2.cs +++ b/INT69DB_2A/Controls/ControlMainDisplay2.cs @@ -165,6 +165,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleProgressBar() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph10.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph10.cs index 792f854..1eacfda 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph10.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph10.cs @@ -224,6 +224,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph2.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph2.cs index 93bab99..3b3d1cd 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph2.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph2.cs @@ -112,6 +112,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph3.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph3.cs index 2de44de..f558449 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph3.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph3.cs @@ -126,6 +126,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph4.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph4.cs index f7d90ea..57cd28f 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph4.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph4.cs @@ -140,6 +140,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph5.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph5.cs index 3d421d7..305a41e 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph5.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph5.cs @@ -154,6 +154,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph6.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph6.cs index 8e29dbf..abad9aa 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph6.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph6.cs @@ -168,6 +168,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph7.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph7.cs index 4d68c94..f9bf975 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph7.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph7.cs @@ -182,6 +182,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph8.cs b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph8.cs index a764229..68c688b 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph8.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayEachBarGraph8.cs @@ -196,6 +196,7 @@ namespace INT69DB_2A.Controls #endregion this.ParentForm.SetTotalCount(); + this.ParentForm.SetNGCount(); } public void RescaleControl() diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable10.cs b/INT69DB_2A/Controls/ControlMainDisplayTable10.cs index 6b5727e..99c5eb8 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable10.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable10.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -283,28 +284,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 14, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -319,135 +333,135 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].WeightTenAverage()); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].WeightTotalAverage()); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].WeightTenAverage()); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].WeightTotalAverage()); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1); - this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2); - this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3); - this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4); - this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5); - this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6); - this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7); - this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8); - this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9); - this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10); - this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].WeightTenAverage()); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].WeightTotalAverage()); + this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, this.CollectionWeightStorageItem[8].Grade1); + this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, this.CollectionWeightStorageItem[8].Grade2); + this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, this.CollectionWeightStorageItem[8].Grade3); + this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, this.CollectionWeightStorageItem[8].Grade4); + this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, this.CollectionWeightStorageItem[8].Grade5); + this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, this.CollectionWeightStorageItem[8].Grade6); + this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, this.CollectionWeightStorageItem[8].Grade7); + this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, this.CollectionWeightStorageItem[8].Grade8); + this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, this.CollectionWeightStorageItem[8].Grade9); + this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, this.CollectionWeightStorageItem[8].Grade10); + this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1); - this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2); - this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3); - this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4); - this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5); - this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6); - this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7); - this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8); - this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9); - this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10); - this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].WeightTenAverage()); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].WeightTotalAverage()); + this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, this.CollectionWeightStorageItem[9].Grade1); + this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, this.CollectionWeightStorageItem[9].Grade2); + this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, this.CollectionWeightStorageItem[9].Grade3); + this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, this.CollectionWeightStorageItem[9].Grade4); + this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, this.CollectionWeightStorageItem[9].Grade5); + this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, this.CollectionWeightStorageItem[9].Grade6); + this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, this.CollectionWeightStorageItem[9].Grade7); + this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, this.CollectionWeightStorageItem[9].Grade8); + this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, this.CollectionWeightStorageItem[9].Grade9); + this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, this.CollectionWeightStorageItem[9].Grade10); + this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -507,20 +521,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -529,20 +543,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -551,20 +565,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[2].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -573,20 +587,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[3].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -595,20 +609,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[4].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -617,20 +631,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[5].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -639,20 +653,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[6].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[6].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].WeightTenAverage()); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].WeightTotalAverage()); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { @@ -661,20 +675,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[7].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[7].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].WeightTenAverage()); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].WeightTotalAverage()); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay9(DataStore.EquipmentStatus status, WeightData weightData) { @@ -683,20 +697,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[8].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[8].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1); - this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2); - this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3); - this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4); - this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5); - this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6); - this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7); - this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8); - this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9); - this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10); - this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].WeightTenAverage()); - this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].WeightTotalAverage()); + this.SetLabelText(this.label9Col1Row, this.CollectionWeightStorageItem[8].Weight1, this.CollectionWeightStorageItem[8].Grade1); + this.SetLabelText(this.label9Col2Row, this.CollectionWeightStorageItem[8].Weight2, this.CollectionWeightStorageItem[8].Grade2); + this.SetLabelText(this.label9Col3Row, this.CollectionWeightStorageItem[8].Weight3, this.CollectionWeightStorageItem[8].Grade3); + this.SetLabelText(this.label9Col4Row, this.CollectionWeightStorageItem[8].Weight4, this.CollectionWeightStorageItem[8].Grade4); + this.SetLabelText(this.label9Col5Row, this.CollectionWeightStorageItem[8].Weight5, this.CollectionWeightStorageItem[8].Grade5); + this.SetLabelText(this.label9Col6Row, this.CollectionWeightStorageItem[8].Weight6, this.CollectionWeightStorageItem[8].Grade6); + this.SetLabelText(this.label9Col7Row, this.CollectionWeightStorageItem[8].Weight7, this.CollectionWeightStorageItem[8].Grade7); + this.SetLabelText(this.label9Col8Row, this.CollectionWeightStorageItem[8].Weight8, this.CollectionWeightStorageItem[8].Grade8); + this.SetLabelText(this.label9Col9Row, this.CollectionWeightStorageItem[8].Weight9, this.CollectionWeightStorageItem[8].Grade9); + this.SetLabelText(this.label9Col10Row, this.CollectionWeightStorageItem[8].Weight10, this.CollectionWeightStorageItem[8].Grade10); + this.SetLabelText(this.label9Col5Avg, this.CollectionWeightStorageItem[8].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label9AllAvg, this.CollectionWeightStorageItem[8].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay10(DataStore.EquipmentStatus status, WeightData weightData) { @@ -705,20 +719,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[9].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[9].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1); - this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2); - this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3); - this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4); - this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5); - this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6); - this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7); - this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8); - this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9); - this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10); - this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].WeightTenAverage()); - this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].WeightTotalAverage()); + this.SetLabelText(this.label10Col1Row, this.CollectionWeightStorageItem[9].Weight1, this.CollectionWeightStorageItem[9].Grade1); + this.SetLabelText(this.label10Col2Row, this.CollectionWeightStorageItem[9].Weight2, this.CollectionWeightStorageItem[9].Grade2); + this.SetLabelText(this.label10Col3Row, this.CollectionWeightStorageItem[9].Weight3, this.CollectionWeightStorageItem[9].Grade3); + this.SetLabelText(this.label10Col4Row, this.CollectionWeightStorageItem[9].Weight4, this.CollectionWeightStorageItem[9].Grade4); + this.SetLabelText(this.label10Col5Row, this.CollectionWeightStorageItem[9].Weight5, this.CollectionWeightStorageItem[9].Grade5); + this.SetLabelText(this.label10Col6Row, this.CollectionWeightStorageItem[9].Weight6, this.CollectionWeightStorageItem[9].Grade6); + this.SetLabelText(this.label10Col7Row, this.CollectionWeightStorageItem[9].Weight7, this.CollectionWeightStorageItem[9].Grade7); + this.SetLabelText(this.label10Col8Row, this.CollectionWeightStorageItem[9].Weight8, this.CollectionWeightStorageItem[9].Grade8); + this.SetLabelText(this.label10Col9Row, this.CollectionWeightStorageItem[9].Weight9, this.CollectionWeightStorageItem[9].Grade9); + this.SetLabelText(this.label10Col10Row, this.CollectionWeightStorageItem[9].Weight10, this.CollectionWeightStorageItem[9].Grade10); + this.SetLabelText(this.label10Col5Avg, this.CollectionWeightStorageItem[9].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label10AllAvg, this.CollectionWeightStorageItem[9].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable2.cs b/INT69DB_2A/Controls/ControlMainDisplayTable2.cs index 06122d6..ec97f6c 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable2.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable2.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -122,28 +123,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -158,31 +172,31 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -234,20 +248,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -256,20 +270,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable3.cs b/INT69DB_2A/Controls/ControlMainDisplayTable3.cs index 471d6b2..fc9be44 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable3.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable3.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -144,28 +145,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -180,44 +194,44 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -270,20 +284,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -292,20 +306,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -314,20 +328,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[2].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable4.cs b/INT69DB_2A/Controls/ControlMainDisplayTable4.cs index d113937..cbe82b8 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable4.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable4.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -163,28 +164,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -199,57 +213,57 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -303,20 +317,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -325,20 +339,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -347,20 +361,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[2].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -369,20 +383,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[3].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable5.cs b/INT69DB_2A/Controls/ControlMainDisplayTable5.cs index 91f717c..c93b10a 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable5.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable5.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -182,28 +183,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -218,70 +232,70 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -336,20 +350,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -358,20 +372,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -380,20 +394,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[2].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -402,20 +416,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[3].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -424,20 +438,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[4].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable6.cs b/INT69DB_2A/Controls/ControlMainDisplayTable6.cs index d76c905..6c8c4b2 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable6.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable6.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -203,28 +204,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 16, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -239,83 +253,83 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -371,20 +385,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -393,20 +407,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -415,20 +429,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[2].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -437,20 +451,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[3].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -459,20 +473,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[4].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -481,20 +495,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[5].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable7.cs b/INT69DB_2A/Controls/ControlMainDisplayTable7.cs index 60986b8..9743175 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable7.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable7.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -223,28 +224,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 14, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -259,96 +273,96 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].WeightTenAverage()); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].WeightTotalAverage()); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -405,20 +419,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -427,20 +441,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -449,20 +463,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[2].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -471,20 +485,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[3].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -493,20 +507,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[4].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -515,20 +529,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[5].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -537,20 +551,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[6].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[6].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].WeightTenAverage()); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].WeightTotalAverage()); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/Controls/ControlMainDisplayTable8.cs b/INT69DB_2A/Controls/ControlMainDisplayTable8.cs index 6fc70aa..8d6eae2 100644 --- a/INT69DB_2A/Controls/ControlMainDisplayTable8.cs +++ b/INT69DB_2A/Controls/ControlMainDisplayTable8.cs @@ -21,6 +21,7 @@ namespace INT69DB_2A.Controls private Color WeightOverColor = Color.Red; private Color WeightStandardColor = Color.Black; private Color WeightUnderColor = Color.Red; + private Color WeightExNGColor = Color.Blue; private Collection CollectionPictureBoxZero; private Collection CollectionPictureBoxBypass; @@ -243,28 +244,41 @@ namespace INT69DB_2A.Controls { label.Font = new Font("Tahoma", 14, FontStyle.Bold); } - private void SetLabelText(SmartLabel label, double value) + private void SetLabelText(SmartLabel label, double value, DataStore.JudgmentStatus judge) { string sValue = ""; + Color labelColor = Color.Black; - if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightUnderColor) - label.ForeColor = this.WeightUnderColor; - } - else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) - { - if (label.ForeColor != this.WeightOverColor) - label.ForeColor = this.WeightOverColor; - } + //if (value < Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.UnderRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightUnderColor) + // label.ForeColor = this.WeightUnderColor; + //} + //else if (value > Helper.StringToWeight(this.ParentForm.ParentForm.CurrentProductItem.OverRange, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces)) + //{ + // if (label.ForeColor != this.WeightOverColor) + // label.ForeColor = this.WeightOverColor; + //} + //else + //{ + // if (label.ForeColor != this.WeightStandardColor) + // label.ForeColor = 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 - { - if (label.ForeColor != this.WeightStandardColor) - label.ForeColor = this.WeightStandardColor; - } + labelColor = this.WeightStandardColor; sValue = Helper.DoubleToString(value, this.ParentForm.ParentForm.SystemConfig.DecimalPlaces); + if (label.ForeColor != labelColor) + label.ForeColor = labelColor; + if (label.Text != sValue) label.Text = sValue; } @@ -279,109 +293,109 @@ namespace INT69DB_2A.Controls private void UpdateLabelDisplay() { - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].WeightTenAverage()); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].WeightTotalAverage()); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].WeightTenAverage()); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].WeightTotalAverage()); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateEquipmentStatusDisplay(DataStore.EquipmentStatus status) @@ -439,20 +453,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[0].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[0].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1); - this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2); - this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3); - this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4); - this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5); - this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6); - this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7); - this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8); - this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9); - this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10); - this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].WeightTenAverage()); - this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].WeightTotalAverage()); + this.SetLabelText(this.label1Col1Row, this.CollectionWeightStorageItem[0].Weight1, this.CollectionWeightStorageItem[0].Grade1); + this.SetLabelText(this.label1Col2Row, this.CollectionWeightStorageItem[0].Weight2, this.CollectionWeightStorageItem[0].Grade2); + this.SetLabelText(this.label1Col3Row, this.CollectionWeightStorageItem[0].Weight3, this.CollectionWeightStorageItem[0].Grade3); + this.SetLabelText(this.label1Col4Row, this.CollectionWeightStorageItem[0].Weight4, this.CollectionWeightStorageItem[0].Grade4); + this.SetLabelText(this.label1Col5Row, this.CollectionWeightStorageItem[0].Weight5, this.CollectionWeightStorageItem[0].Grade5); + this.SetLabelText(this.label1Col6Row, this.CollectionWeightStorageItem[0].Weight6, this.CollectionWeightStorageItem[0].Grade6); + this.SetLabelText(this.label1Col7Row, this.CollectionWeightStorageItem[0].Weight7, this.CollectionWeightStorageItem[0].Grade7); + this.SetLabelText(this.label1Col8Row, this.CollectionWeightStorageItem[0].Weight8, this.CollectionWeightStorageItem[0].Grade8); + this.SetLabelText(this.label1Col9Row, this.CollectionWeightStorageItem[0].Weight9, this.CollectionWeightStorageItem[0].Grade9); + this.SetLabelText(this.label1Col10Row, this.CollectionWeightStorageItem[0].Weight10, this.CollectionWeightStorageItem[0].Grade10); + this.SetLabelText(this.label1Col5Avg, this.CollectionWeightStorageItem[0].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label1AllAvg, this.CollectionWeightStorageItem[0].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -461,20 +475,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[1].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[1].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1); - this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2); - this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3); - this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4); - this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5); - this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6); - this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7); - this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8); - this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9); - this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10); - this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].WeightTenAverage()); - this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].WeightTotalAverage()); + this.SetLabelText(this.label2Col1Row, this.CollectionWeightStorageItem[1].Weight1, this.CollectionWeightStorageItem[1].Grade1); + this.SetLabelText(this.label2Col2Row, this.CollectionWeightStorageItem[1].Weight2, this.CollectionWeightStorageItem[1].Grade2); + this.SetLabelText(this.label2Col3Row, this.CollectionWeightStorageItem[1].Weight3, this.CollectionWeightStorageItem[1].Grade3); + this.SetLabelText(this.label2Col4Row, this.CollectionWeightStorageItem[1].Weight4, this.CollectionWeightStorageItem[1].Grade4); + this.SetLabelText(this.label2Col5Row, this.CollectionWeightStorageItem[1].Weight5, this.CollectionWeightStorageItem[1].Grade5); + this.SetLabelText(this.label2Col6Row, this.CollectionWeightStorageItem[1].Weight6, this.CollectionWeightStorageItem[1].Grade6); + this.SetLabelText(this.label2Col7Row, this.CollectionWeightStorageItem[1].Weight7, this.CollectionWeightStorageItem[1].Grade7); + this.SetLabelText(this.label2Col8Row, this.CollectionWeightStorageItem[1].Weight8, this.CollectionWeightStorageItem[1].Grade8); + this.SetLabelText(this.label2Col9Row, this.CollectionWeightStorageItem[1].Weight9, this.CollectionWeightStorageItem[1].Grade9); + this.SetLabelText(this.label2Col10Row, this.CollectionWeightStorageItem[1].Weight10, this.CollectionWeightStorageItem[1].Grade10); + this.SetLabelText(this.label2Col5Avg, this.CollectionWeightStorageItem[1].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label2AllAvg, this.CollectionWeightStorageItem[1].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -483,20 +497,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[2].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[2].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1); - this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2); - this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3); - this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4); - this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5); - this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6); - this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7); - this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8); - this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9); - this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10); - this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].WeightTenAverage()); - this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].WeightTotalAverage()); + this.SetLabelText(this.label3Col1Row, this.CollectionWeightStorageItem[2].Weight1, this.CollectionWeightStorageItem[2].Grade1); + this.SetLabelText(this.label3Col2Row, this.CollectionWeightStorageItem[2].Weight2, this.CollectionWeightStorageItem[2].Grade2); + this.SetLabelText(this.label3Col3Row, this.CollectionWeightStorageItem[2].Weight3, this.CollectionWeightStorageItem[2].Grade3); + this.SetLabelText(this.label3Col4Row, this.CollectionWeightStorageItem[2].Weight4, this.CollectionWeightStorageItem[2].Grade4); + this.SetLabelText(this.label3Col5Row, this.CollectionWeightStorageItem[2].Weight5, this.CollectionWeightStorageItem[2].Grade5); + this.SetLabelText(this.label3Col6Row, this.CollectionWeightStorageItem[2].Weight6, this.CollectionWeightStorageItem[2].Grade6); + this.SetLabelText(this.label3Col7Row, this.CollectionWeightStorageItem[2].Weight7, this.CollectionWeightStorageItem[2].Grade7); + this.SetLabelText(this.label3Col8Row, this.CollectionWeightStorageItem[2].Weight8, this.CollectionWeightStorageItem[2].Grade8); + this.SetLabelText(this.label3Col9Row, this.CollectionWeightStorageItem[2].Weight9, this.CollectionWeightStorageItem[2].Grade9); + this.SetLabelText(this.label3Col10Row, this.CollectionWeightStorageItem[2].Weight10, this.CollectionWeightStorageItem[2].Grade10); + this.SetLabelText(this.label3Col5Avg, this.CollectionWeightStorageItem[2].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label3AllAvg, this.CollectionWeightStorageItem[2].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -505,20 +519,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[3].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[3].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1); - this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2); - this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3); - this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4); - this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5); - this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6); - this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7); - this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8); - this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9); - this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10); - this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].WeightTenAverage()); - this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].WeightTotalAverage()); + this.SetLabelText(this.label4Col1Row, this.CollectionWeightStorageItem[3].Weight1, this.CollectionWeightStorageItem[3].Grade1); + this.SetLabelText(this.label4Col2Row, this.CollectionWeightStorageItem[3].Weight2, this.CollectionWeightStorageItem[3].Grade2); + this.SetLabelText(this.label4Col3Row, this.CollectionWeightStorageItem[3].Weight3, this.CollectionWeightStorageItem[3].Grade3); + this.SetLabelText(this.label4Col4Row, this.CollectionWeightStorageItem[3].Weight4, this.CollectionWeightStorageItem[3].Grade4); + this.SetLabelText(this.label4Col5Row, this.CollectionWeightStorageItem[3].Weight5, this.CollectionWeightStorageItem[3].Grade5); + this.SetLabelText(this.label4Col6Row, this.CollectionWeightStorageItem[3].Weight6, this.CollectionWeightStorageItem[3].Grade6); + this.SetLabelText(this.label4Col7Row, this.CollectionWeightStorageItem[3].Weight7, this.CollectionWeightStorageItem[3].Grade7); + this.SetLabelText(this.label4Col8Row, this.CollectionWeightStorageItem[3].Weight8, this.CollectionWeightStorageItem[3].Grade8); + this.SetLabelText(this.label4Col9Row, this.CollectionWeightStorageItem[3].Weight9, this.CollectionWeightStorageItem[3].Grade9); + this.SetLabelText(this.label4Col10Row, this.CollectionWeightStorageItem[3].Weight10, this.CollectionWeightStorageItem[3].Grade10); + this.SetLabelText(this.label4Col5Avg, this.CollectionWeightStorageItem[3].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label4AllAvg, this.CollectionWeightStorageItem[3].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -527,20 +541,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[4].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[4].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1); - this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2); - this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3); - this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4); - this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5); - this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6); - this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7); - this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8); - this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9); - this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10); - this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].WeightTenAverage()); - this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].WeightTotalAverage()); + this.SetLabelText(this.label5Col1Row, this.CollectionWeightStorageItem[4].Weight1, this.CollectionWeightStorageItem[4].Grade1); + this.SetLabelText(this.label5Col2Row, this.CollectionWeightStorageItem[4].Weight2, this.CollectionWeightStorageItem[4].Grade2); + this.SetLabelText(this.label5Col3Row, this.CollectionWeightStorageItem[4].Weight3, this.CollectionWeightStorageItem[4].Grade3); + this.SetLabelText(this.label5Col4Row, this.CollectionWeightStorageItem[4].Weight4, this.CollectionWeightStorageItem[4].Grade4); + this.SetLabelText(this.label5Col5Row, this.CollectionWeightStorageItem[4].Weight5, this.CollectionWeightStorageItem[4].Grade5); + this.SetLabelText(this.label5Col6Row, this.CollectionWeightStorageItem[4].Weight6, this.CollectionWeightStorageItem[4].Grade6); + this.SetLabelText(this.label5Col7Row, this.CollectionWeightStorageItem[4].Weight7, this.CollectionWeightStorageItem[4].Grade7); + this.SetLabelText(this.label5Col8Row, this.CollectionWeightStorageItem[4].Weight8, this.CollectionWeightStorageItem[4].Grade8); + this.SetLabelText(this.label5Col9Row, this.CollectionWeightStorageItem[4].Weight9, this.CollectionWeightStorageItem[4].Grade9); + this.SetLabelText(this.label5Col10Row, this.CollectionWeightStorageItem[4].Weight10, this.CollectionWeightStorageItem[4].Grade10); + this.SetLabelText(this.label5Col5Avg, this.CollectionWeightStorageItem[4].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label5AllAvg, this.CollectionWeightStorageItem[4].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -549,20 +563,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[5].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[5].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1); - this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2); - this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3); - this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4); - this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5); - this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6); - this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7); - this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8); - this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9); - this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10); - this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].WeightTenAverage()); - this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].WeightTotalAverage()); + this.SetLabelText(this.label6Col1Row, this.CollectionWeightStorageItem[5].Weight1, this.CollectionWeightStorageItem[5].Grade1); + this.SetLabelText(this.label6Col2Row, this.CollectionWeightStorageItem[5].Weight2, this.CollectionWeightStorageItem[5].Grade2); + this.SetLabelText(this.label6Col3Row, this.CollectionWeightStorageItem[5].Weight3, this.CollectionWeightStorageItem[5].Grade3); + this.SetLabelText(this.label6Col4Row, this.CollectionWeightStorageItem[5].Weight4, this.CollectionWeightStorageItem[5].Grade4); + this.SetLabelText(this.label6Col5Row, this.CollectionWeightStorageItem[5].Weight5, this.CollectionWeightStorageItem[5].Grade5); + this.SetLabelText(this.label6Col6Row, this.CollectionWeightStorageItem[5].Weight6, this.CollectionWeightStorageItem[5].Grade6); + this.SetLabelText(this.label6Col7Row, this.CollectionWeightStorageItem[5].Weight7, this.CollectionWeightStorageItem[5].Grade7); + this.SetLabelText(this.label6Col8Row, this.CollectionWeightStorageItem[5].Weight8, this.CollectionWeightStorageItem[5].Grade8); + this.SetLabelText(this.label6Col9Row, this.CollectionWeightStorageItem[5].Weight9, this.CollectionWeightStorageItem[5].Grade9); + this.SetLabelText(this.label6Col10Row, this.CollectionWeightStorageItem[5].Weight10, this.CollectionWeightStorageItem[5].Grade10); + this.SetLabelText(this.label6Col5Avg, this.CollectionWeightStorageItem[5].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label6AllAvg, this.CollectionWeightStorageItem[5].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -571,20 +585,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[6].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[6].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1); - this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2); - this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3); - this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4); - this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5); - this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6); - this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7); - this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8); - this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9); - this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10); - this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].WeightTenAverage()); - this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].WeightTotalAverage()); + this.SetLabelText(this.label7Col1Row, this.CollectionWeightStorageItem[6].Weight1, this.CollectionWeightStorageItem[6].Grade1); + this.SetLabelText(this.label7Col2Row, this.CollectionWeightStorageItem[6].Weight2, this.CollectionWeightStorageItem[6].Grade2); + this.SetLabelText(this.label7Col3Row, this.CollectionWeightStorageItem[6].Weight3, this.CollectionWeightStorageItem[6].Grade3); + this.SetLabelText(this.label7Col4Row, this.CollectionWeightStorageItem[6].Weight4, this.CollectionWeightStorageItem[6].Grade4); + this.SetLabelText(this.label7Col5Row, this.CollectionWeightStorageItem[6].Weight5, this.CollectionWeightStorageItem[6].Grade5); + this.SetLabelText(this.label7Col6Row, this.CollectionWeightStorageItem[6].Weight6, this.CollectionWeightStorageItem[6].Grade6); + this.SetLabelText(this.label7Col7Row, this.CollectionWeightStorageItem[6].Weight7, this.CollectionWeightStorageItem[6].Grade7); + this.SetLabelText(this.label7Col8Row, this.CollectionWeightStorageItem[6].Weight8, this.CollectionWeightStorageItem[6].Grade8); + this.SetLabelText(this.label7Col9Row, this.CollectionWeightStorageItem[6].Weight9, this.CollectionWeightStorageItem[6].Grade9); + this.SetLabelText(this.label7Col10Row, this.CollectionWeightStorageItem[6].Weight10, this.CollectionWeightStorageItem[6].Grade10); + this.SetLabelText(this.label7Col5Avg, this.CollectionWeightStorageItem[6].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label7AllAvg, this.CollectionWeightStorageItem[6].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { @@ -593,20 +607,20 @@ namespace INT69DB_2A.Controls if (weightData.JudgmentStatus == DataStore.JudgmentStatus.Empty) return; - this.CollectionWeightStorageItem[7].SetValue(weightData.Weight); + this.CollectionWeightStorageItem[7].SetValue(weightData.Weight, weightData.JudgmentStatus); - this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1); - this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2); - this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3); - this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4); - this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5); - this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6); - this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7); - this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8); - this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9); - this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10); - this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].WeightTenAverage()); - this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].WeightTotalAverage()); + this.SetLabelText(this.label8Col1Row, this.CollectionWeightStorageItem[7].Weight1, this.CollectionWeightStorageItem[7].Grade1); + this.SetLabelText(this.label8Col2Row, this.CollectionWeightStorageItem[7].Weight2, this.CollectionWeightStorageItem[7].Grade2); + this.SetLabelText(this.label8Col3Row, this.CollectionWeightStorageItem[7].Weight3, this.CollectionWeightStorageItem[7].Grade3); + this.SetLabelText(this.label8Col4Row, this.CollectionWeightStorageItem[7].Weight4, this.CollectionWeightStorageItem[7].Grade4); + this.SetLabelText(this.label8Col5Row, this.CollectionWeightStorageItem[7].Weight5, this.CollectionWeightStorageItem[7].Grade5); + this.SetLabelText(this.label8Col6Row, this.CollectionWeightStorageItem[7].Weight6, this.CollectionWeightStorageItem[7].Grade6); + this.SetLabelText(this.label8Col7Row, this.CollectionWeightStorageItem[7].Weight7, this.CollectionWeightStorageItem[7].Grade7); + this.SetLabelText(this.label8Col8Row, this.CollectionWeightStorageItem[7].Weight8, this.CollectionWeightStorageItem[7].Grade8); + this.SetLabelText(this.label8Col9Row, this.CollectionWeightStorageItem[7].Weight9, this.CollectionWeightStorageItem[7].Grade9); + this.SetLabelText(this.label8Col10Row, this.CollectionWeightStorageItem[7].Weight10, this.CollectionWeightStorageItem[7].Grade10); + this.SetLabelText(this.label8Col5Avg, this.CollectionWeightStorageItem[7].GetWeightTenAverage(), DataStore.JudgmentStatus.Empty); + this.SetLabelText(this.label8AllAvg, this.CollectionWeightStorageItem[7].GetWeightTotalAverage(), DataStore.JudgmentStatus.Empty); } #endregion } diff --git a/INT69DB_2A/DataStore.cs b/INT69DB_2A/DataStore.cs index d56401d..940f694 100644 --- a/INT69DB_2A/DataStore.cs +++ b/INT69DB_2A/DataStore.cs @@ -2677,7 +2677,7 @@ namespace INT69DB_2A #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; @@ -2687,6 +2687,20 @@ namespace INT69DB_2A 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; #endregion #region Constructor @@ -2695,6 +2709,9 @@ namespace INT69DB_2A this.TotalCount = 0; this.TotalSum = 0.0; + this.TotalPassCount = 0; + this.TotalPassSum = 0.0; + this.Weight1 = 0.0; this.Weight2 = 0.0; this.Weight3 = 0.0; @@ -2714,76 +2731,128 @@ namespace INT69DB_2A get { return this.m_Weight1; } set { this.m_Weight1 = value; } } - public double Weight2 { get { return this.m_Weight2; } set { this.m_Weight2 = value; } } - 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 { get { return this.m_Weight4; } set { this.m_Weight4 = value; } } - public double Weight5 { get { return this.m_Weight5; } set { this.m_Weight5 = value; } } - public double Weight6 { get { return this.m_Weight6; } set { this.m_Weight6 = value; } } - public double Weight7 { get { return this.m_Weight7; } set { this.m_Weight7 = value; } } - public double Weight8 { get { return this.m_Weight8; } set { this.m_Weight8 = value; } } - public double Weight9 { get { return this.m_Weight9; } set { this.m_Weight9 = value; } } - public double Weight10 { get { return this.m_Weight10; } set { this.m_Weight10 = value; } } - public double TotalSum { get { return this.m_TotalSum; } 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; } private set { this.m_TotalCount = value; } } + + public double TotalPassSum + { + get { return this.m_TotalPassSum; } + set { this.m_TotalPassSum = value; } + } + public int TotalPassCount + { + get { return this.m_TotalPassCount; } + set { this.m_TotalPassCount = value; } + } #endregion #region Method - public double WeightTenSum() + public double GetWeightTenSum() { if (this.TotalCount < 10) return 0.0; @@ -2791,22 +2860,38 @@ namespace INT69DB_2A return this.Weight1 + this.Weight2 + this.Weight3 + this.Weight4 + this.Weight5 + this.Weight6 + this.Weight7 + this.Weight8 + this.Weight9 + this.Weight10; } - - public double WeightTenAverage() + public double GetWeightTenAverage() { - return this.WeightTenSum() / 10; + return this.GetWeightTenSum() / 10; } - - public double WeightTotalAverage() + public double GetWeightTotalAverage() { if (this.TotalCount == 0) return 0.0; return this.TotalSum / this.TotalCount; } - - public void SetValue(double value) + public double GetWeightTotalPassAverage() { + if (this.TotalPassSum == 0) + return 0.0; + + return this.TotalPassSum / this.TotalPassCount; + } + + 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; @@ -2820,6 +2905,12 @@ namespace INT69DB_2A this.TotalCount++; this.TotalSum = this.TotalSum + value; + + if (status == DataStore.JudgmentStatus.Pass) + { + this.TotalPassCount++; + this.TotalPassSum = this.TotalPassSum + value; + } } public void AllClear() @@ -2837,6 +2928,20 @@ namespace INT69DB_2A 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; } #endregion } diff --git a/INT69DB_2A/DialogForms/DialogFormLogOn.cs b/INT69DB_2A/DialogForms/DialogFormLogOn.cs index c3d1fd2..e5fab93 100644 --- a/INT69DB_2A/DialogForms/DialogFormLogOn.cs +++ b/INT69DB_2A/DialogForms/DialogFormLogOn.cs @@ -47,6 +47,74 @@ namespace INT69DB_2A.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(); @@ -126,7 +194,7 @@ namespace INT69DB_2A.DialogForms if (this.ParentForm.SystemConfig.Language == DataStore.LanguageID.Korean) { this.labelTitle1.Text = "비밀번호 변경"; - this.labelTitle2.Text = "변경할 비밀번호"; + this.labelTitle2.Text = "새 비밀번호"; this.labelTitle3.Text = "비밀번호 확인"; } else @@ -158,6 +226,9 @@ namespace INT69DB_2A.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(); @@ -166,6 +237,9 @@ namespace INT69DB_2A.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(); @@ -173,6 +247,18 @@ namespace INT69DB_2A.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) @@ -213,11 +299,17 @@ namespace INT69DB_2A.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; @@ -231,10 +323,18 @@ namespace INT69DB_2A.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() @@ -245,6 +345,9 @@ namespace INT69DB_2A.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(); @@ -253,6 +356,9 @@ namespace INT69DB_2A.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(); @@ -261,6 +367,9 @@ namespace INT69DB_2A.DialogForms } 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(); @@ -328,17 +437,26 @@ namespace INT69DB_2A.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"); + // 비밀번호 변경 실패 시 메시지?? DialogFormMessage myMsg = new DialogFormMessage(null, ret, this.ParentForm.SystemConfig.Language); myMsg.ShowDialog(); diff --git a/INT69DB_2A/Forms/FormCommunication.cs b/INT69DB_2A/Forms/FormCommunication.cs index 6a018d9..801f544 100644 --- a/INT69DB_2A/Forms/FormCommunication.cs +++ b/INT69DB_2A/Forms/FormCommunication.cs @@ -333,30 +333,30 @@ namespace INT69DB_2A.Forms if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f1_OPT1) { if (this.ParentForm.SystemConfig.EquipmentMode == 1) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(this.ParentForm.CollectionWeightData)); + data = this.ParentForm.Protocol_OPT1(this.ParentForm.CollectionWeightData); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(1, this.ParentForm.CollectionWeightData[0])); + data = this.ParentForm.Protocol_OPT1(1, this.ParentForm.CollectionWeightData[0]); } else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f2_OPT2) { if (this.ParentForm.SystemConfig.EquipmentMode == 1) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(this.ParentForm.CollectionWeightData)); + data = this.ParentForm.Protocol_OPT2(this.ParentForm.CollectionWeightData); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(1, this.ParentForm.CollectionWeightData[0])); + data = this.ParentForm.Protocol_OPT2(1, this.ParentForm.CollectionWeightData[0]); } else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f3_OPT3) { if (this.ParentForm.SystemConfig.EquipmentMode == 1) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(this.ParentForm.CollectionWeightData)); + data = this.ParentForm.Protocol_OPT3(this.ParentForm.CollectionWeightData); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(1, this.ParentForm.CollectionWeightData[0])); + data = this.ParentForm.Protocol_OPT3(1, this.ParentForm.CollectionWeightData[0]); } else if (this.ParentForm.SystemConfig.EthernetMode == (int)DataStore.EthernetMode.f5_OPT4) { if (this.ParentForm.SystemConfig.EquipmentMode == 1) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(this.ParentForm.CollectionWeightData)); + data = this.ParentForm.Protocol_OPT4(this.ParentForm.CollectionWeightData); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0])); + data = this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0]); } switch (this.ParentForm.SystemConfig.EthernetOperationMode) @@ -1516,23 +1516,23 @@ namespace INT69DB_2A.Forms if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f1_OPT1) { if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(this.ParentForm.CollectionWeightData)); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1_NotStxEtx(this.ParentForm.CollectionWeightData)); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1(1, this.ParentForm.CollectionWeightData[0])); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT1_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); } else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f2_OPT2) { if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(this.ParentForm.CollectionWeightData)); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2_NotStxEtx(this.ParentForm.CollectionWeightData)); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2(1, this.ParentForm.CollectionWeightData[0])); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT2_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); } else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f3_OPT3) { if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(this.ParentForm.CollectionWeightData)); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3_NotStxEtx(this.ParentForm.CollectionWeightData)); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3(1, this.ParentForm.CollectionWeightData[0])); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT3_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); } else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f4_Printer) { @@ -1544,9 +1544,9 @@ namespace INT69DB_2A.Forms else if (this.ParentForm.SystemConfig.Serial3Mode == (int)DataStore.SerialMode.f5_OPT4) { if (this.ParentForm.SystemConfig.EquipmentMode == 1 || this.ParentForm.SystemConfig.EquipmentMode == 3) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(this.ParentForm.CollectionWeightData)); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4_NotStxEtx(this.ParentForm.CollectionWeightData)); else if (this.ParentForm.SystemConfig.EquipmentMode == 2) - this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4(1, this.ParentForm.CollectionWeightData[0])); + this.ParentForm.UartCom3Write(this.ParentForm.Protocol_OPT4_NotStxEtx(1, this.ParentForm.CollectionWeightData[0])); } } diff --git a/INT69DB_2A/Forms/FormInformation.cs b/INT69DB_2A/Forms/FormInformation.cs index ee650bc..17a6a43 100644 --- a/INT69DB_2A/Forms/FormInformation.cs +++ b/INT69DB_2A/Forms/FormInformation.cs @@ -107,7 +107,7 @@ namespace INT69DB_2A.Forms } private void DefaultSetting() { - this.labelDisplayVer.Text = "5.0.0"; + this.labelDisplayVer.Text = "5.0.1"; this.labelUserMgerVer.Text = ""; this.labelAes128Ver.Text = ""; this.labelSerialNo.Text = this.ParentForm.SystemConfig.SerialNumber; diff --git a/INT69DB_2A/Forms/FormMain.cs b/INT69DB_2A/Forms/FormMain.cs index 795bad3..8382fce 100644 --- a/INT69DB_2A/Forms/FormMain.cs +++ b/INT69DB_2A/Forms/FormMain.cs @@ -3058,18 +3058,18 @@ namespace INT69DB_2A.Forms // CH3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - this.UartCom3Write(this.Protocol_OPT1(this.CollectionWeightData)); + this.UartCom3Write(this.Protocol_OPT1_NotStxEtx(this.CollectionWeightData)); else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - this.UartCom3Write(this.Protocol_OPT2(this.CollectionWeightData)); + this.UartCom3Write(this.Protocol_OPT2_NotStxEtx(this.CollectionWeightData)); else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - this.UartCom3Write(this.Protocol_OPT3(this.CollectionWeightData)); + this.UartCom3Write(this.Protocol_OPT3_NotStxEtx(this.CollectionWeightData)); else if (this.SystemConfig.Serial3Mode == 4) // Printer { if (this.SystemConfig.IsPrintPerProductEnable == true) this.UartCom3Write(this.Protocol_Printer(this.CollectionWeightData)); } else if (this.SystemConfig.Serial3Mode == 5) // OPT4 - this.UartCom3Write(this.Protocol_OPT4(this.CollectionWeightData)); + this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(this.CollectionWeightData)); } private void TreatSerialCommunication(int lane, WeightData data) { @@ -3078,18 +3078,18 @@ namespace INT69DB_2A.Forms // CH3 if (this.SystemConfig.Serial3Mode == 1) // OPT1 - this.UartCom3Write(this.Protocol_OPT1(lane, data)); + this.UartCom3Write(this.Protocol_OPT1_NotStxEtx(lane, data)); else if (this.SystemConfig.Serial3Mode == 2) // OPT2 - this.UartCom3Write(this.Protocol_OPT2(lane, data)); + this.UartCom3Write(this.Protocol_OPT2_NotStxEtx(lane, data)); else if (this.SystemConfig.Serial3Mode == 3) // OPT3 - this.UartCom3Write(this.Protocol_OPT3(lane, data)); + this.UartCom3Write(this.Protocol_OPT3_NotStxEtx(lane, data)); else if (this.SystemConfig.Serial3Mode == 4) // Printer { if (this.SystemConfig.IsPrintPerProductEnable == true) this.UartCom3Write(this.Protocol_Printer(lane, data)); } else if (this.SystemConfig.Serial3Mode == 5) // OPT4 - this.UartCom3Write(this.Protocol_OPT4(lane, data)); + this.UartCom3Write(this.Protocol_OPT4_NotStxEtx(lane, data)); } #endregion #region Ethernet diff --git a/INT69DB_2A/Forms/FormMainDisplay.Designer.cs b/INT69DB_2A/Forms/FormMainDisplay.Designer.cs index 7889ede..4168bcd 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.Designer.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.Designer.cs @@ -38,8 +38,8 @@ this.labelProductName = new SmartX.SmartLabel(); this.labelNGCount = new SmartX.SmartLabel(); this.labelTotalCount = new SmartX.SmartLabel(); - this.labelStaticTotalCount = new SmartX.SmartLabel(); - this.smartLabel3 = new SmartX.SmartLabel(); + this.labelTitleTotalCount = new SmartX.SmartLabel(); + this.labelTitleNGCount = new SmartX.SmartLabel(); this.pictureBoxCommunicationStatus = new System.Windows.Forms.PictureBox(); this.pictureBoxUSBBackOn = new System.Windows.Forms.PictureBox(); this.pictureBoxStart = new System.Windows.Forms.PictureBox(); @@ -322,6 +322,7 @@ 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.labelNGCount_Click); // // labelTotalCount // @@ -345,48 +346,49 @@ this.labelTotalCount.Wordwrap = false; this.labelTotalCount.Click += new System.EventHandler(this.labelTotalCount_Click); // - // labelStaticTotalCount + // labelTitleTotalCount // - this.labelStaticTotalCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41))))); - this.labelStaticTotalCount.BackPictureBox = this.smartForm1; - this.labelStaticTotalCount.BackPictureBox1 = null; - this.labelStaticTotalCount.BackPictureBox2 = null; - this.labelStaticTotalCount.BorderColor = System.Drawing.Color.Black; - this.labelStaticTotalCount.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.labelStaticTotalCount.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); - this.labelStaticTotalCount.ForeColor = System.Drawing.Color.White; - this.labelStaticTotalCount.InitVisible = true; - this.labelStaticTotalCount.LineSpacing = 0F; - this.labelStaticTotalCount.Location = new System.Drawing.Point(10, 570); - this.labelStaticTotalCount.Name = "labelStaticTotalCount"; - this.labelStaticTotalCount.Size = new System.Drawing.Size(70, 20); - this.labelStaticTotalCount.TabIndex = 182; - this.labelStaticTotalCount.Text = "Total"; - this.labelStaticTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.labelStaticTotalCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.labelStaticTotalCount.Wordwrap = false; - this.labelStaticTotalCount.Click += new System.EventHandler(this.labelTotalCount_Click); + this.labelTitleTotalCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41))))); + this.labelTitleTotalCount.BackPictureBox = this.smartForm1; + this.labelTitleTotalCount.BackPictureBox1 = null; + 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("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleTotalCount.ForeColor = System.Drawing.Color.White; + this.labelTitleTotalCount.InitVisible = true; + this.labelTitleTotalCount.LineSpacing = 0F; + this.labelTitleTotalCount.Location = new System.Drawing.Point(10, 570); + this.labelTitleTotalCount.Name = "labelTitleTotalCount"; + this.labelTitleTotalCount.Size = new System.Drawing.Size(70, 20); + this.labelTitleTotalCount.TabIndex = 182; + this.labelTitleTotalCount.Text = "Total"; + this.labelTitleTotalCount.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; + this.labelTitleTotalCount.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; + this.labelTitleTotalCount.Wordwrap = false; + this.labelTitleTotalCount.Click += new System.EventHandler(this.labelTotalCount_Click); // - // smartLabel3 + // labelTitleNGCount // - this.smartLabel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41))))); - this.smartLabel3.BackPictureBox = this.smartForm1; - this.smartLabel3.BackPictureBox1 = null; - this.smartLabel3.BackPictureBox2 = null; - this.smartLabel3.BorderColor = System.Drawing.Color.Black; - this.smartLabel3.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.smartLabel3.Font = new System.Drawing.Font("새굴림", 12F, System.Drawing.FontStyle.Bold); - this.smartLabel3.ForeColor = System.Drawing.Color.White; - this.smartLabel3.InitVisible = true; - this.smartLabel3.LineSpacing = 0F; - this.smartLabel3.Location = new System.Drawing.Point(212, 570); - this.smartLabel3.Name = "smartLabel3"; - this.smartLabel3.Size = new System.Drawing.Size(50, 20); - this.smartLabel3.TabIndex = 183; - this.smartLabel3.Text = "N G"; - this.smartLabel3.TextHAlign = SmartX.SmartLabel.TextHorAlign.Middle; - this.smartLabel3.TextVAlign = SmartX.SmartLabel.TextVerAlign.Middle; - this.smartLabel3.Wordwrap = false; + this.labelTitleNGCount.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(49)))), ((int)(((byte)(65)))), ((int)(((byte)(41))))); + 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("새굴림", 12F, System.Drawing.FontStyle.Bold); + this.labelTitleNGCount.ForeColor = System.Drawing.Color.White; + this.labelTitleNGCount.InitVisible = true; + this.labelTitleNGCount.LineSpacing = 0F; + this.labelTitleNGCount.Location = new System.Drawing.Point(212, 570); + this.labelTitleNGCount.Name = "labelTitleNGCount"; + this.labelTitleNGCount.Size = new System.Drawing.Size(50, 20); + this.labelTitleNGCount.TabIndex = 183; + 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.labelNGCount_Click); // // pictureBoxCommunicationStatus // @@ -1494,12 +1496,12 @@ this.Controls.Add(this.smartLabel9); this.Controls.Add(this.smartLabel5); this.Controls.Add(this.labelProductionSpeed); - this.Controls.Add(this.smartLabel3); + this.Controls.Add(this.labelTitleNGCount); this.Controls.Add(this.labelNGCount); this.Controls.Add(this.labelTotalCount); this.Controls.Add(this.buttonDotGraphForm); this.Controls.Add(this.buttonTableForm); - this.Controls.Add(this.labelStaticTotalCount); + this.Controls.Add(this.labelTitleTotalCount); this.Controls.Add(this.buttonBarGraphForm); this.Controls.Add(this.labelIconSerial3); this.Controls.Add(this.panelSetting); @@ -1539,8 +1541,8 @@ private SmartX.SmartLabel labelProductName; private SmartX.SmartLabel labelNGCount; private SmartX.SmartLabel labelTotalCount; - private SmartX.SmartLabel labelStaticTotalCount; - private SmartX.SmartLabel smartLabel3; + private SmartX.SmartLabel labelTitleTotalCount; + private SmartX.SmartLabel labelTitleNGCount; public System.Windows.Forms.PictureBox pictureBoxCommunicationStatus; public System.Windows.Forms.PictureBox pictureBoxUSBBackOn; public System.Windows.Forms.PictureBox pictureBoxStart; diff --git a/INT69DB_2A/Forms/FormMainDisplay.cs b/INT69DB_2A/Forms/FormMainDisplay.cs index a6eda39..a02bd4b 100644 --- a/INT69DB_2A/Forms/FormMainDisplay.cs +++ b/INT69DB_2A/Forms/FormMainDisplay.cs @@ -152,8 +152,8 @@ namespace INT69DB_2A.Forms { //this.labelScreen.Text = "屏幕"; - this.labelStaticTotalCount.Text = "总共"; - this.smartLabel3.Text = "不良"; + this.labelTitleTotalCount.Text = "总共"; + this.labelTitleNGCount.Text = "不良"; this.smartLabel5.Text = "速度"; this.labelTitleBypass.Text = "旁路"; @@ -546,10 +546,6 @@ namespace INT69DB_2A.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) { @@ -559,10 +555,6 @@ namespace INT69DB_2A.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(); @@ -1272,18 +1264,17 @@ namespace INT69DB_2A.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 // Total Pass Count - if (this.labelStaticTotalCount.Text == "Pass") + if (this.labelTitleTotalCount.Text == "Pass") { if (this.labelTotalCount.Text != toTalPass.ToString()) this.labelTotalCount.Text = toTalPass.ToString(); @@ -1293,10 +1284,28 @@ namespace INT69DB_2A.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") + { + 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 CallBackUserListLoginTimeoutDataEvent(UserManager.UserMgr_login_timeout_t user) { @@ -1819,6 +1828,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay1(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1902,6 +1912,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay2(DataStore.EquipmentStatus status, WeightData weightData) { @@ -1976,6 +1987,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay3(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2044,6 +2056,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay4(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2106,6 +2119,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay5(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2162,6 +2176,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay6(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2212,6 +2227,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay7(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2256,6 +2272,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay8(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2294,6 +2311,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay9(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2326,6 +2344,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateStartWeightDisplay10(DataStore.EquipmentStatus status, WeightData weightData) { @@ -2358,6 +2377,7 @@ namespace INT69DB_2A.Forms } this.SetTotalCount(); + this.SetNGCount(); } public void UpdateDisplayTime() { @@ -2968,14 +2988,30 @@ namespace INT69DB_2A.Forms lock (this) { - if (this.labelStaticTotalCount.Text != "Total") - this.labelStaticTotalCount.Text = "Total"; + if (this.labelTitleTotalCount.Text != "Total") + this.labelTitleTotalCount.Text = "Total"; else - this.labelStaticTotalCount.Text = "Pass"; + this.labelTitleTotalCount.Text = "Pass"; this.SetTotalCount(); } } + private void labelNGCount_Click(object sender, EventArgs e) + { + // Automatic Logout Reset + if (this.ParentForm.SystemConfig.IsPart11 == true) + this.Part11AutomaticLogoutReset(); + + lock (this) + { + if (this.labelTitleNGCount.Text != "NG") + this.labelTitleNGCount.Text = "NG"; + else + this.labelTitleNGCount.Text = "ExNG"; + + this.SetNGCount(); + } + } private void buttonSubMenu_Click(object sender, EventArgs e) { diff --git a/INT69DB_2A/Forms/FormMenu.cs b/INT69DB_2A/Forms/FormMenu.cs index b08f120..48dede9 100644 --- a/INT69DB_2A/Forms/FormMenu.cs +++ b/INT69DB_2A/Forms/FormMenu.cs @@ -192,7 +192,7 @@ namespace INT69DB_2A.Forms } } - public void UpdateDisplayUser(UserItem user) + public void UpdateDisplayMenuAccess(UserItem user) { string id = "", group = "", expirePW = ""; int expireDate = 0; @@ -490,7 +490,7 @@ namespace INT69DB_2A.Forms if (this.ParentForm.SystemConfig.IsLogin == false) this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.NotLogin; - this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser); + this.UpdateDisplayMenuAccess(this.ParentForm.SystemConfig.CurrentUser); this.ParentForm.TransferData(CommunicationCommand.ModeNormal, CommunicationID.MainBoard); this.ParentForm.SystemConfig.CurrentForm = DataStore.FormStore.FormMenu; } @@ -654,14 +654,22 @@ namespace INT69DB_2A.Forms else if (button == this.buttonOption) { #region 옵션설정 - DialogFormPasswordKeyPad password = new DialogFormPasswordKeyPad(8, this.ParentForm.SystemConfig.Language); - DialogResult dialogResult = password.ShowDialog(); - if (dialogResult == DialogResult.OK) + if (this.ParentForm.SystemConfig.IsPart11 == true && this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer) { - if (this.ParentForm.ChildFormOption != null) + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOption); + this.ParentForm.ChildFormOption.DisplayRefresh(); + } + else + { + DialogFormPasswordKeyPad password = new DialogFormPasswordKeyPad(8, this.ParentForm.SystemConfig.Language); + DialogResult dialogResult = password.ShowDialog(); + if (dialogResult == DialogResult.OK) { - ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOption); - this.ParentForm.ChildFormOption.DisplayRefresh(); + if (this.ParentForm.ChildFormOption != null) + { + ((FormMain)(Owner)).smartForm.Show((int)DataStore.FormStore.FormOption); + this.ParentForm.ChildFormOption.DisplayRefresh(); + } } } #endregion @@ -677,15 +685,18 @@ namespace INT69DB_2A.Forms if (this.ParentForm.SystemConfig.IsLogin == false) { this.ParentForm.SystemConfig.CurrentUser.Group = DataStore.UserGroup.Developer; - this.UpdateDisplayUser(this.ParentForm.SystemConfig.CurrentUser); + this.UpdateDisplayMenuAccess(this.ParentForm.SystemConfig.CurrentUser); } else { - if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Admin) + if (this.ParentForm.SystemConfig.CurrentUser.Group == DataStore.UserGroup.Developer) { - this.buttonEquipment.Visible = true; - this.buttonTest.Visible = true; - this.buttonOption.Visible = true; + if (this.buttonEquipment.Visible != true) + this.buttonEquipment.Visible = true; + if (this.buttonOption.Visible != true) + this.buttonOption.Visible = true; + if (this.buttonTest.Visible != true) + this.buttonTest.Visible = true; } } } diff --git a/INT69DB_2A/Forms/FormUserEditor.Designer.cs b/INT69DB_2A/Forms/FormUserEditor.Designer.cs index a8c8f7d..b36b944 100644 --- a/INT69DB_2A/Forms/FormUserEditor.Designer.cs +++ b/INT69DB_2A/Forms/FormUserEditor.Designer.cs @@ -32,6 +32,7 @@ this.smartForm1 = new SmartX.SmartForm(); this.labelTitle = new SmartX.SmartLabel(); this.smartGroupBox1 = new SmartX.SmartGroupBox(); + this.buttonResetPW = new SmartX.SmartButton(); this.labelAutoLogoutWarning = new SmartX.SmartLabel(); this.comboBoxAccessRight = new System.Windows.Forms.ComboBox(); this.labelAccessRightAdmin = new SmartX.SmartLabel(); @@ -82,7 +83,6 @@ this.buttonNew = new SmartX.SmartButton(); this.buttonBack = new SmartX.SmartButton(); this.buttonGroupEditor = new SmartX.SmartButton(); - this.buttonResetPW = new SmartX.SmartButton(); this.listBoxUserList = new System.Windows.Forms.ListBox(); ((System.ComponentModel.ISupportInitialize)(this.smartForm1)).BeginInit(); this.smartGroupBox1.SuspendLayout(); @@ -167,6 +167,38 @@ this.smartGroupBox1.TabIndex = 427; this.smartGroupBox1.TextColor = System.Drawing.Color.Black; // + // buttonResetPW + // + this.buttonResetPW.BackPictureBox = null; + this.buttonResetPW.BackPictureBox1 = null; + this.buttonResetPW.BackPictureBox2 = null; + this.buttonResetPW.ButtonColor = System.Drawing.Color.Gainsboro; + this.buttonResetPW.ButtonImageAutoSize = true; + this.buttonResetPW.ColorKeySamplePosition = new System.Drawing.Point(0, 0); + this.buttonResetPW.DisableImage = null; + this.buttonResetPW.DownImage = null; + this.buttonResetPW.GroupID = 0; + this.buttonResetPW.InitVisible = true; + this.buttonResetPW.Location = new System.Drawing.Point(485, 35); + this.buttonResetPW.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; + this.buttonResetPW.Name = "buttonResetPW"; + this.buttonResetPW.NestedClickEventPrevent = false; + this.buttonResetPW.OutlinePixel = 1; + this.buttonResetPW.RepeatInterval = 200; + this.buttonResetPW.RepeatIntervalAccelerate = null; + this.buttonResetPW.SafeInterval = 200; + this.buttonResetPW.Size = new System.Drawing.Size(57, 26); + this.buttonResetPW.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; + this.buttonResetPW.TabIndex = 244; + this.buttonResetPW.Text = "Reset"; + this.buttonResetPW.TextColor = System.Drawing.Color.Black; + this.buttonResetPW.TextDownColor = System.Drawing.Color.White; + this.buttonResetPW.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; + this.buttonResetPW.TextLocation = new System.Drawing.Point(0, 0); + this.buttonResetPW.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; + this.buttonResetPW.UpImage = null; + this.buttonResetPW.Click += new System.EventHandler(this.buttonResetPW_Click); + // // labelAutoLogoutWarning // this.labelAutoLogoutWarning.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(30)))), ((int)(((byte)(30))))); @@ -1202,38 +1234,6 @@ this.buttonGroupEditor.UpImage = ((System.Drawing.Image)(resources.GetObject("buttonGroupEditor.UpImage"))); this.buttonGroupEditor.Click += new System.EventHandler(this.buttonGroupEditor_Click); // - // buttonResetPW - // - this.buttonResetPW.BackPictureBox = null; - this.buttonResetPW.BackPictureBox1 = null; - this.buttonResetPW.BackPictureBox2 = null; - this.buttonResetPW.ButtonColor = System.Drawing.Color.Gainsboro; - this.buttonResetPW.ButtonImageAutoSize = true; - this.buttonResetPW.ColorKeySamplePosition = new System.Drawing.Point(0, 0); - this.buttonResetPW.DisableImage = null; - this.buttonResetPW.DownImage = null; - this.buttonResetPW.GroupID = 0; - this.buttonResetPW.InitVisible = true; - this.buttonResetPW.Location = new System.Drawing.Point(485, 35); - this.buttonResetPW.Mode = SmartX.SmartButton.BUTTONMODE.NORMAL; - this.buttonResetPW.Name = "buttonResetPW"; - this.buttonResetPW.NestedClickEventPrevent = false; - this.buttonResetPW.OutlinePixel = 1; - this.buttonResetPW.RepeatInterval = 200; - this.buttonResetPW.RepeatIntervalAccelerate = null; - this.buttonResetPW.SafeInterval = 200; - this.buttonResetPW.Size = new System.Drawing.Size(57, 26); - this.buttonResetPW.SpecialFunction = SmartX.SmartButton.SPECIALFUNC.NONE; - this.buttonResetPW.TabIndex = 244; - this.buttonResetPW.Text = "Reset"; - this.buttonResetPW.TextColor = System.Drawing.Color.Black; - this.buttonResetPW.TextDownColor = System.Drawing.Color.White; - this.buttonResetPW.TextHAlign = SmartX.SmartButton.TextHorAlign.Middle; - this.buttonResetPW.TextLocation = new System.Drawing.Point(0, 0); - this.buttonResetPW.TextVAlign = SmartX.SmartButton.TextVerAlign.Middle; - this.buttonResetPW.UpImage = null; - this.buttonResetPW.Click += new System.EventHandler(this.buttonResetPW_Click); - // // listBoxUserList // this.listBoxUserList.Font = new System.Drawing.Font("새굴림", 15F, System.Drawing.FontStyle.Bold); @@ -1241,6 +1241,7 @@ this.listBoxUserList.Name = "listBoxUserList"; this.listBoxUserList.Size = new System.Drawing.Size(265, 439); this.listBoxUserList.TabIndex = 443; + this.listBoxUserList.SelectedIndexChanged += new System.EventHandler(this.listBoxUserList_SelectedIndexChanged); // // FormUserEditor // diff --git a/INT69DB_2A/Forms/FormUserEditor.cs b/INT69DB_2A/Forms/FormUserEditor.cs index b32f232..c5e0d03 100644 --- a/INT69DB_2A/Forms/FormUserEditor.cs +++ b/INT69DB_2A/Forms/FormUserEditor.cs @@ -145,7 +145,7 @@ namespace INT69DB_2A.Forms } private void SetEnablePassword(bool value) { - value = false; + //value = false; this.labelPassword.Enabled = value; @@ -329,17 +329,7 @@ namespace INT69DB_2A.Forms } private void UserNew() { - this.listBoxUserList.SelectedIndexChanged -= new EventHandler(this.listBoxUserList_SelectedIndexChanged); - this.listBoxUserList.SelectedIndex = -1; - this.listBoxUserList.SelectedIndexChanged += new EventHandler(this.listBoxUserList_SelectedIndexChanged); - this.UpdateInitializeUserDisplay(this.ParentForm.SystemConfig); - - this.buttonDelete.Visible = false; - this.buttonSave.Visible = false; - this.comboBoxAccessRight.Enabled = true; - this.SetEnableID(true); - this.SetEnablePassword(true); } private Color ReturnColor(bool bValue) { @@ -496,7 +486,7 @@ namespace INT69DB_2A.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); @@ -658,13 +648,11 @@ namespace INT69DB_2A.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; } } @@ -1246,14 +1234,22 @@ namespace INT69DB_2A.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 this.buttonDelete.Visible = true; - UserManager.UserManager_GetUserListID(this.listBoxUserList.Items[index].ToString()); + UserManager.UserManager_GetUserListID(this.listBoxUserList.SelectedItem.ToString()); } } #endregion diff --git a/INT69DB_2A/Version.txt b/INT69DB_2A/Version.txt index 52a52cc..79c7200 100644 --- a/INT69DB_2A/Version.txt +++ b/INT69DB_2A/Version.txt @@ -14,6 +14,18 @@ Ƽ 2~6 ƽ 跮 */ +@ Ver 5.0.1 by CJY + - 2023.10.17 + - Ver 5.0.0 Modify + - Framework : SmartX Framework V3.1.1(update: 2019.03.21) + - ȭ ũNG ǥ + 1. ExNG Table ǥ ߰(Ķ) + 2. ȭ ϴ NG <-> ExNG ǥ + - ɼǼ Intech Է ԰ϵ + - α α + - admin00 α , admin20090810 Էϸ admin ʱȭ + - admin00 / ̿ܿ Ұϰ йȣ Reset + @ Ver 5.0.0 by LSJ - 2023.07.17 - Ver 4.5.0 Modify @@ -27,6 +39,7 @@ 'ȸ' ϴ - Level1, 2 default ׷ bool - ͺ - â ߰ + - ø, ̴ Test Send @ Ver 4.5.0 by CJY - 2022.12.22